summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormclay2009-04-07 17:11:48 (EDT)
committer sefftinge2009-04-07 17:11:48 (EDT)
commit4b53b77ef3d951f2c3235b59207b35d23773171d (patch)
tree824cd95a49d34613247f99185f5448d3356b83ad
parent2908e1b182ed58c74bbf934ab314430f314f0cc5 (diff)
downloadorg.eclipse.xtext-4b53b77ef3d951f2c3235b59207b35d23773171d.zip
org.eclipse.xtext-4b53b77ef3d951f2c3235b59207b35d23773171d.tar.gz
org.eclipse.xtext-4b53b77ef3d951f2c3235b59207b35d23773171d.tar.bz2
[ContentAssist] Display images in proposal list https://bugs.eclipse.org/bugs/show_bug.cgi?id=270158
-rw-r--r--devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposalProvider.java21
-rw-r--r--examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposalProvider.java31
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposalProvider.java52
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.ecore8
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.genmodel10
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi15
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoreDsl.java14
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoredslFactory.java6
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoredslPackage.java74
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/ReferencedMetamodel.java (renamed from examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/ImportStatementDecl.java)37
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoreDslImpl.java40
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslFactoryImpl.java8
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslPackageImpl.java34
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/ReferencedMetamodelImpl.java (renamed from examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/ImportStatementDeclImpl.java)95
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/util/EcoredslAdapterFactory.java10
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/util/EcoredslSwitch.java12
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java107
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g56
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java96
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java1936
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g24
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslDelimiters.java6
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java62
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java12
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslReferencedMetamodelConsumer.java (renamed from examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java)65
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java56
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDsl.xtext4
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslRuntimeModule.java124
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/conversion/EcoreDslConverters.java76
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslLinker.java60
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslLinkingService.java91
-rw-r--r--examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslScopeProvider.java95
-rw-r--r--examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslProposalProvider.java20
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractJavaProposalProvider.java109
-rw-r--r--plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextCompletionProposal.java6
-rwxr-xr-xplugins/org.eclipse.xtext.ui.generator/src/org/eclipse/xtext/ui/generator/contentAssist/JavaBasedContentAssistFragment.xpt18
-rw-r--r--plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/contentassist/AbstractXtendProposalProvider.java15
-rw-r--r--plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/contentassist/ContentAssistHelper.java3
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java56
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/GenEnumRulesTestLanguageProposalProvider.java19
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/GenKeywordsTestLanguageProposalProvider.java22
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java19
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java25
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java21
-rw-r--r--tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/GenTwoContextsTestLanguageProposalProvider.java19
-rw-r--r--tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/GenTestLanguageProposalProvider.java20
46 files changed, 1836 insertions, 1873 deletions
diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposalProvider.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposalProvider.java
index d994d23..25eef76 100644
--- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposalProvider.java
+++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposalProvider.java
@@ -11,9 +11,9 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.xtext.Assignment;
import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractJavaProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
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.impl.AbstractJavaProposalProvider;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
@@ -23,15 +23,6 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenReferenceGrammarProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
-
public List<? extends ICompletionProposal> completeSpielplatz_Groesse(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
@@ -227,11 +218,5 @@ public class GenReferenceGrammarProposalProvider extends AbstractJavaProposalPro
}
return Collections.emptyList();
}
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
-
+
}
diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposalProvider.java b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposalProvider.java
index c600619..2a9f11a 100644
--- a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposalProvider.java
+++ b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposalProvider.java
@@ -23,14 +23,6 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenDomainmodelProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
public List<? extends ICompletionProposal> completeFile_Imports(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
@@ -214,7 +206,6 @@ public class GenDomainmodelProposalProvider extends AbstractJavaProposalProvider
return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
}
-
public List<? extends ICompletionProposal> complete(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("complete '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -222,21 +213,6 @@ public class GenDomainmodelProposalProvider extends AbstractJavaProposalProvider
}
return Collections.emptyList();
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
public List<? extends ICompletionProposal> completeEcore_EString(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EString '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -244,11 +220,4 @@ public class GenDomainmodelProposalProvider extends AbstractJavaProposalProvider
}
return Collections.emptyList();
}
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
-
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposalProvider.java b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposalProvider.java
index 9fefe10..fb5aaf3 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposalProvider.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposalProvider.java
@@ -23,19 +23,11 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
- public List<? extends ICompletionProposal> completeEcoreDsl_Imports(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
+ public List<? extends ICompletionProposal> completeEcoreDsl_MetamodelDeclarations(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
- logger.debug("completeEcoreDsl_Imports feature '" + assignment.getFeature() + "' terminal '"
+ logger.debug("completeEcoreDsl_MetamodelDeclarations feature '" + assignment.getFeature() + "' terminal '"
+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
+ contentAssistContext.getMatchString().trim() + "'");
}
@@ -51,22 +43,22 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
return Collections.emptyList();
}
- public List<? extends ICompletionProposal> completeImportStatementDecl_Alias(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
+ public List<? extends ICompletionProposal> completeReferencedMetamodel_Alias(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
- logger.debug("completeImportStatementDecl_Alias feature '" + assignment.getFeature() + "' terminal '"
+ logger.debug("completeReferencedMetamodel_Alias feature '" + assignment.getFeature() + "' terminal '"
+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
+ contentAssistContext.getMatchString().trim() + "'");
}
- return Collections.singletonList(createCompletionProposal(assignment, "ImportStatementDecl_Alias", contentAssistContext));
+ return Collections.singletonList(createCompletionProposal(assignment, "ReferencedMetamodel_Alias", contentAssistContext));
}
- public List<? extends ICompletionProposal> completeImportStatementDecl_ImportURI(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
+ public List<? extends ICompletionProposal> completeReferencedMetamodel_EPackage(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
- logger.debug("completeImportStatementDecl_ImportURI feature '" + assignment.getFeature() + "' terminal '"
+ logger.debug("completeReferencedMetamodel_EPackage feature '" + assignment.getFeature() + "' terminal '"
+ assignment.getTerminal() + "' cardinality '" + assignment.getCardinality() + "' and prefix '"
+ contentAssistContext.getMatchString().trim() + "'");
}
- return Collections.singletonList(createCompletionProposal(assignment, "\"ImportStatementDecl_ImportURI\"", contentAssistContext));
+ return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
}
public List<? extends ICompletionProposal> completeEPackageDecl_EAnnotations(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
@@ -833,7 +825,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
return Collections.singletonList(createCompletionProposal(assignment, "\"MapEntry_Value\"", contentAssistContext));
}
-
public List<? extends ICompletionProposal> complete(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("complete '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -841,8 +832,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
-
public List<? extends ICompletionProposal> completeEcore_EPackage(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EPackage '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -850,8 +839,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
-
public List<? extends ICompletionProposal> completeEcore_EClassifier(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EClassifier '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -859,7 +846,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EDataType(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EDataType '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -867,7 +853,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EAnnotation(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EAnnotation '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -875,7 +860,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EClass(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EClass '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -883,7 +867,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EStructuralFeature(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EStructuralFeature '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -891,7 +874,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EAttribute(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EAttribute '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -899,7 +881,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EReference(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EReference '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -907,7 +888,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EEnum(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EEnum '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -915,7 +895,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EEnumLiteral(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EEnumLiteral '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -923,7 +902,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_ETypeParameter(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_ETypeParameter '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -931,7 +909,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EGenericType(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EGenericType '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -939,8 +916,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
-
public List<? extends ICompletionProposal> completeEcore_EOperation(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EOperation '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -948,7 +923,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EParameter(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EParameter '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -956,7 +930,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EStringToStringMapEntry(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EStringToStringMapEntry '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -964,7 +937,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
public List<? extends ICompletionProposal> completeEcore_EString(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EString '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -972,8 +944,6 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
-
public List<? extends ICompletionProposal> completeEcore_EInt(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeEcore_EInt '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -981,11 +951,5 @@ public class GenEcoreDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.ecore b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.ecore
index 2ad33ba..3a02a97 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.ecore
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.ecore
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="ASCII"?>
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="ecoredsl" nsURI="http://example.xtext.org/EcoreDsl" nsPrefix="ecoredsl">
<eClassifiers xsi:type="ecore:EClass" name="EcoreDsl">
- <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1" eType="//ImportStatementDecl" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="metamodelDeclarations" upperBound="-1" eType="//ReferencedMetamodel" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="package" containment="true">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
</eStructuralFeatures>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ImportStatementDecl">
+ <eClassifiers xsi:type="ecore:EClass" name="ReferencedMetamodel">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="alias">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="importURI">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
</eStructuralFeatures>
</eClassifiers>
</ecore:EPackage>
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.genmodel b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.genmodel
index 2f1cd77..8c525ec 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.genmodel
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.genmodel
@@ -5,19 +5,19 @@
<genClasses>
<ecoreClass href="EcoreDsl.ecore#//EcoreDsl"/>
<genFeatures property="None" children="true" createChild="true">
- <ecoreFeature xsi:type="ecore:EReference" href="EcoreDsl.ecore#//EcoreDsl/imports"/>
+ <ecoreFeature xsi:type="ecore:EReference" href="EcoreDsl.ecore#//EcoreDsl/metamodelDeclarations"/>
</genFeatures>
<genFeatures property="None" children="true" createChild="true">
<ecoreFeature xsi:type="ecore:EReference" href="EcoreDsl.ecore#//EcoreDsl/package"/>
</genFeatures>
</genClasses>
<genClasses>
- <ecoreClass href="EcoreDsl.ecore#//ImportStatementDecl"/>
+ <ecoreClass href="EcoreDsl.ecore#//ReferencedMetamodel"/>
<genFeatures createChild="false">
- <ecoreFeature xsi:type="ecore:EAttribute" href="EcoreDsl.ecore#//ImportStatementDecl/alias"/>
+ <ecoreFeature xsi:type="ecore:EAttribute" href="EcoreDsl.ecore#//ReferencedMetamodel/alias"/>
</genFeatures>
- <genFeatures createChild="false">
- <ecoreFeature xsi:type="ecore:EAttribute" href="EcoreDsl.ecore#//ImportStatementDecl/importURI"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true">
+ <ecoreFeature xsi:type="ecore:EReference" href="EcoreDsl.ecore#//ReferencedMetamodel/ePackage"/>
</genFeatures>
</genClasses>
</genPackages>
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi
index 7806e52..be7ff34 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi
@@ -12,7 +12,7 @@
<classifier xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//EcoreDsl"/>
</type>
<alternatives xsi:type="xtext:Group">
- <tokens xsi:type="xtext:Assignment" cardinality="*" feature="imports" operator="+=">
+ <tokens xsi:type="xtext:Assignment" cardinality="*" feature="metamodelDeclarations" operator="+=">
<terminal xsi:type="xtext:RuleCall" rule="/0/@rules.1"/>
</tokens>
<tokens xsi:type="xtext:Assignment" feature="package" operator="=">
@@ -20,9 +20,9 @@
</tokens>
</alternatives>
</rules>
- <rules xsi:type="xtext:ParserRule" name="ImportStatementDecl">
+ <rules xsi:type="xtext:ParserRule" name="ReferencedMetamodel">
<type metamodel="/0/@metamodelDeclarations.1">
- <classifier xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//ImportStatementDecl"/>
+ <classifier xsi:type="ecore:EClass" href="http://example.xtext.org/EcoreDsl#//ReferencedMetamodel"/>
</type>
<alternatives xsi:type="xtext:Group">
<tokens xsi:type="xtext:Keyword" value="import"/>
@@ -32,8 +32,13 @@
</tokens>
<tokens xsi:type="xtext:Keyword" value="="/>
</tokens>
- <tokens xsi:type="xtext:Assignment" feature="importURI" operator="=">
- <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/>
+ <tokens xsi:type="xtext:Assignment" feature="ePackage" operator="=">
+ <terminal xsi:type="xtext:CrossReference">
+ <type metamodel="/0/@metamodelDeclarations.0">
+ <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+ </type>
+ <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.2"/>
+ </terminal>
</tokens>
<tokens xsi:type="xtext:Keyword" value=";"/>
</alternatives>
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoreDsl.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoreDsl.java
index b91f3a2..1fd65fb 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoreDsl.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoreDsl.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EPackage;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.xtext.example.ecoredsl.EcoreDsl#getImports <em>Imports</em>}</li>
+ * <li>{@link org.eclipse.xtext.example.ecoredsl.EcoreDsl#getMetamodelDeclarations <em>Metamodel Declarations</em>}</li>
* <li>{@link org.eclipse.xtext.example.ecoredsl.EcoreDsl#getPackage <em>Package</em>}</li>
* </ul>
* </p>
@@ -30,20 +30,20 @@ import org.eclipse.emf.ecore.EPackage;
public interface EcoreDsl extends EObject
{
/**
- * Returns the value of the '<em><b>Imports</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.xtext.example.ecoredsl.ImportStatementDecl}.
+ * Returns the value of the '<em><b>Metamodel Declarations</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Imports</em>' containment reference list isn't clear,
+ * If the meaning of the '<em>Metamodel Declarations</em>' containment reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Imports</em>' containment reference list.
- * @see org.eclipse.xtext.example.ecoredsl.EcoredslPackage#getEcoreDsl_Imports()
+ * @return the value of the '<em>Metamodel Declarations</em>' containment reference list.
+ * @see org.eclipse.xtext.example.ecoredsl.EcoredslPackage#getEcoreDsl_MetamodelDeclarations()
* @model containment="true"
* @generated
*/
- EList<ImportStatementDecl> getImports();
+ EList<ReferencedMetamodel> getMetamodelDeclarations();
/**
* Returns the value of the '<em><b>Package</b></em>' containment reference.
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoredslFactory.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoredslFactory.java
index 5419230..88594cd 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoredslFactory.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoredslFactory.java
@@ -35,13 +35,13 @@ public interface EcoredslFactory extends EFactory
EcoreDsl createEcoreDsl();
/**
- * Returns a new object of class '<em>Import Statement Decl</em>'.
+ * Returns a new object of class '<em>Referenced Metamodel</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Import Statement Decl</em>'.
+ * @return a new object of class '<em>Referenced Metamodel</em>'.
* @generated
*/
- ImportStatementDecl createImportStatementDecl();
+ ReferencedMetamodel createReferencedMetamodel();
/**
* Returns the package supported by this factory.
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoredslPackage.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoredslPackage.java
index b3431f1..ea749ab 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoredslPackage.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/EcoredslPackage.java
@@ -70,13 +70,13 @@ public interface EcoredslPackage extends EPackage
int ECORE_DSL = 0;
/**
- * The feature id for the '<em><b>Imports</b></em>' containment reference list.
+ * The feature id for the '<em><b>Metamodel Declarations</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ECORE_DSL__IMPORTS = 0;
+ int ECORE_DSL__METAMODEL_DECLARATIONS = 0;
/**
* The feature id for the '<em><b>Package</b></em>' containment reference.
@@ -97,14 +97,14 @@ public interface EcoredslPackage extends EPackage
int ECORE_DSL_FEATURE_COUNT = 2;
/**
- * The meta object id for the '{@link org.eclipse.xtext.example.ecoredsl.impl.ImportStatementDeclImpl <em>Import Statement Decl</em>}' class.
+ * The meta object id for the '{@link org.eclipse.xtext.example.ecoredsl.impl.ReferencedMetamodelImpl <em>Referenced Metamodel</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.xtext.example.ecoredsl.impl.ImportStatementDeclImpl
- * @see org.eclipse.xtext.example.ecoredsl.impl.EcoredslPackageImpl#getImportStatementDecl()
+ * @see org.eclipse.xtext.example.ecoredsl.impl.ReferencedMetamodelImpl
+ * @see org.eclipse.xtext.example.ecoredsl.impl.EcoredslPackageImpl#getReferencedMetamodel()
* @generated
*/
- int IMPORT_STATEMENT_DECL = 1;
+ int REFERENCED_METAMODEL = 1;
/**
* The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -113,25 +113,25 @@ public interface EcoredslPackage extends EPackage
* @generated
* @ordered
*/
- int IMPORT_STATEMENT_DECL__ALIAS = 0;
+ int REFERENCED_METAMODEL__ALIAS = 0;
/**
- * The feature id for the '<em><b>Import URI</b></em>' attribute.
+ * The feature id for the '<em><b>EPackage</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int IMPORT_STATEMENT_DECL__IMPORT_URI = 1;
+ int REFERENCED_METAMODEL__EPACKAGE = 1;
/**
- * The number of structural features of the '<em>Import Statement Decl</em>' class.
+ * The number of structural features of the '<em>Referenced Metamodel</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int IMPORT_STATEMENT_DECL_FEATURE_COUNT = 2;
+ int REFERENCED_METAMODEL_FEATURE_COUNT = 2;
/**
@@ -145,15 +145,15 @@ public interface EcoredslPackage extends EPackage
EClass getEcoreDsl();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.example.ecoredsl.EcoreDsl#getImports <em>Imports</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.example.ecoredsl.EcoreDsl#getMetamodelDeclarations <em>Metamodel Declarations</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Imports</em>'.
- * @see org.eclipse.xtext.example.ecoredsl.EcoreDsl#getImports()
+ * @return the meta object for the containment reference list '<em>Metamodel Declarations</em>'.
+ * @see org.eclipse.xtext.example.ecoredsl.EcoreDsl#getMetamodelDeclarations()
* @see #getEcoreDsl()
* @generated
*/
- EReference getEcoreDsl_Imports();
+ EReference getEcoreDsl_MetamodelDeclarations();
/**
* Returns the meta object for the containment reference '{@link org.eclipse.xtext.example.ecoredsl.EcoreDsl#getPackage <em>Package</em>}'.
@@ -167,36 +167,36 @@ public interface EcoredslPackage extends EPackage
EReference getEcoreDsl_Package();
/**
- * Returns the meta object for class '{@link org.eclipse.xtext.example.ecoredsl.ImportStatementDecl <em>Import Statement Decl</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel <em>Referenced Metamodel</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Import Statement Decl</em>'.
- * @see org.eclipse.xtext.example.ecoredsl.ImportStatementDecl
+ * @return the meta object for class '<em>Referenced Metamodel</em>'.
+ * @see org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel
* @generated
*/
- EClass getImportStatementDecl();
+ EClass getReferencedMetamodel();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.xtext.example.ecoredsl.ImportStatementDecl#getAlias <em>Alias</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel#getAlias <em>Alias</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Alias</em>'.
- * @see org.eclipse.xtext.example.ecoredsl.ImportStatementDecl#getAlias()
- * @see #getImportStatementDecl()
+ * @see org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel#getAlias()
+ * @see #getReferencedMetamodel()
* @generated
*/
- EAttribute getImportStatementDecl_Alias();
+ EAttribute getReferencedMetamodel_Alias();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.xtext.example.ecoredsl.ImportStatementDecl#getImportURI <em>Import URI</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel#getEPackage <em>EPackage</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Import URI</em>'.
- * @see org.eclipse.xtext.example.ecoredsl.ImportStatementDecl#getImportURI()
- * @see #getImportStatementDecl()
+ * @return the meta object for the reference '<em>EPackage</em>'.
+ * @see org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel#getEPackage()
+ * @see #getReferencedMetamodel()
* @generated
*/
- EAttribute getImportStatementDecl_ImportURI();
+ EReference getReferencedMetamodel_EPackage();
/**
* Returns the factory that creates the instances of the model.
@@ -232,12 +232,12 @@ public interface EcoredslPackage extends EPackage
EClass ECORE_DSL = eINSTANCE.getEcoreDsl();
/**
- * The meta object literal for the '<em><b>Imports</b></em>' containment reference list feature.
+ * The meta object literal for the '<em><b>Metamodel Declarations</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference ECORE_DSL__IMPORTS = eINSTANCE.getEcoreDsl_Imports();
+ EReference ECORE_DSL__METAMODEL_DECLARATIONS = eINSTANCE.getEcoreDsl_MetamodelDeclarations();
/**
* The meta object literal for the '<em><b>Package</b></em>' containment reference feature.
@@ -248,14 +248,14 @@ public interface EcoredslPackage extends EPackage
EReference ECORE_DSL__PACKAGE = eINSTANCE.getEcoreDsl_Package();
/**
- * The meta object literal for the '{@link org.eclipse.xtext.example.ecoredsl.impl.ImportStatementDeclImpl <em>Import Statement Decl</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.xtext.example.ecoredsl.impl.ReferencedMetamodelImpl <em>Referenced Metamodel</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.xtext.example.ecoredsl.impl.ImportStatementDeclImpl
- * @see org.eclipse.xtext.example.ecoredsl.impl.EcoredslPackageImpl#getImportStatementDecl()
+ * @see org.eclipse.xtext.example.ecoredsl.impl.ReferencedMetamodelImpl
+ * @see org.eclipse.xtext.example.ecoredsl.impl.EcoredslPackageImpl#getReferencedMetamodel()
* @generated
*/
- EClass IMPORT_STATEMENT_DECL = eINSTANCE.getImportStatementDecl();
+ EClass REFERENCED_METAMODEL = eINSTANCE.getReferencedMetamodel();
/**
* The meta object literal for the '<em><b>Alias</b></em>' attribute feature.
@@ -263,15 +263,15 @@ public interface EcoredslPackage extends EPackage
* <!-- end-user-doc -->
* @generated
*/
- EAttribute IMPORT_STATEMENT_DECL__ALIAS = eINSTANCE.getImportStatementDecl_Alias();
+ EAttribute REFERENCED_METAMODEL__ALIAS = eINSTANCE.getReferencedMetamodel_Alias();
/**
- * The meta object literal for the '<em><b>Import URI</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>EPackage</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute IMPORT_STATEMENT_DECL__IMPORT_URI = eINSTANCE.getImportStatementDecl_ImportURI();
+ EReference REFERENCED_METAMODEL__EPACKAGE = eINSTANCE.getReferencedMetamodel_EPackage();
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/ImportStatementDecl.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/ReferencedMetamodel.java
index c8c7919..2815b21 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/ImportStatementDecl.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/ReferencedMetamodel.java
@@ -6,25 +6,26 @@
package org.eclipse.xtext.example.ecoredsl;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
/**
* <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Import Statement Decl</b></em>'.
+ * A representation of the model object '<em><b>Referenced Metamodel</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.xtext.example.ecoredsl.ImportStatementDecl#getAlias <em>Alias</em>}</li>
- * <li>{@link org.eclipse.xtext.example.ecoredsl.ImportStatementDecl#getImportURI <em>Import URI</em>}</li>
+ * <li>{@link org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel#getAlias <em>Alias</em>}</li>
+ * <li>{@link org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel#getEPackage <em>EPackage</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.xtext.example.ecoredsl.EcoredslPackage#getImportStatementDecl()
+ * @see org.eclipse.xtext.example.ecoredsl.EcoredslPackage#getReferencedMetamodel()
* @model
* @generated
*/
-public interface ImportStatementDecl extends EObject
+public interface ReferencedMetamodel extends EObject
{
/**
* Returns the value of the '<em><b>Alias</b></em>' attribute.
@@ -36,14 +37,14 @@ public interface ImportStatementDecl extends EObject
* <!-- end-user-doc -->
* @return the value of the '<em>Alias</em>' attribute.
* @see #setAlias(String)
- * @see org.eclipse.xtext.example.ecoredsl.EcoredslPackage#getImportStatementDecl_Alias()
+ * @see org.eclipse.xtext.example.ecoredsl.EcoredslPackage#getReferencedMetamodel_Alias()
* @model
* @generated
*/
String getAlias();
/**
- * Sets the value of the '{@link org.eclipse.xtext.example.ecoredsl.ImportStatementDecl#getAlias <em>Alias</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel#getAlias <em>Alias</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Alias</em>' attribute.
@@ -53,29 +54,29 @@ public interface ImportStatementDecl extends EObject
void setAlias(String value);
/**
- * Returns the value of the '<em><b>Import URI</b></em>' attribute.
+ * Returns the value of the '<em><b>EPackage</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Import URI</em>' attribute isn't clear,
+ * If the meaning of the '<em>EPackage</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Import URI</em>' attribute.
- * @see #setImportURI(String)
- * @see org.eclipse.xtext.example.ecoredsl.EcoredslPackage#getImportStatementDecl_ImportURI()
+ * @return the value of the '<em>EPackage</em>' reference.
+ * @see #setEPackage(EPackage)
+ * @see org.eclipse.xtext.example.ecoredsl.EcoredslPackage#getReferencedMetamodel_EPackage()
* @model
* @generated
*/
- String getImportURI();
+ EPackage getEPackage();
/**
- * Sets the value of the '{@link org.eclipse.xtext.example.ecoredsl.ImportStatementDecl#getImportURI <em>Import URI</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel#getEPackage <em>EPackage</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Import URI</em>' attribute.
- * @see #getImportURI()
+ * @param value the new value of the '<em>EPackage</em>' reference.
+ * @see #getEPackage()
* @generated
*/
- void setImportURI(String value);
+ void setEPackage(EPackage value);
-} // ImportStatementDecl
+} // ReferencedMetamodel
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoreDslImpl.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoreDslImpl.java
index 9a3c887..1f698e1 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoreDslImpl.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoreDslImpl.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.xtext.example.ecoredsl.EcoreDsl;
import org.eclipse.xtext.example.ecoredsl.EcoredslPackage;
-import org.eclipse.xtext.example.ecoredsl.ImportStatementDecl;
+import org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel;
/**
* <!-- begin-user-doc -->
@@ -33,7 +33,7 @@ import org.eclipse.xtext.example.ecoredsl.ImportStatementDecl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.xtext.example.ecoredsl.impl.EcoreDslImpl#getImports <em>Imports</em>}</li>
+ * <li>{@link org.eclipse.xtext.example.ecoredsl.impl.EcoreDslImpl#getMetamodelDeclarations <em>Metamodel Declarations</em>}</li>
* <li>{@link org.eclipse.xtext.example.ecoredsl.impl.EcoreDslImpl#getPackage <em>Package</em>}</li>
* </ul>
* </p>
@@ -43,14 +43,14 @@ import org.eclipse.xtext.example.ecoredsl.ImportStatementDecl;
public class EcoreDslImpl extends MinimalEObjectImpl.Container implements EcoreDsl
{
/**
- * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.
+ * The cached value of the '{@link #getMetamodelDeclarations() <em>Metamodel Declarations</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getImports()
+ * @see #getMetamodelDeclarations()
* @generated
* @ordered
*/
- protected EList<ImportStatementDecl> imports;
+ protected EList<ReferencedMetamodel> metamodelDeclarations;
/**
* The cached value of the '{@link #getPackage() <em>Package</em>}' containment reference.
@@ -88,13 +88,13 @@ public class EcoreDslImpl extends MinimalEObjectImpl.Container implements EcoreD
* <!-- end-user-doc -->
* @generated
*/
- public EList<ImportStatementDecl> getImports()
+ public EList<ReferencedMetamodel> getMetamodelDeclarations()
{
- if (imports == null)
+ if (metamodelDeclarations == null)
{
- imports = new EObjectContainmentEList<ImportStatementDecl>(ImportStatementDecl.class, this, EcoredslPackage.ECORE_DSL__IMPORTS);
+ metamodelDeclarations = new EObjectContainmentEList<ReferencedMetamodel>(ReferencedMetamodel.class, this, EcoredslPackage.ECORE_DSL__METAMODEL_DECLARATIONS);
}
- return imports;
+ return metamodelDeclarations;
}
/**
@@ -155,8 +155,8 @@ public class EcoreDslImpl extends MinimalEObjectImpl.Container implements EcoreD
{
switch (featureID)
{
- case EcoredslPackage.ECORE_DSL__IMPORTS:
- return ((InternalEList<?>)getImports()).basicRemove(otherEnd, msgs);
+ case EcoredslPackage.ECORE_DSL__METAMODEL_DECLARATIONS:
+ return ((InternalEList<?>)getMetamodelDeclarations()).basicRemove(otherEnd, msgs);
case EcoredslPackage.ECORE_DSL__PACKAGE:
return basicSetPackage(null, msgs);
}
@@ -173,8 +173,8 @@ public class EcoreDslImpl extends MinimalEObjectImpl.Container implements EcoreD
{
switch (featureID)
{
- case EcoredslPackage.ECORE_DSL__IMPORTS:
- return getImports();
+ case EcoredslPackage.ECORE_DSL__METAMODEL_DECLARATIONS:
+ return getMetamodelDeclarations();
case EcoredslPackage.ECORE_DSL__PACKAGE:
return getPackage();
}
@@ -192,9 +192,9 @@ public class EcoreDslImpl extends MinimalEObjectImpl.Container implements EcoreD
{
switch (featureID)
{
- case EcoredslPackage.ECORE_DSL__IMPORTS:
- getImports().clear();
- getImports().addAll((Collection<? extends ImportStatementDecl>)newValue);
+ case EcoredslPackage.ECORE_DSL__METAMODEL_DECLARATIONS:
+ getMetamodelDeclarations().clear();
+ getMetamodelDeclarations().addAll((Collection<? extends ReferencedMetamodel>)newValue);
return;
case EcoredslPackage.ECORE_DSL__PACKAGE:
setPackage((EPackage)newValue);
@@ -213,8 +213,8 @@ public class EcoreDslImpl extends MinimalEObjectImpl.Container implements EcoreD
{
switch (featureID)
{
- case EcoredslPackage.ECORE_DSL__IMPORTS:
- getImports().clear();
+ case EcoredslPackage.ECORE_DSL__METAMODEL_DECLARATIONS:
+ getMetamodelDeclarations().clear();
return;
case EcoredslPackage.ECORE_DSL__PACKAGE:
setPackage((EPackage)null);
@@ -233,8 +233,8 @@ public class EcoreDslImpl extends MinimalEObjectImpl.Container implements EcoreD
{
switch (featureID)
{
- case EcoredslPackage.ECORE_DSL__IMPORTS:
- return imports != null && !imports.isEmpty();
+ case EcoredslPackage.ECORE_DSL__METAMODEL_DECLARATIONS:
+ return metamodelDeclarations != null && !metamodelDeclarations.isEmpty();
case EcoredslPackage.ECORE_DSL__PACKAGE:
return package_ != null;
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslFactoryImpl.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslFactoryImpl.java
index 1907742..55af079 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslFactoryImpl.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslFactoryImpl.java
@@ -68,7 +68,7 @@ public class EcoredslFactoryImpl extends EFactoryImpl implements EcoredslFactory
switch (eClass.getClassifierID())
{
case EcoredslPackage.ECORE_DSL: return createEcoreDsl();
- case EcoredslPackage.IMPORT_STATEMENT_DECL: return createImportStatementDecl();
+ case EcoredslPackage.REFERENCED_METAMODEL: return createReferencedMetamodel();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -90,10 +90,10 @@ public class EcoredslFactoryImpl extends EFactoryImpl implements EcoredslFactory
* <!-- end-user-doc -->
* @generated
*/
- public ImportStatementDecl createImportStatementDecl()
+ public ReferencedMetamodel createReferencedMetamodel()
{
- ImportStatementDeclImpl importStatementDecl = new ImportStatementDeclImpl();
- return importStatementDecl;
+ ReferencedMetamodelImpl referencedMetamodel = new ReferencedMetamodelImpl();
+ return referencedMetamodel;
}
/**
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslPackageImpl.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslPackageImpl.java
index bae4d87..6b07271 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslPackageImpl.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/EcoredslPackageImpl.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.xtext.example.ecoredsl.EcoreDsl;
import org.eclipse.xtext.example.ecoredsl.EcoredslFactory;
import org.eclipse.xtext.example.ecoredsl.EcoredslPackage;
-import org.eclipse.xtext.example.ecoredsl.ImportStatementDecl;
+import org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel;
/**
* <!-- begin-user-doc -->
@@ -37,7 +37,7 @@ public class EcoredslPackageImpl extends EPackageImpl implements EcoredslPackage
* <!-- end-user-doc -->
* @generated
*/
- private EClass importStatementDeclEClass = null;
+ private EClass referencedMetamodelEClass = null;
/**
* Creates an instance of the model <b>Package</b>, registered with
@@ -124,7 +124,7 @@ public class EcoredslPackageImpl extends EPackageImpl implements EcoredslPackage
* <!-- end-user-doc -->
* @generated
*/
- public EReference getEcoreDsl_Imports()
+ public EReference getEcoreDsl_MetamodelDeclarations()
{
return (EReference)ecoreDslEClass.getEStructuralFeatures().get(0);
}
@@ -144,9 +144,9 @@ public class EcoredslPackageImpl extends EPackageImpl implements EcoredslPackage
* <!-- end-user-doc -->
* @generated
*/
- public EClass getImportStatementDecl()
+ public EClass getReferencedMetamodel()
{
- return importStatementDeclEClass;
+ return referencedMetamodelEClass;
}
/**
@@ -154,9 +154,9 @@ public class EcoredslPackageImpl extends EPackageImpl implements EcoredslPackage
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getImportStatementDecl_Alias()
+ public EAttribute getReferencedMetamodel_Alias()
{
- return (EAttribute)importStatementDeclEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)referencedMetamodelEClass.getEStructuralFeatures().get(0);
}
/**
@@ -164,9 +164,9 @@ public class EcoredslPackageImpl extends EPackageImpl implements EcoredslPackage
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getImportStatementDecl_ImportURI()
+ public EReference getReferencedMetamodel_EPackage()
{
- return (EAttribute)importStatementDeclEClass.getEStructuralFeatures().get(1);
+ return (EReference)referencedMetamodelEClass.getEStructuralFeatures().get(1);
}
/**
@@ -200,12 +200,12 @@ public class EcoredslPackageImpl extends EPackageImpl implements EcoredslPackage
// Create classes and their features
ecoreDslEClass = createEClass(ECORE_DSL);
- createEReference(ecoreDslEClass, ECORE_DSL__IMPORTS);
+ createEReference(ecoreDslEClass, ECORE_DSL__METAMODEL_DECLARATIONS);
createEReference(ecoreDslEClass, ECORE_DSL__PACKAGE);
- importStatementDeclEClass = createEClass(IMPORT_STATEMENT_DECL);
- createEAttribute(importStatementDeclEClass, IMPORT_STATEMENT_DECL__ALIAS);
- createEAttribute(importStatementDeclEClass, IMPORT_STATEMENT_DECL__IMPORT_URI);
+ referencedMetamodelEClass = createEClass(REFERENCED_METAMODEL);
+ createEAttribute(referencedMetamodelEClass, REFERENCED_METAMODEL__ALIAS);
+ createEReference(referencedMetamodelEClass, REFERENCED_METAMODEL__EPACKAGE);
}
/**
@@ -240,12 +240,12 @@ public class EcoredslPackageImpl extends EPackageImpl implements EcoredslPackage
// Initialize classes and features; add operations and parameters
initEClass(ecoreDslEClass, EcoreDsl.class, "EcoreDsl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getEcoreDsl_Imports(), this.getImportStatementDecl(), null, "imports", null, 0, -1, EcoreDsl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getEcoreDsl_MetamodelDeclarations(), this.getReferencedMetamodel(), null, "metamodelDeclarations", null, 0, -1, EcoreDsl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getEcoreDsl_Package(), ecorePackage.getEPackage(), null, "package", null, 0, 1, EcoreDsl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(importStatementDeclEClass, ImportStatementDecl.class, "ImportStatementDecl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getImportStatementDecl_Alias(), ecorePackage.getEString(), "alias", null, 0, 1, ImportStatementDecl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getImportStatementDecl_ImportURI(), ecorePackage.getEString(), "importURI", null, 0, 1, ImportStatementDecl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(referencedMetamodelEClass, ReferencedMetamodel.class, "ReferencedMetamodel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getReferencedMetamodel_Alias(), ecorePackage.getEString(), "alias", null, 0, 1, ReferencedMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getReferencedMetamodel_EPackage(), ecorePackage.getEPackage(), null, "ePackage", null, 0, 1, ReferencedMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/ImportStatementDeclImpl.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/ReferencedMetamodelImpl.java
index 97dcc5b..5356429 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/ImportStatementDeclImpl.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/impl/ReferencedMetamodelImpl.java
@@ -8,28 +8,30 @@ package org.eclipse.xtext.example.ecoredsl.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.xtext.example.ecoredsl.EcoredslPackage;
-import org.eclipse.xtext.example.ecoredsl.ImportStatementDecl;
+import org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel;
/**
* <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Import Statement Decl</b></em>'.
+ * An implementation of the model object '<em><b>Referenced Metamodel</b></em>'.
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.xtext.example.ecoredsl.impl.ImportStatementDeclImpl#getAlias <em>Alias</em>}</li>
- * <li>{@link org.eclipse.xtext.example.ecoredsl.impl.ImportStatementDeclImpl#getImportURI <em>Import URI</em>}</li>
+ * <li>{@link org.eclipse.xtext.example.ecoredsl.impl.ReferencedMetamodelImpl#getAlias <em>Alias</em>}</li>
+ * <li>{@link org.eclipse.xtext.example.ecoredsl.impl.ReferencedMetamodelImpl#getEPackage <em>EPackage</em>}</li>
* </ul>
* </p>
*
* @generated
*/
-public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implements ImportStatementDecl
+public class ReferencedMetamodelImpl extends MinimalEObjectImpl.Container implements ReferencedMetamodel
{
/**
* The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.
@@ -52,31 +54,21 @@ public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implem
protected String alias = ALIAS_EDEFAULT;
/**
- * The default value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
+ * The cached value of the '{@link #getEPackage() <em>EPackage</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getImportURI()
+ * @see #getEPackage()
* @generated
* @ordered
*/
- protected static final String IMPORT_URI_EDEFAULT = null;
+ protected EPackage ePackage;
/**
- * The cached value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getImportURI()
* @generated
- * @ordered
*/
- protected String importURI = IMPORT_URI_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ImportStatementDeclImpl()
+ protected ReferencedMetamodelImpl()
{
super();
}
@@ -89,7 +81,7 @@ public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implem
@Override
protected EClass eStaticClass()
{
- return EcoredslPackage.Literals.IMPORT_STATEMENT_DECL;
+ return EcoredslPackage.Literals.REFERENCED_METAMODEL;
}
/**
@@ -112,7 +104,27 @@ public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implem
String oldAlias = alias;
alias = newAlias;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EcoredslPackage.IMPORT_STATEMENT_DECL__ALIAS, oldAlias, alias));
+ eNotify(new ENotificationImpl(this, Notification.SET, EcoredslPackage.REFERENCED_METAMODEL__ALIAS, oldAlias, alias));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EPackage getEPackage()
+ {
+ if (ePackage != null && ePackage.eIsProxy())
+ {
+ InternalEObject oldEPackage = (InternalEObject)ePackage;
+ ePackage = (EPackage)eResolveProxy(oldEPackage);
+ if (ePackage != oldEPackage)
+ {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, EcoredslPackage.REFERENCED_METAMODEL__EPACKAGE, oldEPackage, ePackage));
+ }
+ }
+ return ePackage;
}
/**
@@ -120,9 +132,9 @@ public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public String getImportURI()
+ public EPackage basicGetEPackage()
{
- return importURI;
+ return ePackage;
}
/**
@@ -130,12 +142,12 @@ public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
- public void setImportURI(String newImportURI)
+ public void setEPackage(EPackage newEPackage)
{
- String oldImportURI = importURI;
- importURI = newImportURI;
+ EPackage oldEPackage = ePackage;
+ ePackage = newEPackage;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, EcoredslPackage.IMPORT_STATEMENT_DECL__IMPORT_URI, oldImportURI, importURI));
+ eNotify(new ENotificationImpl(this, Notification.SET, EcoredslPackage.REFERENCED_METAMODEL__EPACKAGE, oldEPackage, ePackage));
}
/**
@@ -148,10 +160,11 @@ public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implem
{
switch (featureID)
{
- case EcoredslPackage.IMPORT_STATEMENT_DECL__ALIAS:
+ case EcoredslPackage.REFERENCED_METAMODEL__ALIAS:
return getAlias();
- case EcoredslPackage.IMPORT_STATEMENT_DECL__IMPORT_URI:
- return getImportURI();
+ case EcoredslPackage.REFERENCED_METAMODEL__EPACKAGE:
+ if (resolve) return getEPackage();
+ return basicGetEPackage();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -166,11 +179,11 @@ public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implem
{
switch (featureID)
{
- case EcoredslPackage.IMPORT_STATEMENT_DECL__ALIAS:
+ case EcoredslPackage.REFERENCED_METAMODEL__ALIAS:
setAlias((String)newValue);
return;
- case EcoredslPackage.IMPORT_STATEMENT_DECL__IMPORT_URI:
- setImportURI((String)newValue);
+ case EcoredslPackage.REFERENCED_METAMODEL__EPACKAGE:
+ setEPackage((EPackage)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -186,11 +199,11 @@ public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implem
{
switch (featureID)
{
- case EcoredslPackage.IMPORT_STATEMENT_DECL__ALIAS:
+ case EcoredslPackage.REFERENCED_METAMODEL__ALIAS:
setAlias(ALIAS_EDEFAULT);
return;
- case EcoredslPackage.IMPORT_STATEMENT_DECL__IMPORT_URI:
- setImportURI(IMPORT_URI_EDEFAULT);
+ case EcoredslPackage.REFERENCED_METAMODEL__EPACKAGE:
+ setEPackage((EPackage)null);
return;
}
super.eUnset(featureID);
@@ -206,10 +219,10 @@ public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implem
{
switch (featureID)
{
- case EcoredslPackage.IMPORT_STATEMENT_DECL__ALIAS:
+ case EcoredslPackage.REFERENCED_METAMODEL__ALIAS:
return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);
- case EcoredslPackage.IMPORT_STATEMENT_DECL__IMPORT_URI:
- return IMPORT_URI_EDEFAULT == null ? importURI != null : !IMPORT_URI_EDEFAULT.equals(importURI);
+ case EcoredslPackage.REFERENCED_METAMODEL__EPACKAGE:
+ return ePackage != null;
}
return super.eIsSet(featureID);
}
@@ -227,10 +240,8 @@ public class ImportStatementDeclImpl extends MinimalEObjectImpl.Container implem
StringBuffer result = new StringBuffer(super.toString());
result.append(" (alias: ");
result.append(alias);
- result.append(", importURI: ");
- result.append(importURI);
result.append(')');
return result.toString();
}
-} //ImportStatementDeclImpl
+} //ReferencedMetamodelImpl
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/util/EcoredslAdapterFactory.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/util/EcoredslAdapterFactory.java
index ed7219b..e61ebf9 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/util/EcoredslAdapterFactory.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/util/EcoredslAdapterFactory.java
@@ -83,9 +83,9 @@ public class EcoredslAdapterFactory extends AdapterFactoryImpl
return createEcoreDslAdapter();
}
@Override
- public Adapter caseImportStatementDecl(ImportStatementDecl object)
+ public Adapter caseReferencedMetamodel(ReferencedMetamodel object)
{
- return createImportStatementDeclAdapter();
+ return createReferencedMetamodelAdapter();
}
@Override
public Adapter defaultCase(EObject object)
@@ -125,16 +125,16 @@ public class EcoredslAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.xtext.example.ecoredsl.ImportStatementDecl <em>Import Statement Decl</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel <em>Referenced Metamodel</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.xtext.example.ecoredsl.ImportStatementDecl
+ * @see org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel
* @generated
*/
- public Adapter createImportStatementDeclAdapter()
+ public Adapter createReferencedMetamodelAdapter()
{
return null;
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/util/EcoredslSwitch.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/util/EcoredslSwitch.java
index 53d7da1..0f00afb 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/util/EcoredslSwitch.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/ecoredsl/util/EcoredslSwitch.java
@@ -102,10 +102,10 @@ public class EcoredslSwitch<T>
if (result == null) result = defaultCase(theEObject);
return result;
}
- case EcoredslPackage.IMPORT_STATEMENT_DECL:
+ case EcoredslPackage.REFERENCED_METAMODEL:
{
- ImportStatementDecl importStatementDecl = (ImportStatementDecl)theEObject;
- T result = caseImportStatementDecl(importStatementDecl);
+ ReferencedMetamodel referencedMetamodel = (ReferencedMetamodel)theEObject;
+ T result = caseReferencedMetamodel(referencedMetamodel);
if (result == null) result = defaultCase(theEObject);
return result;
}
@@ -130,17 +130,17 @@ public class EcoredslSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Import Statement Decl</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Referenced Metamodel</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Import Statement Decl</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Referenced Metamodel</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public T caseImportStatementDecl(ImportStatementDecl object)
+ public T caseReferencedMetamodel(ReferencedMetamodel object)
{
return null;
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java
index 257f93b..aa7c5b7 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java
@@ -23,7 +23,7 @@ public class EcoreDslParsetreeConstructor extends AbstractParseTreeConstructor {
IInstanceDescription inst = getDescr(obj);
Solution s;
if(inst.isInstanceOf(grammarAccess.getEcoreDslRule().getType().getClassifier()) && (s = new EcoreDsl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
- if(inst.isInstanceOf(grammarAccess.getImportStatementDeclRule().getType().getClassifier()) && (s = new ImportStatementDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+ if(inst.isInstanceOf(grammarAccess.getReferencedMetamodelRule().getType().getClassifier()) && (s = new ReferencedMetamodel_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
if(inst.isInstanceOf(grammarAccess.getEPackageDeclRule().getType().getClassifier()) && (s = new EPackageDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
if(inst.isInstanceOf(grammarAccess.getSubEPackageDeclRule().getType().getClassifier()) && (s = new SubEPackageDecl_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
if(inst.isInstanceOf(grammarAccess.getEClassifierDeclRule().getType().getClassifier()) && (s = new EClassifierDecl_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
@@ -48,11 +48,11 @@ public class EcoreDslParsetreeConstructor extends AbstractParseTreeConstructor {
/************ begin Rule EcoreDsl ****************
*
* EcoreDsl:
- * (imports+=ImportStatementDecl)* package=EPackageDecl;
+ * (metamodelDeclarations+=ReferencedMetamodel)* package=EPackageDecl;
*
**/
-// (imports+=ImportStatementDecl)* package=EPackageDecl
+// (metamodelDeclarations+=ReferencedMetamodel)* package=EPackageDecl
protected class EcoreDsl_Group extends GroupToken {
public EcoreDsl_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -68,7 +68,7 @@ protected class EcoreDsl_Group extends GroupToken {
protected Solution createSolution() {
Solution s1 = new EcoreDsl_1_Assignment_package(current, this).firstSolution();
while(s1 != null) {
- Solution s2 = new EcoreDsl_0_Assignment_imports(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+ Solution s2 = new EcoreDsl_0_Assignment_metamodelDeclarations(s1.getCurrent(), s1.getPredecessor()).firstSolution();
if(s2 != null) {
last = s2.getPredecessor();
return s2;
@@ -80,27 +80,27 @@ protected class EcoreDsl_Group extends GroupToken {
}
}
-// (imports+=ImportStatementDecl)*
-protected class EcoreDsl_0_Assignment_imports extends AssignmentToken {
+// (metamodelDeclarations+=ReferencedMetamodel)*
+protected class EcoreDsl_0_Assignment_metamodelDeclarations extends AssignmentToken {
- public EcoreDsl_0_Assignment_imports(IInstanceDescription curr, AbstractToken pred) {
+ public EcoreDsl_0_Assignment_metamodelDeclarations(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, IS_MANY, !IS_REQUIRED);
}
@Override
public Assignment getGrammarElement() {
- return grammarAccess.getEcoreDslAccess().getImportsAssignment_0();
+ return grammarAccess.getEcoreDslAccess().getMetamodelDeclarationsAssignment_0();
}
@Override
protected Solution createSolution() {
- if((value = current.getConsumable("imports",!IS_REQUIRED)) == null) return null;
- IInstanceDescription obj = current.cloneAndConsume("imports");
+ if((value = current.getConsumable("metamodelDeclarations",!IS_REQUIRED)) == null) return null;
+ IInstanceDescription obj = current.cloneAndConsume("metamodelDeclarations");
if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
IInstanceDescription param = getDescr((EObject)value);
- if(param.isInstanceOf(grammarAccess.getImportStatementDeclRule().getType().getClassifier())) {
- Solution s = new ImportStatementDecl_Group(param, this).firstSolution();
+ if(param.isInstanceOf(grammarAccess.getReferencedMetamodelRule().getType().getClassifier())) {
+ Solution s = new ReferencedMetamodel_Group(param, this).firstSolution();
while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
if(s != null) {
type = AssignmentType.PRC;
@@ -150,34 +150,34 @@ protected class EcoreDsl_1_Assignment_package extends AssignmentToken {
/************ end Rule EcoreDsl ****************/
-/************ begin Rule ImportStatementDecl ****************
+/************ begin Rule ReferencedMetamodel ****************
*
- * ImportStatementDecl:
- * "import" (alias=ID "=")? importURI=STRING ";";
+ * ReferencedMetamodel:
+ * "import" (alias=ID "=")? ePackage=[ecore::EPackage|STRING] ";";
*
**/
-// "import" (alias=ID "=")? importURI=STRING ";"
-protected class ImportStatementDecl_Group extends GroupToken {
+// "import" (alias=ID "=")? ePackage=[ecore::EPackage|STRING] ";"
+protected class ReferencedMetamodel_Group extends GroupToken {
- public ImportStatementDecl_Group(IInstanceDescription curr, AbstractToken pred) {
+ public ReferencedMetamodel_Group(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, !IS_MANY, IS_REQUIRED);
}
@Override
public Group getGrammarElement() {
- return grammarAccess.getImportStatementDeclAccess().getGroup();
+ return grammarAccess.getReferencedMetamodelAccess().getGroup();
}
@Override
protected Solution createSolution() {
- Solution s1 = new ImportStatementDecl_3_Keyword(current, this).firstSolution();
+ Solution s1 = new ReferencedMetamodel_3_Keyword(current, this).firstSolution();
while(s1 != null) {
- Solution s2 = new ImportStatementDecl_2_Assignment_importURI(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+ Solution s2 = new ReferencedMetamodel_2_Assignment_ePackage(s1.getCurrent(), s1.getPredecessor()).firstSolution();
while(s2 != null) {
- Solution s3 = new ImportStatementDecl_1_Group(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+ Solution s3 = new ReferencedMetamodel_1_Group(s2.getCurrent(), s2.getPredecessor()).firstSolution();
while(s3 != null) {
- Solution s4 = new ImportStatementDecl_0_Keyword_import(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+ Solution s4 = new ReferencedMetamodel_0_Keyword_import(s3.getCurrent(), s3.getPredecessor()).firstSolution();
if(s4 != null) {
last = s4.getPredecessor();
return s4;
@@ -194,34 +194,34 @@ protected class ImportStatementDecl_Group extends GroupToken {
}
// "import"
-protected class ImportStatementDecl_0_Keyword_import extends KeywordToken {
+protected class ReferencedMetamodel_0_Keyword_import extends KeywordToken {
- public ImportStatementDecl_0_Keyword_import(IInstanceDescription curr, AbstractToken pred) {
+ public ReferencedMetamodel_0_Keyword_import(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, !IS_MANY, IS_REQUIRED);
}
public Keyword getGrammarElement() {
- return grammarAccess.getImportStatementDeclAccess().getImportKeyword_0();
+ return grammarAccess.getReferencedMetamodelAccess().getImportKeyword_0();
}
}
// (alias=ID "=")?
-protected class ImportStatementDecl_1_Group extends GroupToken {
+protected class ReferencedMetamodel_1_Group extends GroupToken {
- public ImportStatementDecl_1_Group(IInstanceDescription curr, AbstractToken pred) {
+ public ReferencedMetamodel_1_Group(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, !IS_MANY, !IS_REQUIRED);
}
@Override
public Group getGrammarElement() {
- return grammarAccess.getImportStatementDeclAccess().getGroup_1();
+ return grammarAccess.getReferencedMetamodelAccess().getGroup_1();
}
@Override
protected Solution createSolution() {
- Solution s1 = new ImportStatementDecl_1_1_Keyword(current, this).firstSolution();
+ Solution s1 = new ReferencedMetamodel_1_1_Keyword(current, this).firstSolution();
while(s1 != null) {
- Solution s2 = new ImportStatementDecl_1_0_Assignment_alias(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+ Solution s2 = new ReferencedMetamodel_1_0_Assignment_alias(s1.getCurrent(), s1.getPredecessor()).firstSolution();
if(s2 != null) {
last = s2.getPredecessor();
return s2;
@@ -234,15 +234,15 @@ protected class ImportStatementDecl_1_Group extends GroupToken {
}
// alias=ID
-protected class ImportStatementDecl_1_0_Assignment_alias extends AssignmentToken {
+protected class ReferencedMetamodel_1_0_Assignment_alias extends AssignmentToken {
- public ImportStatementDecl_1_0_Assignment_alias(IInstanceDescription curr, AbstractToken pred) {
+ public ReferencedMetamodel_1_0_Assignment_alias(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, !IS_MANY, IS_REQUIRED);
}
@Override
public Assignment getGrammarElement() {
- return grammarAccess.getImportStatementDeclAccess().getAliasAssignment_1_0();
+ return grammarAccess.getReferencedMetamodelAccess().getAliasAssignment_1_0();
}
@Override
@@ -251,7 +251,7 @@ protected class ImportStatementDecl_1_0_Assignment_alias extends AssignmentToken
IInstanceDescription obj = current.cloneAndConsume("alias");
if(Boolean.TRUE.booleanValue()) { // org::eclipse::xtext::impl::RuleCallImpl FIXME: check if value is valid for lexer rule
type = AssignmentType.LRC;
- element = grammarAccess.getImportStatementDeclAccess().getAliasIDTerminalRuleCall_1_0_0();
+ element = grammarAccess.getReferencedMetamodelAccess().getAliasIDTerminalRuleCall_1_0_0();
return new Solution(obj);
}
return null;
@@ -259,57 +259,60 @@ protected class ImportStatementDecl_1_0_Assignment_alias extends AssignmentToken
}
// "="
-protected class ImportStatementDecl_1_1_Keyword extends KeywordToken {
+protected class ReferencedMetamodel_1_1_Keyword extends KeywordToken {
- public ImportStatementDecl_1_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
+ public ReferencedMetamodel_1_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, !IS_MANY, IS_REQUIRED);
}
public Keyword getGrammarElement() {
- return grammarAccess.getImportStatementDeclAccess().getEqualsSignKeyword_1_1();
+ return grammarAccess.getReferencedMetamodelAccess().getEqualsSignKeyword_1_1();
}
}
-// importURI=STRING
-protected class ImportStatementDecl_2_Assignment_importURI extends AssignmentToken {
+// ePackage=[ecore::EPackage|STRING]
+protected class ReferencedMetamodel_2_Assignment_ePackage extends AssignmentToken {
- public ImportStatementDecl_2_Assignment_importURI(IInstanceDescription curr, AbstractToken pred) {
+ public ReferencedMetamodel_2_Assignment_ePackage(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, !IS_MANY, IS_REQUIRED);
}
@Override
public Assignment getGrammarElement() {
- return grammarAccess.getImportStatementDeclAccess().getImportURIAssignment_2();
+ return grammarAccess.getReferencedMetamodelAccess().getEPackageAssignment_2();
}
@Override
protected Solution createSolution() {
- if((value = current.getConsumable("importURI",IS_REQUIRED)) == null) return null;
- IInstanceDescription obj = current.cloneAndConsume("importURI");
- if(Boolean.TRUE.booleanValue()) { // org::eclipse::xtext::impl::RuleCallImpl FIXME: check if value is valid for lexer rule
- type = AssignmentType.LRC;
- element = grammarAccess.getImportStatementDeclAccess().getImportURISTRINGTerminalRuleCall_2_0();
- return new Solution(obj);
+ if((value = current.getConsumable("ePackage",IS_REQUIRED)) == null) return null;
+ IInstanceDescription obj = current.cloneAndConsume("ePackage");
+ if(value instanceof EObject) { // org::eclipse::xtext::impl::CrossReferenceImpl
+ IInstanceDescription param = getDescr((EObject)value);
+ if(param.isInstanceOf(grammarAccess.getReferencedMetamodelAccess().getEPackageEPackageCrossReference_2_0().getType().getClassifier())) {
+ type = AssignmentType.CR;
+ element = grammarAccess.getReferencedMetamodelAccess().getEPackageEPackageCrossReference_2_0();
+ return new Solution(obj);
+ }
}
return null;
}
}
// ";"
-protected class ImportStatementDecl_3_Keyword extends KeywordToken {
+protected class ReferencedMetamodel_3_Keyword extends KeywordToken {
- public ImportStatementDecl_3_Keyword(IInstanceDescription curr, AbstractToken pred) {
+ public ReferencedMetamodel_3_Keyword(IInstanceDescription curr, AbstractToken pred) {
super(curr, pred, !IS_MANY, IS_REQUIRED);
}
public Keyword getGrammarElement() {
- return grammarAccess.getImportStatementDeclAccess().getSemicolonKeyword_3();
+ return grammarAccess.getReferencedMetamodelAccess().getSemicolonKeyword_3();
}
}
-/************ end Rule ImportStatementDecl ****************/
+/************ end Rule ReferencedMetamodel ****************/
/************ begin Rule EPackageDecl ****************
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g
index 6ab1862..5819c20 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g
@@ -84,9 +84,9 @@ ruleEcoreDsl returns [EObject current=null]
{
- currentNode=createCompositeNode(grammarAccess.getEcoreDslAccess().getImportsImportStatementDeclParserRuleCall_0_0(), currentNode);
+ currentNode=createCompositeNode(grammarAccess.getEcoreDslAccess().getMetamodelDeclarationsReferencedMetamodelParserRuleCall_0_0(), currentNode);
}
- lv_imports_0=ruleImportStatementDecl
+ lv_metamodelDeclarations_0=ruleReferencedMetamodel
{
if ($current==null) {
$current = factory.create(grammarAccess.getEcoreDslRule().getType().getClassifier());
@@ -94,7 +94,7 @@ ruleEcoreDsl returns [EObject current=null]
}
try {
- add($current, "imports", lv_imports_0, "ImportStatementDecl", currentNode);
+ add($current, "metamodelDeclarations", lv_metamodelDeclarations_0, "ReferencedMetamodel", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -128,16 +128,16 @@ ruleEcoreDsl returns [EObject current=null]
-// Entry rule entryRuleImportStatementDecl
-entryRuleImportStatementDecl returns [EObject current=null] :
- { currentNode = createCompositeNode(grammarAccess.getImportStatementDeclRule(), currentNode); }
- iv_ruleImportStatementDecl=ruleImportStatementDecl
- { $current=$iv_ruleImportStatementDecl.current; }
+// Entry rule entryRuleReferencedMetamodel
+entryRuleReferencedMetamodel returns [EObject current=null] :
+ { currentNode = createCompositeNode(grammarAccess.getReferencedMetamodelRule(), currentNode); }
+ iv_ruleReferencedMetamodel=ruleReferencedMetamodel
+ { $current=$iv_ruleReferencedMetamodel.current; }
EOF
;
-// Rule ImportStatementDecl
-ruleImportStatementDecl returns [EObject current=null]
+// Rule ReferencedMetamodel
+ruleReferencedMetamodel returns [EObject current=null]
@init { EObject temp=null; setCurrentLookahead(); resetLookahead();
}
@after { resetLookahead();
@@ -145,18 +145,18 @@ ruleImportStatementDecl returns [EObject current=null]
}:
('import'
{
- createLeafNode(grammarAccess.getImportStatementDeclAccess().getImportKeyword_0(), null);
+ createLeafNode(grammarAccess.getReferencedMetamodelAccess().getImportKeyword_0(), null);
}
((
lv_alias_1= RULE_ID
{
- createLeafNode(grammarAccess.getImportStatementDeclAccess().getAliasIDTerminalRuleCall_1_0_0(), "alias");
+ createLeafNode(grammarAccess.getReferencedMetamodelAccess().getAliasIDTerminalRuleCall_1_0_0(), "alias");
}
{
if ($current==null) {
- $current = factory.create(grammarAccess.getImportStatementDeclRule().getType().getClassifier());
+ $current = factory.create(grammarAccess.getReferencedMetamodelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, $current);
}
@@ -169,31 +169,27 @@ ruleImportStatementDecl returns [EObject current=null]
)'='
{
- createLeafNode(grammarAccess.getImportStatementDeclAccess().getEqualsSignKeyword_1_1(), null);
+ createLeafNode(grammarAccess.getReferencedMetamodelAccess().getEqualsSignKeyword_1_1(), null);
}
)?(
- lv_importURI_3= RULE_STRING
- {
- createLeafNode(grammarAccess.getImportStatementDeclAccess().getImportURISTRINGTerminalRuleCall_2_0(), "importURI");
- }
-
- {
- if ($current==null) {
- $current = factory.create(grammarAccess.getImportStatementDeclRule().getType().getClassifier());
+
+ {
+ if ($current==null) {
+ $current = factory.create(grammarAccess.getReferencedMetamodelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, $current);
}
-
- try {
- set($current, "importURI", lv_importURI_3, "STRING", lastConsumedNode);
- } catch (ValueConverterException vce) {
- handleValueConverterException(vce);
- }
- }
+ }
+ RULE_STRING
+ {
+ createLeafNode(grammarAccess.getReferencedMetamodelAccess().getEPackageEPackageCrossReference_2_0(), "ePackage");
+ }
+
+ // TODO assign feature to currentNode
)';'
{
- createLeafNode(grammarAccess.getImportStatementDeclAccess().getSemicolonKeyword_3(), null);
+ createLeafNode(grammarAccess.getReferencedMetamodelAccess().getSemicolonKeyword_3(), null);
}
);
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
index c5e91ce..d4a6053 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java
@@ -837,8 +837,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_BAG() throws RecognitionException {
try {
int _type = RULE_BAG;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2911:10: ( 'bag' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2911:12: 'bag'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2907:10: ( 'bag' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2907:12: 'bag'
{
match("bag");
@@ -856,8 +856,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_RANDOM() throws RecognitionException {
try {
int _type = RULE_RANDOM;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2913:13: ( 'random' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2913:15: 'random'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2909:13: ( 'random' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2909:15: 'random'
{
match("random");
@@ -875,8 +875,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_READONLY() throws RecognitionException {
try {
int _type = RULE_READONLY;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2915:15: ( 'readonly' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2915:17: 'readonly'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2911:15: ( 'readonly' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2911:17: 'readonly'
{
match("readonly");
@@ -894,8 +894,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_LOCAL() throws RecognitionException {
try {
int _type = RULE_LOCAL;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2917:12: ( 'local' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2917:14: 'local'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2913:12: ( 'local' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2913:14: 'local'
{
match("local");
@@ -913,8 +913,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_SERIALIZABLE() throws RecognitionException {
try {
int _type = RULE_SERIALIZABLE;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2919:19: ( '!serializable' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2919:21: '!serializable'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2915:19: ( '!serializable' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2915:21: '!serializable'
{
match("!serializable");
@@ -932,10 +932,10 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2917:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2917:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:11: ( '^' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2917:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -944,7 +944,7 @@ public class InternalEcoreDslLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:11: '^'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2917:11: '^'
{
match('^');
@@ -963,7 +963,7 @@ public class InternalEcoreDslLexer extends Lexer {
recover(mse); throw mse;
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2917:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -1011,10 +1011,10 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2919:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2919:12: ( '0' .. '9' )+
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:12: ( '0' .. '9' )+
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2919:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -1028,7 +1028,7 @@ public class InternalEcoreDslLexer extends Lexer {
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:13: '0' .. '9'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2919:13: '0' .. '9'
{
matchRange('0','9');
@@ -1058,10 +1058,10 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -1073,16 +1073,16 @@ public class InternalEcoreDslLexer extends Lexer {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2925:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
+ new NoViableAltException("2921:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input);
throw nvae;
}
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -1098,7 +1098,7 @@ public class InternalEcoreDslLexer extends Lexer {
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921: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' ) {
@@ -1115,7 +1115,7 @@ public class InternalEcoreDslLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:62: ~ ( ( '\\\\' | '\"' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:62: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -1141,10 +1141,10 @@ public class InternalEcoreDslLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:82: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:87: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -1160,7 +1160,7 @@ public class InternalEcoreDslLexer extends Lexer {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:88: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
{
match('\\');
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -1177,7 +1177,7 @@ public class InternalEcoreDslLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:129: ~ ( ( '\\\\' | '\\'' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2921:129: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -1219,12 +1219,12 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -1249,7 +1249,7 @@ public class InternalEcoreDslLexer extends Lexer {
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:52: .
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2923:52: .
{
matchAny();
@@ -1277,12 +1277,12 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -1295,7 +1295,7 @@ public class InternalEcoreDslLexer extends Lexer {
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:24: ~ ( ( '\\n' | '\\r' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:24: ~ ( ( '\\n' | '\\r' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -1316,7 +1316,7 @@ public class InternalEcoreDslLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:40: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -1325,9 +1325,9 @@ public class InternalEcoreDslLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:41: ( '\\r' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -1336,7 +1336,7 @@ public class InternalEcoreDslLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:41: '\\r'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2925:41: '\\r'
{
match('\r');
@@ -1366,10 +1366,10 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2931:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2931:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2931:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2927:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -1422,8 +1422,8 @@ public class InternalEcoreDslLexer extends Lexer {
public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2933:16: ( . )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2933:18: .
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:16: ( . )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2929:18: .
{
matchAny();
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
index 285fe96..09a4b50 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java
@@ -105,11 +105,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEcoreDsl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:77:1: ruleEcoreDsl returns [EObject current=null] : ( (lv_imports_0= ruleImportStatementDecl )* (lv_package_1= ruleEPackageDecl ) ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:77:1: ruleEcoreDsl returns [EObject current=null] : ( (lv_metamodelDeclarations_0= ruleReferencedMetamodel )* (lv_package_1= ruleEPackageDecl ) ) ;
public final EObject ruleEcoreDsl() throws RecognitionException {
EObject current = null;
- EObject lv_imports_0 = null;
+ EObject lv_metamodelDeclarations_0 = null;
EObject lv_package_1 = null;
@@ -117,13 +117,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:82:6: ( ( (lv_imports_0= ruleImportStatementDecl )* (lv_package_1= ruleEPackageDecl ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:1: ( (lv_imports_0= ruleImportStatementDecl )* (lv_package_1= ruleEPackageDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:82:6: ( ( (lv_metamodelDeclarations_0= ruleReferencedMetamodel )* (lv_package_1= ruleEPackageDecl ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:1: ( (lv_metamodelDeclarations_0= ruleReferencedMetamodel )* (lv_package_1= ruleEPackageDecl ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:1: ( (lv_imports_0= ruleImportStatementDecl )* (lv_package_1= ruleEPackageDecl ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:2: (lv_imports_0= ruleImportStatementDecl )* (lv_package_1= ruleEPackageDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:1: ( (lv_metamodelDeclarations_0= ruleReferencedMetamodel )* (lv_package_1= ruleEPackageDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:2: (lv_metamodelDeclarations_0= ruleReferencedMetamodel )* (lv_package_1= ruleEPackageDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:2: (lv_imports_0= ruleImportStatementDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:2: (lv_metamodelDeclarations_0= ruleReferencedMetamodel )*
loop1:
do {
int alt1=2;
@@ -136,13 +136,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt1) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:86:6: lv_imports_0= ruleImportStatementDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:86:6: lv_metamodelDeclarations_0= ruleReferencedMetamodel
{
- currentNode=createCompositeNode(grammarAccess.getEcoreDslAccess().getImportsImportStatementDeclParserRuleCall_0_0(), currentNode);
+ currentNode=createCompositeNode(grammarAccess.getEcoreDslAccess().getMetamodelDeclarationsReferencedMetamodelParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleImportStatementDecl_in_ruleEcoreDsl140);
- lv_imports_0=ruleImportStatementDecl();
+ pushFollow(FOLLOW_ruleReferencedMetamodel_in_ruleEcoreDsl140);
+ lv_metamodelDeclarations_0=ruleReferencedMetamodel();
_fsp--;
@@ -152,7 +152,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
try {
- add(current, "imports", lv_imports_0, "ImportStatementDecl", currentNode);
+ add(current, "metamodelDeclarations", lv_metamodelDeclarations_0, "ReferencedMetamodel", currentNode);
} catch (ValueConverterException vce) {
handleValueConverterException(vce);
}
@@ -215,25 +215,25 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR end ruleEcoreDsl
- // $ANTLR start entryRuleImportStatementDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:132:1: entryRuleImportStatementDecl returns [EObject current=null] : iv_ruleImportStatementDecl= ruleImportStatementDecl EOF ;
- public final EObject entryRuleImportStatementDecl() throws RecognitionException {
+ // $ANTLR start entryRuleReferencedMetamodel
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:132:1: entryRuleReferencedMetamodel returns [EObject current=null] : iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF ;
+ public final EObject entryRuleReferencedMetamodel() throws RecognitionException {
EObject current = null;
- EObject iv_ruleImportStatementDecl = null;
+ EObject iv_ruleReferencedMetamodel = null;
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:132:61: (iv_ruleImportStatementDecl= ruleImportStatementDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:133:2: iv_ruleImportStatementDecl= ruleImportStatementDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:132:61: (iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:133:2: iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF
{
- currentNode = createCompositeNode(grammarAccess.getImportStatementDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleImportStatementDecl_in_entryRuleImportStatementDecl216);
- iv_ruleImportStatementDecl=ruleImportStatementDecl();
+ currentNode = createCompositeNode(grammarAccess.getReferencedMetamodelRule(), currentNode);
+ pushFollow(FOLLOW_ruleReferencedMetamodel_in_entryRuleReferencedMetamodel216);
+ iv_ruleReferencedMetamodel=ruleReferencedMetamodel();
_fsp--;
- current =iv_ruleImportStatementDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleImportStatementDecl226);
+ current =iv_ruleReferencedMetamodel;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleReferencedMetamodel226);
}
@@ -247,29 +247,28 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
return current;
}
- // $ANTLR end entryRuleImportStatementDecl
+ // $ANTLR end entryRuleReferencedMetamodel
- // $ANTLR start ruleImportStatementDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:140:1: ruleImportStatementDecl returns [EObject current=null] : ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? (lv_importURI_3= RULE_STRING ) ';' ) ;
- public final EObject ruleImportStatementDecl() throws RecognitionException {
+ // $ANTLR start ruleReferencedMetamodel
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:140:1: ruleReferencedMetamodel returns [EObject current=null] : ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ( RULE_STRING ) ';' ) ;
+ public final EObject ruleReferencedMetamodel() throws RecognitionException {
EObject current = null;
Token lv_alias_1=null;
- Token lv_importURI_3=null;
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:145:6: ( ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? (lv_importURI_3= RULE_STRING ) ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:146:1: ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? (lv_importURI_3= RULE_STRING ) ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:145:6: ( ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ( RULE_STRING ) ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:146:1: ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ( RULE_STRING ) ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:146:1: ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? (lv_importURI_3= RULE_STRING ) ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:146:2: 'import' ( (lv_alias_1= RULE_ID ) '=' )? (lv_importURI_3= RULE_STRING ) ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:146:1: ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ( RULE_STRING ) ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:146:2: 'import' ( (lv_alias_1= RULE_ID ) '=' )? ( RULE_STRING ) ';'
{
- match(input,16,FOLLOW_16_in_ruleImportStatementDecl260);
+ match(input,16,FOLLOW_16_in_ruleReferencedMetamodel260);
- createLeafNode(grammarAccess.getImportStatementDeclAccess().getImportKeyword_0(), null);
+ createLeafNode(grammarAccess.getReferencedMetamodelAccess().getImportKeyword_0(), null);
// ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:150:1: ( (lv_alias_1= RULE_ID ) '=' )?
int alt2=2;
@@ -286,13 +285,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:152:6: lv_alias_1= RULE_ID
{
lv_alias_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleImportStatementDecl283);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReferencedMetamodel283);
- createLeafNode(grammarAccess.getImportStatementDeclAccess().getAliasIDTerminalRuleCall_1_0_0(), "alias");
+ createLeafNode(grammarAccess.getReferencedMetamodelAccess().getAliasIDTerminalRuleCall_1_0_0(), "alias");
if (current==null) {
- current = factory.create(grammarAccess.getImportStatementDeclRule().getType().getClassifier());
+ current = factory.create(grammarAccess.getReferencedMetamodelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, current);
}
@@ -305,9 +304,9 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,17,FOLLOW_17_in_ruleImportStatementDecl300);
+ match(input,17,FOLLOW_17_in_ruleReferencedMetamodel300);
- createLeafNode(grammarAccess.getImportStatementDeclAccess().getEqualsSignKeyword_1_1(), null);
+ createLeafNode(grammarAccess.getReferencedMetamodelAccess().getEqualsSignKeyword_1_1(), null);
}
@@ -315,32 +314,25 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:174:3: (lv_importURI_3= RULE_STRING )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:176:6: lv_importURI_3= RULE_STRING
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:174:3: ( RULE_STRING )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:177:3: RULE_STRING
{
- lv_importURI_3=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImportStatementDecl324);
- createLeafNode(grammarAccess.getImportStatementDeclAccess().getImportURISTRINGTerminalRuleCall_2_0(), "importURI");
-
-
- if (current==null) {
- current = factory.create(grammarAccess.getImportStatementDeclRule().getType().getClassifier());
+ if (current==null) {
+ current = factory.create(grammarAccess.getReferencedMetamodelRule().getType().getClassifier());
associateNodeWithAstElement(currentNode, current);
}
-
- try {
- set(current, "importURI", lv_importURI_3, "STRING", lastConsumedNode);
- } catch (ValueConverterException vce) {
- handleValueConverterException(vce);
- }
-
+
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleReferencedMetamodel324);
+
+ createLeafNode(grammarAccess.getReferencedMetamodelAccess().getEPackageEPackageCrossReference_2_0(), "ePackage");
+
}
- match(input,18,FOLLOW_18_in_ruleImportStatementDecl341);
+ match(input,18,FOLLOW_18_in_ruleReferencedMetamodel336);
- createLeafNode(grammarAccess.getImportStatementDeclAccess().getSemicolonKeyword_3(), null);
+ createLeafNode(grammarAccess.getReferencedMetamodelAccess().getSemicolonKeyword_3(), null);
}
@@ -361,11 +353,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
return current;
}
- // $ANTLR end ruleImportStatementDecl
+ // $ANTLR end ruleReferencedMetamodel
// $ANTLR start entryRuleEPackageDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:205:1: entryRuleEPackageDecl returns [EObject current=null] : iv_ruleEPackageDecl= ruleEPackageDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:201:1: entryRuleEPackageDecl returns [EObject current=null] : iv_ruleEPackageDecl= ruleEPackageDecl EOF ;
public final EObject entryRuleEPackageDecl() throws RecognitionException {
EObject current = null;
@@ -373,16 +365,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:205:54: (iv_ruleEPackageDecl= ruleEPackageDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:206:2: iv_ruleEPackageDecl= ruleEPackageDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:201:54: (iv_ruleEPackageDecl= ruleEPackageDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:202:2: iv_ruleEPackageDecl= ruleEPackageDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEPackageDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEPackageDecl_in_entryRuleEPackageDecl374);
+ pushFollow(FOLLOW_ruleEPackageDecl_in_entryRuleEPackageDecl369);
iv_ruleEPackageDecl=ruleEPackageDecl();
_fsp--;
current =iv_ruleEPackageDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEPackageDecl384);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEPackageDecl379);
}
@@ -400,7 +392,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEPackageDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:213:1: ruleEPackageDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= ruleQID ) 'nsURI' '=' (lv_nsURI_5= RULE_STRING ) 'nsPrefix' '=' (lv_nsPrefix_8= ruleQID ) '{' ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* '}' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:209:1: ruleEPackageDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= ruleQID ) 'nsURI' '=' (lv_nsURI_5= RULE_STRING ) 'nsPrefix' '=' (lv_nsPrefix_8= ruleQID ) '{' ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* '}' ) ;
public final EObject ruleEPackageDecl() throws RecognitionException {
EObject current = null;
@@ -419,13 +411,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:218:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= ruleQID ) 'nsURI' '=' (lv_nsURI_5= RULE_STRING ) 'nsPrefix' '=' (lv_nsPrefix_8= ruleQID ) '{' ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* '}' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:219:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= ruleQID ) 'nsURI' '=' (lv_nsURI_5= RULE_STRING ) 'nsPrefix' '=' (lv_nsPrefix_8= ruleQID ) '{' ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:214:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= ruleQID ) 'nsURI' '=' (lv_nsURI_5= RULE_STRING ) 'nsPrefix' '=' (lv_nsPrefix_8= ruleQID ) '{' ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* '}' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:215:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= ruleQID ) 'nsURI' '=' (lv_nsURI_5= RULE_STRING ) 'nsPrefix' '=' (lv_nsPrefix_8= ruleQID ) '{' ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* '}' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:219:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= ruleQID ) 'nsURI' '=' (lv_nsURI_5= RULE_STRING ) 'nsPrefix' '=' (lv_nsPrefix_8= ruleQID ) '{' ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* '}' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:219:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= ruleQID ) 'nsURI' '=' (lv_nsURI_5= RULE_STRING ) 'nsPrefix' '=' (lv_nsPrefix_8= ruleQID ) '{' ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* '}'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:215:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= ruleQID ) 'nsURI' '=' (lv_nsURI_5= RULE_STRING ) 'nsPrefix' '=' (lv_nsPrefix_8= ruleQID ) '{' ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:215:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= ruleQID ) 'nsURI' '=' (lv_nsURI_5= RULE_STRING ) 'nsPrefix' '=' (lv_nsPrefix_8= ruleQID ) '{' ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* '}'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:219:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:215:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop3:
do {
int alt3=2;
@@ -438,12 +430,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt3) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:222:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:218:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEPackageDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEPackageDecl443);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEPackageDecl438);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -469,17 +461,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,19,FOLLOW_19_in_ruleEPackageDecl457);
+ match(input,19,FOLLOW_19_in_ruleEPackageDecl452);
createLeafNode(grammarAccess.getEPackageDeclAccess().getPackageKeyword_1(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:244:1: (lv_name_2= ruleQID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:247:6: lv_name_2= ruleQID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:240:1: (lv_name_2= ruleQID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:243:6: lv_name_2= ruleQID
{
currentNode=createCompositeNode(grammarAccess.getEPackageDeclAccess().getNameQIDParserRuleCall_2_0(), currentNode);
- pushFollow(FOLLOW_ruleQID_in_ruleEPackageDecl491);
+ pushFollow(FOLLOW_ruleQID_in_ruleEPackageDecl486);
lv_name_2=ruleQID();
_fsp--;
@@ -499,19 +491,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,20,FOLLOW_20_in_ruleEPackageDecl504);
+ match(input,20,FOLLOW_20_in_ruleEPackageDecl499);
createLeafNode(grammarAccess.getEPackageDeclAccess().getNsURIKeyword_3(), null);
- match(input,17,FOLLOW_17_in_ruleEPackageDecl513);
+ match(input,17,FOLLOW_17_in_ruleEPackageDecl508);
createLeafNode(grammarAccess.getEPackageDeclAccess().getEqualsSignKeyword_4(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:273:1: (lv_nsURI_5= RULE_STRING )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:275:6: lv_nsURI_5= RULE_STRING
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:269:1: (lv_nsURI_5= RULE_STRING )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:271:6: lv_nsURI_5= RULE_STRING
{
lv_nsURI_5=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEPackageDecl535);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEPackageDecl530);
createLeafNode(grammarAccess.getEPackageDeclAccess().getNsURISTRINGTerminalRuleCall_5_0(), "nsURI");
@@ -530,21 +522,21 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,21,FOLLOW_21_in_ruleEPackageDecl552);
+ match(input,21,FOLLOW_21_in_ruleEPackageDecl547);
createLeafNode(grammarAccess.getEPackageDeclAccess().getNsPrefixKeyword_6(), null);
- match(input,17,FOLLOW_17_in_ruleEPackageDecl561);
+ match(input,17,FOLLOW_17_in_ruleEPackageDecl556);
createLeafNode(grammarAccess.getEPackageDeclAccess().getEqualsSignKeyword_7(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:301:1: (lv_nsPrefix_8= ruleQID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:304:6: lv_nsPrefix_8= ruleQID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:297:1: (lv_nsPrefix_8= ruleQID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:300:6: lv_nsPrefix_8= ruleQID
{
currentNode=createCompositeNode(grammarAccess.getEPackageDeclAccess().getNsPrefixQIDParserRuleCall_8_0(), currentNode);
- pushFollow(FOLLOW_ruleQID_in_ruleEPackageDecl595);
+ pushFollow(FOLLOW_ruleQID_in_ruleEPackageDecl590);
lv_nsPrefix_8=ruleQID();
_fsp--;
@@ -564,26 +556,26 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,22,FOLLOW_22_in_ruleEPackageDecl608);
+ match(input,22,FOLLOW_22_in_ruleEPackageDecl603);
createLeafNode(grammarAccess.getEPackageDeclAccess().getLeftCurlyBracketKeyword_9(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:326:1: ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:322:1: ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )*
loop4:
do {
int alt4=3;
alt4 = dfa4.predict(input);
switch (alt4) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:326:2: (lv_eSubpackages_10= ruleSubEPackageDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:322:2: (lv_eSubpackages_10= ruleSubEPackageDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:326:2: (lv_eSubpackages_10= ruleSubEPackageDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:329:6: lv_eSubpackages_10= ruleSubEPackageDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:322:2: (lv_eSubpackages_10= ruleSubEPackageDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:325:6: lv_eSubpackages_10= ruleSubEPackageDecl
{
currentNode=createCompositeNode(grammarAccess.getEPackageDeclAccess().getESubpackagesSubEPackageDeclParserRuleCall_10_0_0(), currentNode);
- pushFollow(FOLLOW_ruleSubEPackageDecl_in_ruleEPackageDecl643);
+ pushFollow(FOLLOW_ruleSubEPackageDecl_in_ruleEPackageDecl638);
lv_eSubpackages_10=ruleSubEPackageDecl();
_fsp--;
@@ -607,15 +599,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:348:6: (lv_eClassifiers_11= ruleEClassifierDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:344:6: (lv_eClassifiers_11= ruleEClassifierDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:348:6: (lv_eClassifiers_11= ruleEClassifierDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:351:6: lv_eClassifiers_11= ruleEClassifierDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:344:6: (lv_eClassifiers_11= ruleEClassifierDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:347:6: lv_eClassifiers_11= ruleEClassifierDecl
{
currentNode=createCompositeNode(grammarAccess.getEPackageDeclAccess().getEClassifiersEClassifierDeclParserRuleCall_10_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEClassifierDecl_in_ruleEPackageDecl687);
+ pushFollow(FOLLOW_ruleEClassifierDecl_in_ruleEPackageDecl682);
lv_eClassifiers_11=ruleEClassifierDecl();
_fsp--;
@@ -644,7 +636,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,23,FOLLOW_23_in_ruleEPackageDecl702);
+ match(input,23,FOLLOW_23_in_ruleEPackageDecl697);
createLeafNode(grammarAccess.getEPackageDeclAccess().getRightCurlyBracketKeyword_11(), null);
@@ -671,7 +663,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleSubEPackageDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:380:1: entryRuleSubEPackageDecl returns [EObject current=null] : iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:376:1: entryRuleSubEPackageDecl returns [EObject current=null] : iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF ;
public final EObject entryRuleSubEPackageDecl() throws RecognitionException {
EObject current = null;
@@ -679,16 +671,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:380:57: (iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:381:2: iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:376:57: (iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:377:2: iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getSubEPackageDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleSubEPackageDecl_in_entryRuleSubEPackageDecl735);
+ pushFollow(FOLLOW_ruleSubEPackageDecl_in_entryRuleSubEPackageDecl730);
iv_ruleSubEPackageDecl=ruleSubEPackageDecl();
_fsp--;
current =iv_ruleSubEPackageDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleSubEPackageDecl745);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleSubEPackageDecl740);
}
@@ -706,7 +698,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleSubEPackageDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:388:1: ruleSubEPackageDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= RULE_ID ) '{' ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* '}' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:384:1: ruleSubEPackageDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= RULE_ID ) '{' ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* '}' ) ;
public final EObject ruleSubEPackageDecl() throws RecognitionException {
EObject current = null;
@@ -721,13 +713,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:393:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= RULE_ID ) '{' ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* '}' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:394:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= RULE_ID ) '{' ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:389:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= RULE_ID ) '{' ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* '}' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:390:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= RULE_ID ) '{' ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* '}' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:394:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= RULE_ID ) '{' ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* '}' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:394:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= RULE_ID ) '{' ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* '}'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:390:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= RULE_ID ) '{' ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:390:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' (lv_name_2= RULE_ID ) '{' ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* '}'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:394:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:390:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop5:
do {
int alt5=2;
@@ -740,12 +732,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt5) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:393:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getSubEPackageDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleSubEPackageDecl804);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleSubEPackageDecl799);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -771,15 +763,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,19,FOLLOW_19_in_ruleSubEPackageDecl818);
+ match(input,19,FOLLOW_19_in_ruleSubEPackageDecl813);
createLeafNode(grammarAccess.getSubEPackageDeclAccess().getPackageKeyword_1(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:419:1: (lv_name_2= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:421:6: lv_name_2= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:415:1: (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:417:6: lv_name_2= RULE_ID
{
lv_name_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubEPackageDecl840);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubEPackageDecl835);
createLeafNode(grammarAccess.getSubEPackageDeclAccess().getNameIDTerminalRuleCall_2_0(), "name");
@@ -798,26 +790,26 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,22,FOLLOW_22_in_ruleSubEPackageDecl857);
+ match(input,22,FOLLOW_22_in_ruleSubEPackageDecl852);
createLeafNode(grammarAccess.getSubEPackageDeclAccess().getLeftCurlyBracketKeyword_3(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:443:1: ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:439:1: ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )*
loop6:
do {
int alt6=3;
alt6 = dfa6.predict(input);
switch (alt6) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:443:2: (lv_eSubpackages_4= ruleSubEPackageDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:439:2: (lv_eSubpackages_4= ruleSubEPackageDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:443:2: (lv_eSubpackages_4= ruleSubEPackageDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:446:6: lv_eSubpackages_4= ruleSubEPackageDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:439:2: (lv_eSubpackages_4= ruleSubEPackageDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:442:6: lv_eSubpackages_4= ruleSubEPackageDecl
{
currentNode=createCompositeNode(grammarAccess.getSubEPackageDeclAccess().getESubpackagesSubEPackageDeclParserRuleCall_4_0_0(), currentNode);
- pushFollow(FOLLOW_ruleSubEPackageDecl_in_ruleSubEPackageDecl892);
+ pushFollow(FOLLOW_ruleSubEPackageDecl_in_ruleSubEPackageDecl887);
lv_eSubpackages_4=ruleSubEPackageDecl();
_fsp--;
@@ -841,15 +833,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:465:6: (lv_eClassifiers_5= ruleEClassifierDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:461:6: (lv_eClassifiers_5= ruleEClassifierDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:465:6: (lv_eClassifiers_5= ruleEClassifierDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:468:6: lv_eClassifiers_5= ruleEClassifierDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:461:6: (lv_eClassifiers_5= ruleEClassifierDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:464:6: lv_eClassifiers_5= ruleEClassifierDecl
{
currentNode=createCompositeNode(grammarAccess.getSubEPackageDeclAccess().getEClassifiersEClassifierDeclParserRuleCall_4_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEClassifierDecl_in_ruleSubEPackageDecl936);
+ pushFollow(FOLLOW_ruleEClassifierDecl_in_ruleSubEPackageDecl931);
lv_eClassifiers_5=ruleEClassifierDecl();
_fsp--;
@@ -878,7 +870,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,23,FOLLOW_23_in_ruleSubEPackageDecl951);
+ match(input,23,FOLLOW_23_in_ruleSubEPackageDecl946);
createLeafNode(grammarAccess.getSubEPackageDeclAccess().getRightCurlyBracketKeyword_5(), null);
@@ -905,7 +897,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEClassifierDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:497:1: entryRuleEClassifierDecl returns [EObject current=null] : iv_ruleEClassifierDecl= ruleEClassifierDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:493:1: entryRuleEClassifierDecl returns [EObject current=null] : iv_ruleEClassifierDecl= ruleEClassifierDecl EOF ;
public final EObject entryRuleEClassifierDecl() throws RecognitionException {
EObject current = null;
@@ -913,16 +905,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:497:57: (iv_ruleEClassifierDecl= ruleEClassifierDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:498:2: iv_ruleEClassifierDecl= ruleEClassifierDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:493:57: (iv_ruleEClassifierDecl= ruleEClassifierDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:494:2: iv_ruleEClassifierDecl= ruleEClassifierDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEClassifierDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEClassifierDecl_in_entryRuleEClassifierDecl984);
+ pushFollow(FOLLOW_ruleEClassifierDecl_in_entryRuleEClassifierDecl979);
iv_ruleEClassifierDecl=ruleEClassifierDecl();
_fsp--;
current =iv_ruleEClassifierDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEClassifierDecl994);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEClassifierDecl989);
}
@@ -940,7 +932,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEClassifierDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:505:1: ruleEClassifierDecl returns [EObject current=null] : (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:501:1: ruleEClassifierDecl returns [EObject current=null] : (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl ) ;
public final EObject ruleEClassifierDecl() throws RecognitionException {
EObject current = null;
@@ -952,20 +944,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:510:6: ( (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:511:1: (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:506:6: ( (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:507:1: (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:511:1: (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:507:1: (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl )
int alt7=2;
alt7 = dfa7.predict(input);
switch (alt7) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:512:5: this_EClassDecl_0= ruleEClassDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:508:5: this_EClassDecl_0= ruleEClassDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassifierDeclAccess().getEClassDeclParserRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleEClassDecl_in_ruleEClassifierDecl1041);
+ pushFollow(FOLLOW_ruleEClassDecl_in_ruleEClassifierDecl1036);
this_EClassDecl_0=ruleEClassDecl();
_fsp--;
@@ -977,12 +969,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:522:5: this_EDataTypeDecl_1= ruleEDataTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:518:5: this_EDataTypeDecl_1= ruleEDataTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassifierDeclAccess().getEDataTypeDeclParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleEDataTypeDecl_in_ruleEClassifierDecl1068);
+ pushFollow(FOLLOW_ruleEDataTypeDecl_in_ruleEClassifierDecl1063);
this_EDataTypeDecl_1=ruleEDataTypeDecl();
_fsp--;
@@ -1016,7 +1008,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEDataTypeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:537:1: entryRuleEDataTypeDecl returns [EObject current=null] : iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:533:1: entryRuleEDataTypeDecl returns [EObject current=null] : iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF ;
public final EObject entryRuleEDataTypeDecl() throws RecognitionException {
EObject current = null;
@@ -1024,16 +1016,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:537:55: (iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:538:2: iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:533:55: (iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:534:2: iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEDataTypeDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEDataTypeDecl_in_entryRuleEDataTypeDecl1100);
+ pushFollow(FOLLOW_ruleEDataTypeDecl_in_entryRuleEDataTypeDecl1095);
iv_ruleEDataTypeDecl=ruleEDataTypeDecl();
_fsp--;
current =iv_ruleEDataTypeDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEDataTypeDecl1110);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEDataTypeDecl1105);
}
@@ -1051,7 +1043,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEDataTypeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:545:1: ruleEDataTypeDecl returns [EObject current=null] : ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:541:1: ruleEDataTypeDecl returns [EObject current=null] : ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) ;
public final EObject ruleEDataTypeDecl() throws RecognitionException {
EObject current = null;
@@ -1067,20 +1059,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:550:6: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:546:6: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:547:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:547:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )
int alt10=2;
alt10 = dfa10.predict(input);
switch (alt10) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:2: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:547:2: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:2: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:3: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:547:2: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:547:3: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:3: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:547:3: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop8:
do {
int alt8=2;
@@ -1093,12 +1085,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt8) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:554:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:550:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEDataTypeDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEDataTypeDecl1170);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEDataTypeDecl1165);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -1124,7 +1116,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:572:3: (lv_serializable_1= RULE_SERIALIZABLE )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:568:3: (lv_serializable_1= RULE_SERIALIZABLE )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -1133,10 +1125,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt9) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:574:6: lv_serializable_1= RULE_SERIALIZABLE
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:570:6: lv_serializable_1= RULE_SERIALIZABLE
{
lv_serializable_1=(Token)input.LT(1);
- match(input,RULE_SERIALIZABLE,FOLLOW_RULE_SERIALIZABLE_in_ruleEDataTypeDecl1197);
+ match(input,RULE_SERIALIZABLE,FOLLOW_RULE_SERIALIZABLE_in_ruleEDataTypeDecl1192);
createLeafNode(grammarAccess.getEDataTypeDeclAccess().getSerializableSerializableTerminalRuleCall_0_1_0(), "serializable");
@@ -1158,18 +1150,18 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:592:3: ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:592:4: 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:588:3: ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:588:4: 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';'
{
- match(input,24,FOLLOW_24_in_ruleEDataTypeDecl1216);
+ match(input,24,FOLLOW_24_in_ruleEDataTypeDecl1211);
createLeafNode(grammarAccess.getEDataTypeDeclAccess().getDatatypeKeyword_0_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:596:1: (lv_name_3= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:598:6: lv_name_3= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:592:1: (lv_name_3= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:594:6: lv_name_3= RULE_ID
{
lv_name_3=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEDataTypeDecl1238);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEDataTypeDecl1233);
createLeafNode(grammarAccess.getEDataTypeDeclAccess().getNameIDTerminalRuleCall_0_2_1_0(), "name");
@@ -1188,17 +1180,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,25,FOLLOW_25_in_ruleEDataTypeDecl1255);
+ match(input,25,FOLLOW_25_in_ruleEDataTypeDecl1250);
createLeafNode(grammarAccess.getEDataTypeDeclAccess().getColonKeyword_0_2_2(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:620:1: (lv_instanceClassName_5= ruleSTRING_OR_QID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:623:6: lv_instanceClassName_5= ruleSTRING_OR_QID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:616:1: (lv_instanceClassName_5= ruleSTRING_OR_QID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:619:6: lv_instanceClassName_5= ruleSTRING_OR_QID
{
currentNode=createCompositeNode(grammarAccess.getEDataTypeDeclAccess().getInstanceClassNameSTRING_OR_QIDParserRuleCall_0_2_3_0(), currentNode);
- pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEDataTypeDecl1289);
+ pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEDataTypeDecl1284);
lv_instanceClassName_5=ruleSTRING_OR_QID();
_fsp--;
@@ -1218,7 +1210,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,18,FOLLOW_18_in_ruleEDataTypeDecl1302);
+ match(input,18,FOLLOW_18_in_ruleEDataTypeDecl1297);
createLeafNode(grammarAccess.getEDataTypeDeclAccess().getSemicolonKeyword_0_2_4(), null);
@@ -1232,12 +1224,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:647:5: this_EEnumDecl_7= ruleEEnumDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:643:5: this_EEnumDecl_7= ruleEEnumDecl
{
currentNode=createCompositeNode(grammarAccess.getEDataTypeDeclAccess().getEEnumDeclParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleEEnumDecl_in_ruleEDataTypeDecl1332);
+ pushFollow(FOLLOW_ruleEEnumDecl_in_ruleEDataTypeDecl1327);
this_EEnumDecl_7=ruleEEnumDecl();
_fsp--;
@@ -1271,7 +1263,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEAnnotationDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:662:1: entryRuleEAnnotationDecl returns [EObject current=null] : iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:658:1: entryRuleEAnnotationDecl returns [EObject current=null] : iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF ;
public final EObject entryRuleEAnnotationDecl() throws RecognitionException {
EObject current = null;
@@ -1279,16 +1271,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:662:57: (iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:663:2: iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:658:57: (iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:659:2: iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEAnnotationDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_entryRuleEAnnotationDecl1364);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_entryRuleEAnnotationDecl1359);
iv_ruleEAnnotationDecl=ruleEAnnotationDecl();
_fsp--;
current =iv_ruleEAnnotationDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEAnnotationDecl1374);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEAnnotationDecl1369);
}
@@ -1306,7 +1298,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEAnnotationDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:670:1: ruleEAnnotationDecl returns [EObject current=null] : ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:666:1: ruleEAnnotationDecl returns [EObject current=null] : ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? ) ;
public final EObject ruleEAnnotationDecl() throws RecognitionException {
EObject current = null;
@@ -1320,23 +1312,23 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:675:6: ( ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:676:1: ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:671:6: ( ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:672:1: ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:676:1: ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:676:2: '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:672:1: ( '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:672:2: '@' (lv_source_1= ruleSTRING_OR_QID ) ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )?
{
- match(input,26,FOLLOW_26_in_ruleEAnnotationDecl1408);
+ match(input,26,FOLLOW_26_in_ruleEAnnotationDecl1403);
createLeafNode(grammarAccess.getEAnnotationDeclAccess().getCommercialAtKeyword_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:680:1: (lv_source_1= ruleSTRING_OR_QID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:683:6: lv_source_1= ruleSTRING_OR_QID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:676:1: (lv_source_1= ruleSTRING_OR_QID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:679:6: lv_source_1= ruleSTRING_OR_QID
{
currentNode=createCompositeNode(grammarAccess.getEAnnotationDeclAccess().getSourceSTRING_OR_QIDParserRuleCall_1_0(), currentNode);
- pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEAnnotationDecl1442);
+ pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEAnnotationDecl1437);
lv_source_1=ruleSTRING_OR_QID();
_fsp--;
@@ -1356,7 +1348,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:701:2: ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:697:2: ( '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')' )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -1365,19 +1357,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt12) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:701:3: '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:697:3: '(' (lv_details_3= ruleMapEntry ) ( ',' (lv_details_5= ruleMapEntry ) )* ')'
{
- match(input,27,FOLLOW_27_in_ruleEAnnotationDecl1456);
+ match(input,27,FOLLOW_27_in_ruleEAnnotationDecl1451);
createLeafNode(grammarAccess.getEAnnotationDeclAccess().getLeftParenthesisKeyword_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:705:1: (lv_details_3= ruleMapEntry )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:708:6: lv_details_3= ruleMapEntry
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:701:1: (lv_details_3= ruleMapEntry )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:704:6: lv_details_3= ruleMapEntry
{
currentNode=createCompositeNode(grammarAccess.getEAnnotationDeclAccess().getDetailsMapEntryParserRuleCall_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1490);
+ pushFollow(FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1485);
lv_details_3=ruleMapEntry();
_fsp--;
@@ -1397,7 +1389,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:726:2: ( ',' (lv_details_5= ruleMapEntry ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:722:2: ( ',' (lv_details_5= ruleMapEntry ) )*
loop11:
do {
int alt11=2;
@@ -1410,19 +1402,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt11) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:726:3: ',' (lv_details_5= ruleMapEntry )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:722:3: ',' (lv_details_5= ruleMapEntry )
{
- match(input,28,FOLLOW_28_in_ruleEAnnotationDecl1504);
+ match(input,28,FOLLOW_28_in_ruleEAnnotationDecl1499);
createLeafNode(grammarAccess.getEAnnotationDeclAccess().getCommaKeyword_2_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:730:1: (lv_details_5= ruleMapEntry )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:733:6: lv_details_5= ruleMapEntry
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:726:1: (lv_details_5= ruleMapEntry )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:729:6: lv_details_5= ruleMapEntry
{
currentNode=createCompositeNode(grammarAccess.getEAnnotationDeclAccess().getDetailsMapEntryParserRuleCall_2_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1538);
+ pushFollow(FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1533);
lv_details_5=ruleMapEntry();
_fsp--;
@@ -1451,7 +1443,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,29,FOLLOW_29_in_ruleEAnnotationDecl1553);
+ match(input,29,FOLLOW_29_in_ruleEAnnotationDecl1548);
createLeafNode(grammarAccess.getEAnnotationDeclAccess().getRightParenthesisKeyword_2_3(), null);
@@ -1484,7 +1476,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEClassDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:762:1: entryRuleEClassDecl returns [EObject current=null] : iv_ruleEClassDecl= ruleEClassDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:758:1: entryRuleEClassDecl returns [EObject current=null] : iv_ruleEClassDecl= ruleEClassDecl EOF ;
public final EObject entryRuleEClassDecl() throws RecognitionException {
EObject current = null;
@@ -1492,16 +1484,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:762:52: (iv_ruleEClassDecl= ruleEClassDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:763:2: iv_ruleEClassDecl= ruleEClassDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:758:52: (iv_ruleEClassDecl= ruleEClassDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:759:2: iv_ruleEClassDecl= ruleEClassDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEClassDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEClassDecl_in_entryRuleEClassDecl1588);
+ pushFollow(FOLLOW_ruleEClassDecl_in_entryRuleEClassDecl1583);
iv_ruleEClassDecl=ruleEClassDecl();
_fsp--;
current =iv_ruleEClassDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEClassDecl1598);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEClassDecl1593);
}
@@ -1519,7 +1511,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEClassDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:770:1: ruleEClassDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:766:1: ruleEClassDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' ) ;
public final EObject ruleEClassDecl() throws RecognitionException {
EObject current = null;
@@ -1546,13 +1538,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:775:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:776:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:771:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:772:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:776:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:776:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:772:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:772:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ( (lv_interface_2= 'interface' ) | 'class' ) (lv_name_4= RULE_ID ) ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )? ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? '{' ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* '}'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:776:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:772:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop13:
do {
int alt13=2;
@@ -1565,12 +1557,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt13) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:779:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:775:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEClassDecl1657);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEClassDecl1652);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -1596,7 +1588,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:3: (lv_abstract_1= 'abstract' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:793:3: (lv_abstract_1= 'abstract' )?
int alt14=2;
int LA14_0 = input.LA(1);
@@ -1605,10 +1597,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt14) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:799:6: lv_abstract_1= 'abstract'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:795:6: lv_abstract_1= 'abstract'
{
lv_abstract_1=(Token)input.LT(1);
- match(input,30,FOLLOW_30_in_ruleEClassDecl1683);
+ match(input,30,FOLLOW_30_in_ruleEClassDecl1678);
createLeafNode(grammarAccess.getEClassDeclAccess().getAbstractAbstractKeyword_1_0(), "abstract");
@@ -1630,7 +1622,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:818:3: ( (lv_interface_2= 'interface' ) | 'class' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:814:3: ( (lv_interface_2= 'interface' ) | 'class' )
int alt15=2;
int LA15_0 = input.LA(1);
@@ -1642,19 +1634,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("818:3: ( (lv_interface_2= 'interface' ) | 'class' )", 15, 0, input);
+ new NoViableAltException("814:3: ( (lv_interface_2= 'interface' ) | 'class' )", 15, 0, input);
throw nvae;
}
switch (alt15) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:818:4: (lv_interface_2= 'interface' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:814:4: (lv_interface_2= 'interface' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:818:4: (lv_interface_2= 'interface' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:820:6: lv_interface_2= 'interface'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:814:4: (lv_interface_2= 'interface' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:816:6: lv_interface_2= 'interface'
{
lv_interface_2=(Token)input.LT(1);
- match(input,31,FOLLOW_31_in_ruleEClassDecl1719);
+ match(input,31,FOLLOW_31_in_ruleEClassDecl1714);
createLeafNode(grammarAccess.getEClassDeclAccess().getInterfaceInterfaceKeyword_2_0_0(), "interface");
@@ -1677,9 +1669,9 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:840:6: 'class'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:836:6: 'class'
{
- match(input,32,FOLLOW_32_in_ruleEClassDecl1747);
+ match(input,32,FOLLOW_32_in_ruleEClassDecl1742);
createLeafNode(grammarAccess.getEClassDeclAccess().getClassKeyword_2_1(), null);
@@ -1689,11 +1681,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:844:2: (lv_name_4= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:846:6: lv_name_4= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:840:2: (lv_name_4= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:842:6: lv_name_4= RULE_ID
{
lv_name_4=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEClassDecl1770);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEClassDecl1765);
createLeafNode(grammarAccess.getEClassDeclAccess().getNameIDTerminalRuleCall_3_0(), "name");
@@ -1712,7 +1704,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:864:2: ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:860:2: ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>' )?
int alt17=2;
int LA17_0 = input.LA(1);
@@ -1721,19 +1713,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt17) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:864:3: '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:860:3: '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* '>'
{
- match(input,33,FOLLOW_33_in_ruleEClassDecl1788);
+ match(input,33,FOLLOW_33_in_ruleEClassDecl1783);
createLeafNode(grammarAccess.getEClassDeclAccess().getLessThanSignKeyword_4_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:868:1: (lv_eTypeParameters_6= ruleETypeParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:871:6: lv_eTypeParameters_6= ruleETypeParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:864:1: (lv_eTypeParameters_6= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:867:6: lv_eTypeParameters_6= ruleETypeParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getETypeParametersETypeParameterDeclParserRuleCall_4_1_0(), currentNode);
- pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1822);
+ pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1817);
lv_eTypeParameters_6=ruleETypeParameterDecl();
_fsp--;
@@ -1753,7 +1745,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:889:2: ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:885:2: ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )*
loop16:
do {
int alt16=2;
@@ -1766,19 +1758,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt16) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:889:3: ',' (lv_eTypeParameters_8= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:885:3: ',' (lv_eTypeParameters_8= ruleETypeParameterDecl )
{
- match(input,28,FOLLOW_28_in_ruleEClassDecl1836);
+ match(input,28,FOLLOW_28_in_ruleEClassDecl1831);
createLeafNode(grammarAccess.getEClassDeclAccess().getCommaKeyword_4_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:893:1: (lv_eTypeParameters_8= ruleETypeParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:896:6: lv_eTypeParameters_8= ruleETypeParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:889:1: (lv_eTypeParameters_8= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:892:6: lv_eTypeParameters_8= ruleETypeParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getETypeParametersETypeParameterDeclParserRuleCall_4_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1870);
+ pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1865);
lv_eTypeParameters_8=ruleETypeParameterDecl();
_fsp--;
@@ -1807,7 +1799,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,34,FOLLOW_34_in_ruleEClassDecl1885);
+ match(input,34,FOLLOW_34_in_ruleEClassDecl1880);
createLeafNode(grammarAccess.getEClassDeclAccess().getGreaterThanSignKeyword_4_3(), null);
@@ -1817,7 +1809,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:918:3: ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:914:3: ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )?
int alt19=2;
int LA19_0 = input.LA(1);
@@ -1826,19 +1818,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt19) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:918:4: 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:914:4: 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )*
{
- match(input,35,FOLLOW_35_in_ruleEClassDecl1897);
+ match(input,35,FOLLOW_35_in_ruleEClassDecl1892);
createLeafNode(grammarAccess.getEClassDeclAccess().getExtendsKeyword_5_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:922:1: (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:925:6: lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:918:1: (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:921:6: lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getEGenericSuperTypesEGenericTypeReferenceDeclParserRuleCall_5_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1931);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1926);
lv_eGenericSuperTypes_11=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -1858,7 +1850,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:943:2: ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:939:2: ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )*
loop18:
do {
int alt18=2;
@@ -1871,19 +1863,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt18) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:943:3: ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:939:3: ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl )
{
- match(input,28,FOLLOW_28_in_ruleEClassDecl1945);
+ match(input,28,FOLLOW_28_in_ruleEClassDecl1940);
createLeafNode(grammarAccess.getEClassDeclAccess().getCommaKeyword_5_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:947:1: (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:950:6: lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:943:1: (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:946:6: lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getEGenericSuperTypesEGenericTypeReferenceDeclParserRuleCall_5_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1979);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1974);
lv_eGenericSuperTypes_13=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -1918,7 +1910,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:968:6: ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:964:6: ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )?
int alt20=2;
int LA20_0 = input.LA(1);
@@ -1927,19 +1919,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt20) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:968:7: ':' (lv_instanceClassName_15= ruleSTRING_OR_QID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:964:7: ':' (lv_instanceClassName_15= ruleSTRING_OR_QID )
{
- match(input,25,FOLLOW_25_in_ruleEClassDecl1997);
+ match(input,25,FOLLOW_25_in_ruleEClassDecl1992);
createLeafNode(grammarAccess.getEClassDeclAccess().getColonKeyword_6_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:972:1: (lv_instanceClassName_15= ruleSTRING_OR_QID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:975:6: lv_instanceClassName_15= ruleSTRING_OR_QID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:968:1: (lv_instanceClassName_15= ruleSTRING_OR_QID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:971:6: lv_instanceClassName_15= ruleSTRING_OR_QID
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getInstanceClassNameSTRING_OR_QIDParserRuleCall_6_1_0(), currentNode);
- pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEClassDecl2031);
+ pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEClassDecl2026);
lv_instanceClassName_15=ruleSTRING_OR_QID();
_fsp--;
@@ -1965,26 +1957,26 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,22,FOLLOW_22_in_ruleEClassDecl2046);
+ match(input,22,FOLLOW_22_in_ruleEClassDecl2041);
createLeafNode(grammarAccess.getEClassDeclAccess().getLeftCurlyBracketKeyword_7(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:997:1: ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:993:1: ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )*
loop21:
do {
int alt21=3;
alt21 = dfa21.predict(input);
switch (alt21) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:997:2: (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:993:2: (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:997:2: (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1000:6: lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:993:2: (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:996:6: lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getEStructuralFeaturesEStructuralFeatureDeclParserRuleCall_8_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_ruleEClassDecl2081);
+ pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_ruleEClassDecl2076);
lv_eStructuralFeatures_17=ruleEStructuralFeatureDecl();
_fsp--;
@@ -2008,15 +2000,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1019:6: (lv_eOperations_18= ruleEOperationDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1015:6: (lv_eOperations_18= ruleEOperationDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1019:6: (lv_eOperations_18= ruleEOperationDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1022:6: lv_eOperations_18= ruleEOperationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1015:6: (lv_eOperations_18= ruleEOperationDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1018:6: lv_eOperations_18= ruleEOperationDecl
{
currentNode=createCompositeNode(grammarAccess.getEClassDeclAccess().getEOperationsEOperationDeclParserRuleCall_8_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEOperationDecl_in_ruleEClassDecl2125);
+ pushFollow(FOLLOW_ruleEOperationDecl_in_ruleEClassDecl2120);
lv_eOperations_18=ruleEOperationDecl();
_fsp--;
@@ -2045,7 +2037,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,23,FOLLOW_23_in_ruleEClassDecl2140);
+ match(input,23,FOLLOW_23_in_ruleEClassDecl2135);
createLeafNode(grammarAccess.getEClassDeclAccess().getRightCurlyBracketKeyword_9(), null);
@@ -2072,7 +2064,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEStructuralFeatureDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1051:1: entryRuleEStructuralFeatureDecl returns [EObject current=null] : iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1047:1: entryRuleEStructuralFeatureDecl returns [EObject current=null] : iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF ;
public final EObject entryRuleEStructuralFeatureDecl() throws RecognitionException {
EObject current = null;
@@ -2080,16 +2072,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1051:64: (iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1052:2: iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1047:64: (iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1048:2: iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEStructuralFeatureDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_entryRuleEStructuralFeatureDecl2173);
+ pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_entryRuleEStructuralFeatureDecl2168);
iv_ruleEStructuralFeatureDecl=ruleEStructuralFeatureDecl();
_fsp--;
current =iv_ruleEStructuralFeatureDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEStructuralFeatureDecl2183);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEStructuralFeatureDecl2178);
}
@@ -2107,7 +2099,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEStructuralFeatureDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1059:1: ruleEStructuralFeatureDecl returns [EObject current=null] : (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1055:1: ruleEStructuralFeatureDecl returns [EObject current=null] : (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) ;
public final EObject ruleEStructuralFeatureDecl() throws RecognitionException {
EObject current = null;
@@ -2119,20 +2111,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1064:6: ( (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1065:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1060:6: ( (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1061:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1065:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1061:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )
int alt22=2;
alt22 = dfa22.predict(input);
switch (alt22) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1066:5: this_EAttributeDecl_0= ruleEAttributeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1062:5: this_EAttributeDecl_0= ruleEAttributeDecl
{
currentNode=createCompositeNode(grammarAccess.getEStructuralFeatureDeclAccess().getEAttributeDeclParserRuleCall_0(), currentNode);
- pushFollow(FOLLOW_ruleEAttributeDecl_in_ruleEStructuralFeatureDecl2230);
+ pushFollow(FOLLOW_ruleEAttributeDecl_in_ruleEStructuralFeatureDecl2225);
this_EAttributeDecl_0=ruleEAttributeDecl();
_fsp--;
@@ -2144,12 +2136,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1076:5: this_EReferenceDecl_1= ruleEReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1072:5: this_EReferenceDecl_1= ruleEReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEStructuralFeatureDeclAccess().getEReferenceDeclParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleEReferenceDecl_in_ruleEStructuralFeatureDecl2257);
+ pushFollow(FOLLOW_ruleEReferenceDecl_in_ruleEStructuralFeatureDecl2252);
this_EReferenceDecl_1=ruleEReferenceDecl();
_fsp--;
@@ -2183,7 +2175,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEAttributeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1091:1: entryRuleEAttributeDecl returns [EObject current=null] : iv_ruleEAttributeDecl= ruleEAttributeDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1087:1: entryRuleEAttributeDecl returns [EObject current=null] : iv_ruleEAttributeDecl= ruleEAttributeDecl EOF ;
public final EObject entryRuleEAttributeDecl() throws RecognitionException {
EObject current = null;
@@ -2191,16 +2183,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1091:56: (iv_ruleEAttributeDecl= ruleEAttributeDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1092:2: iv_ruleEAttributeDecl= ruleEAttributeDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1087:56: (iv_ruleEAttributeDecl= ruleEAttributeDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1088:2: iv_ruleEAttributeDecl= ruleEAttributeDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEAttributeDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEAttributeDecl_in_entryRuleEAttributeDecl2289);
+ pushFollow(FOLLOW_ruleEAttributeDecl_in_entryRuleEAttributeDecl2284);
iv_ruleEAttributeDecl=ruleEAttributeDecl();
_fsp--;
current =iv_ruleEAttributeDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEAttributeDecl2299);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEAttributeDecl2294);
}
@@ -2218,7 +2210,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEAttributeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1099:1: ruleEAttributeDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1095:1: ruleEAttributeDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' ) ;
public final EObject ruleEAttributeDecl() throws RecognitionException {
EObject current = null;
@@ -2243,13 +2235,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1104:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1105:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1100:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1101:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1105:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1105:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1101:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1101:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* 'attr' (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )? (lv_name_16= RULE_ID ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ';'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1105:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1101:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop23:
do {
int alt23=2;
@@ -2262,12 +2254,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt23) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1108:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1104:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEAttributeDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEAttributeDecl2358);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEAttributeDecl2353);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -2293,7 +2285,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1126:3: ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1122:3: ( (lv_iD_1= 'ID' ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )*
loop24:
do {
int alt24=9;
@@ -2343,13 +2335,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt24) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1126:4: (lv_iD_1= 'ID' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1122:4: (lv_iD_1= 'ID' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1126:4: (lv_iD_1= 'ID' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1128:6: lv_iD_1= 'ID'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1122:4: (lv_iD_1= 'ID' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1124:6: lv_iD_1= 'ID'
{
lv_iD_1=(Token)input.LT(1);
- match(input,36,FOLLOW_36_in_ruleEAttributeDecl2385);
+ match(input,36,FOLLOW_36_in_ruleEAttributeDecl2380);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getIDIDKeyword_1_0_0(), "iD");
@@ -2372,13 +2364,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1148:6: (lv_unique_2= RULE_BAG )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1144:6: (lv_unique_2= RULE_BAG )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1148:6: (lv_unique_2= RULE_BAG )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1150:6: lv_unique_2= RULE_BAG
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1144:6: (lv_unique_2= RULE_BAG )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1146:6: lv_unique_2= RULE_BAG
{
lv_unique_2=(Token)input.LT(1);
- match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEAttributeDecl2426);
+ match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEAttributeDecl2421);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getUniqueBagTerminalRuleCall_1_1_0(), "unique");
@@ -2401,13 +2393,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1169:6: (lv_ordered_3= RULE_RANDOM )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1165:6: (lv_ordered_3= RULE_RANDOM )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1169:6: (lv_ordered_3= RULE_RANDOM )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1171:6: lv_ordered_3= RULE_RANDOM
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1165:6: (lv_ordered_3= RULE_RANDOM )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1167:6: lv_ordered_3= RULE_RANDOM
{
lv_ordered_3=(Token)input.LT(1);
- match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEAttributeDecl2462);
+ match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEAttributeDecl2457);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getOrderedRandomTerminalRuleCall_1_2_0(), "ordered");
@@ -2430,13 +2422,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 4 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1190:6: (lv_changeable_4= RULE_READONLY )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1186:6: (lv_changeable_4= RULE_READONLY )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1190:6: (lv_changeable_4= RULE_READONLY )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1192:6: lv_changeable_4= RULE_READONLY
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1186:6: (lv_changeable_4= RULE_READONLY )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1188:6: lv_changeable_4= RULE_READONLY
{
lv_changeable_4=(Token)input.LT(1);
- match(input,RULE_READONLY,FOLLOW_RULE_READONLY_in_ruleEAttributeDecl2498);
+ match(input,RULE_READONLY,FOLLOW_RULE_READONLY_in_ruleEAttributeDecl2493);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getChangeableReadonlyTerminalRuleCall_1_3_0(), "changeable");
@@ -2459,13 +2451,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 5 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1211:6: (lv_volatile_5= 'volatile' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1207:6: (lv_volatile_5= 'volatile' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1211:6: (lv_volatile_5= 'volatile' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1213:6: lv_volatile_5= 'volatile'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1207:6: (lv_volatile_5= 'volatile' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1209:6: lv_volatile_5= 'volatile'
{
lv_volatile_5=(Token)input.LT(1);
- match(input,37,FOLLOW_37_in_ruleEAttributeDecl2533);
+ match(input,37,FOLLOW_37_in_ruleEAttributeDecl2528);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getVolatileVolatileKeyword_1_4_0(), "volatile");
@@ -2488,13 +2480,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 6 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1233:6: (lv_transient_6= 'transient' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1229:6: (lv_transient_6= 'transient' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1233:6: (lv_transient_6= 'transient' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1235:6: lv_transient_6= 'transient'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1229:6: (lv_transient_6= 'transient' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1231:6: lv_transient_6= 'transient'
{
lv_transient_6=(Token)input.LT(1);
- match(input,38,FOLLOW_38_in_ruleEAttributeDecl2573);
+ match(input,38,FOLLOW_38_in_ruleEAttributeDecl2568);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getTransientTransientKeyword_1_5_0(), "transient");
@@ -2517,13 +2509,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 7 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1255:6: (lv_unsettable_7= 'unsettable' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1251:6: (lv_unsettable_7= 'unsettable' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1255:6: (lv_unsettable_7= 'unsettable' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1257:6: lv_unsettable_7= 'unsettable'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1251:6: (lv_unsettable_7= 'unsettable' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1253:6: lv_unsettable_7= 'unsettable'
{
lv_unsettable_7=(Token)input.LT(1);
- match(input,39,FOLLOW_39_in_ruleEAttributeDecl2613);
+ match(input,39,FOLLOW_39_in_ruleEAttributeDecl2608);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getUnsettableUnsettableKeyword_1_6_0(), "unsettable");
@@ -2546,13 +2538,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 8 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1277:6: (lv_derived_8= 'derived' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1273:6: (lv_derived_8= 'derived' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1277:6: (lv_derived_8= 'derived' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1279:6: lv_derived_8= 'derived'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1273:6: (lv_derived_8= 'derived' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1275:6: lv_derived_8= 'derived'
{
lv_derived_8=(Token)input.LT(1);
- match(input,40,FOLLOW_40_in_ruleEAttributeDecl2653);
+ match(input,40,FOLLOW_40_in_ruleEAttributeDecl2648);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getDerivedDerivedKeyword_1_7_0(), "derived");
@@ -2580,17 +2572,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,41,FOLLOW_41_in_ruleEAttributeDecl2677);
+ match(input,41,FOLLOW_41_in_ruleEAttributeDecl2672);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getAttrKeyword_2(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1302:1: (lv_eGenericType_10= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1305:6: lv_eGenericType_10= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1298:1: (lv_eGenericType_10= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1301:6: lv_eGenericType_10= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEAttributeDeclAccess().getEGenericTypeEGenericTypeReferenceDeclParserRuleCall_3_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEAttributeDecl2711);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEAttributeDecl2706);
lv_eGenericType_10=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -2610,7 +2602,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1323:2: ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1319:2: ( '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']' )?
int alt26=2;
int LA26_0 = input.LA(1);
@@ -2619,17 +2611,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt26) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1323:3: '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1319:3: '[' (lv_lowerBound_12= RULE_INT ) ( '..' (lv_upperBound_14= ruleSINT ) )? ']'
{
- match(input,42,FOLLOW_42_in_ruleEAttributeDecl2725);
+ match(input,42,FOLLOW_42_in_ruleEAttributeDecl2720);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getLeftSquareBracketKeyword_4_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1327:1: (lv_lowerBound_12= RULE_INT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1329:6: lv_lowerBound_12= RULE_INT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1323:1: (lv_lowerBound_12= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1325:6: lv_lowerBound_12= RULE_INT
{
lv_lowerBound_12=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEAttributeDecl2747);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEAttributeDecl2742);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getLowerBoundINTTerminalRuleCall_4_1_0(), "lowerBound");
@@ -2648,7 +2640,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1347:2: ( '..' (lv_upperBound_14= ruleSINT ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1343:2: ( '..' (lv_upperBound_14= ruleSINT ) )?
int alt25=2;
int LA25_0 = input.LA(1);
@@ -2657,19 +2649,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt25) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1347:3: '..' (lv_upperBound_14= ruleSINT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1343:3: '..' (lv_upperBound_14= ruleSINT )
{
- match(input,43,FOLLOW_43_in_ruleEAttributeDecl2765);
+ match(input,43,FOLLOW_43_in_ruleEAttributeDecl2760);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getFullStopFullStopKeyword_4_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1351:1: (lv_upperBound_14= ruleSINT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1354:6: lv_upperBound_14= ruleSINT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1347:1: (lv_upperBound_14= ruleSINT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1350:6: lv_upperBound_14= ruleSINT
{
currentNode=createCompositeNode(grammarAccess.getEAttributeDeclAccess().getUpperBoundSINTParserRuleCall_4_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleSINT_in_ruleEAttributeDecl2799);
+ pushFollow(FOLLOW_ruleSINT_in_ruleEAttributeDecl2794);
lv_upperBound_14=ruleSINT();
_fsp--;
@@ -2695,7 +2687,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,44,FOLLOW_44_in_ruleEAttributeDecl2814);
+ match(input,44,FOLLOW_44_in_ruleEAttributeDecl2809);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getRightSquareBracketKeyword_4_3(), null);
@@ -2705,11 +2697,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1376:3: (lv_name_16= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1378:6: lv_name_16= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1372:3: (lv_name_16= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1374:6: lv_name_16= RULE_ID
{
lv_name_16=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEAttributeDecl2838);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEAttributeDecl2833);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getNameIDTerminalRuleCall_5_0(), "name");
@@ -2728,7 +2720,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1396:2: ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1392:2: ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )?
int alt27=2;
int LA27_0 = input.LA(1);
@@ -2737,17 +2729,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt27) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1396:3: '=' (lv_defaultValueLiteral_18= RULE_STRING )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1392:3: '=' (lv_defaultValueLiteral_18= RULE_STRING )
{
- match(input,17,FOLLOW_17_in_ruleEAttributeDecl2856);
+ match(input,17,FOLLOW_17_in_ruleEAttributeDecl2851);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getEqualsSignKeyword_6_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1400:1: (lv_defaultValueLiteral_18= RULE_STRING )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1402:6: lv_defaultValueLiteral_18= RULE_STRING
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1396:1: (lv_defaultValueLiteral_18= RULE_STRING )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1398:6: lv_defaultValueLiteral_18= RULE_STRING
{
lv_defaultValueLiteral_18=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEAttributeDecl2878);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEAttributeDecl2873);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getDefaultValueLiteralSTRINGTerminalRuleCall_6_1_0(), "defaultValueLiteral");
@@ -2772,7 +2764,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,18,FOLLOW_18_in_ruleEAttributeDecl2897);
+ match(input,18,FOLLOW_18_in_ruleEAttributeDecl2892);
createLeafNode(grammarAccess.getEAttributeDeclAccess().getSemicolonKeyword_7(), null);
@@ -2799,7 +2791,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEReferenceDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1431:1: entryRuleEReferenceDecl returns [EObject current=null] : iv_ruleEReferenceDecl= ruleEReferenceDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1427:1: entryRuleEReferenceDecl returns [EObject current=null] : iv_ruleEReferenceDecl= ruleEReferenceDecl EOF ;
public final EObject entryRuleEReferenceDecl() throws RecognitionException {
EObject current = null;
@@ -2807,16 +2799,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1431:56: (iv_ruleEReferenceDecl= ruleEReferenceDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1432:2: iv_ruleEReferenceDecl= ruleEReferenceDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1427:56: (iv_ruleEReferenceDecl= ruleEReferenceDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1428:2: iv_ruleEReferenceDecl= ruleEReferenceDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEReferenceDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEReferenceDecl_in_entryRuleEReferenceDecl2930);
+ pushFollow(FOLLOW_ruleEReferenceDecl_in_entryRuleEReferenceDecl2925);
iv_ruleEReferenceDecl=ruleEReferenceDecl();
_fsp--;
current =iv_ruleEReferenceDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEReferenceDecl2940);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEReferenceDecl2935);
}
@@ -2834,7 +2826,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEReferenceDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1439:1: ruleEReferenceDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1435:1: ruleEReferenceDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' ) ;
public final EObject ruleEReferenceDecl() throws RecognitionException {
EObject current = null;
@@ -2859,13 +2851,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1444:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1445:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1440:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1441:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1445:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1445:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1441:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1441:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )* ( (lv_containment_9= 'val' ) | 'ref' ) (lv_eGenericType_11= ruleEGenericTypeReferenceDecl ) ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )? ( '#' ( RULE_ID ) )? (lv_name_19= RULE_ID ) ';'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1445:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1441:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop28:
do {
int alt28=2;
@@ -2878,12 +2870,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt28) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1448:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1444:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEReferenceDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEReferenceDecl2999);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEReferenceDecl2994);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -2909,7 +2901,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1466:3: ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1462:3: ( (lv_resolveProxies_1= RULE_LOCAL ) | (lv_unique_2= RULE_BAG ) | (lv_ordered_3= RULE_RANDOM ) | (lv_changeable_4= RULE_READONLY ) | (lv_volatile_5= 'volatile' ) | (lv_transient_6= 'transient' ) | (lv_unsettable_7= 'unsettable' ) | (lv_derived_8= 'derived' ) )*
loop29:
do {
int alt29=9;
@@ -2959,13 +2951,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt29) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1466:4: (lv_resolveProxies_1= RULE_LOCAL )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1462:4: (lv_resolveProxies_1= RULE_LOCAL )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1466:4: (lv_resolveProxies_1= RULE_LOCAL )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1468:6: lv_resolveProxies_1= RULE_LOCAL
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1462:4: (lv_resolveProxies_1= RULE_LOCAL )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1464:6: lv_resolveProxies_1= RULE_LOCAL
{
lv_resolveProxies_1=(Token)input.LT(1);
- match(input,RULE_LOCAL,FOLLOW_RULE_LOCAL_in_ruleEReferenceDecl3027);
+ match(input,RULE_LOCAL,FOLLOW_RULE_LOCAL_in_ruleEReferenceDecl3022);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getResolveProxiesLocalTerminalRuleCall_1_0_0(), "resolveProxies");
@@ -2988,13 +2980,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1487:6: (lv_unique_2= RULE_BAG )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1483:6: (lv_unique_2= RULE_BAG )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1487:6: (lv_unique_2= RULE_BAG )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1489:6: lv_unique_2= RULE_BAG
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1483:6: (lv_unique_2= RULE_BAG )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1485:6: lv_unique_2= RULE_BAG
{
lv_unique_2=(Token)input.LT(1);
- match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEReferenceDecl3063);
+ match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEReferenceDecl3058);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getUniqueBagTerminalRuleCall_1_1_0(), "unique");
@@ -3017,13 +3009,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1508:6: (lv_ordered_3= RULE_RANDOM )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1504:6: (lv_ordered_3= RULE_RANDOM )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1508:6: (lv_ordered_3= RULE_RANDOM )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1510:6: lv_ordered_3= RULE_RANDOM
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1504:6: (lv_ordered_3= RULE_RANDOM )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1506:6: lv_ordered_3= RULE_RANDOM
{
lv_ordered_3=(Token)input.LT(1);
- match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEReferenceDecl3099);
+ match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEReferenceDecl3094);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getOrderedRandomTerminalRuleCall_1_2_0(), "ordered");
@@ -3046,13 +3038,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 4 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1529:6: (lv_changeable_4= RULE_READONLY )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1525:6: (lv_changeable_4= RULE_READONLY )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1529:6: (lv_changeable_4= RULE_READONLY )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1531:6: lv_changeable_4= RULE_READONLY
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1525:6: (lv_changeable_4= RULE_READONLY )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1527:6: lv_changeable_4= RULE_READONLY
{
lv_changeable_4=(Token)input.LT(1);
- match(input,RULE_READONLY,FOLLOW_RULE_READONLY_in_ruleEReferenceDecl3135);
+ match(input,RULE_READONLY,FOLLOW_RULE_READONLY_in_ruleEReferenceDecl3130);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getChangeableReadonlyTerminalRuleCall_1_3_0(), "changeable");
@@ -3075,13 +3067,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 5 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1550:6: (lv_volatile_5= 'volatile' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1546:6: (lv_volatile_5= 'volatile' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1550:6: (lv_volatile_5= 'volatile' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1552:6: lv_volatile_5= 'volatile'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1546:6: (lv_volatile_5= 'volatile' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1548:6: lv_volatile_5= 'volatile'
{
lv_volatile_5=(Token)input.LT(1);
- match(input,37,FOLLOW_37_in_ruleEReferenceDecl3170);
+ match(input,37,FOLLOW_37_in_ruleEReferenceDecl3165);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getVolatileVolatileKeyword_1_4_0(), "volatile");
@@ -3104,13 +3096,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 6 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1572:6: (lv_transient_6= 'transient' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1568:6: (lv_transient_6= 'transient' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1572:6: (lv_transient_6= 'transient' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1574:6: lv_transient_6= 'transient'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1568:6: (lv_transient_6= 'transient' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1570:6: lv_transient_6= 'transient'
{
lv_transient_6=(Token)input.LT(1);
- match(input,38,FOLLOW_38_in_ruleEReferenceDecl3210);
+ match(input,38,FOLLOW_38_in_ruleEReferenceDecl3205);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getTransientTransientKeyword_1_5_0(), "transient");
@@ -3133,13 +3125,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 7 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1594:6: (lv_unsettable_7= 'unsettable' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1590:6: (lv_unsettable_7= 'unsettable' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1594:6: (lv_unsettable_7= 'unsettable' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1596:6: lv_unsettable_7= 'unsettable'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1590:6: (lv_unsettable_7= 'unsettable' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1592:6: lv_unsettable_7= 'unsettable'
{
lv_unsettable_7=(Token)input.LT(1);
- match(input,39,FOLLOW_39_in_ruleEReferenceDecl3250);
+ match(input,39,FOLLOW_39_in_ruleEReferenceDecl3245);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getUnsettableUnsettableKeyword_1_6_0(), "unsettable");
@@ -3162,13 +3154,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 8 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1616:6: (lv_derived_8= 'derived' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1612:6: (lv_derived_8= 'derived' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1616:6: (lv_derived_8= 'derived' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1618:6: lv_derived_8= 'derived'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1612:6: (lv_derived_8= 'derived' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1614:6: lv_derived_8= 'derived'
{
lv_derived_8=(Token)input.LT(1);
- match(input,40,FOLLOW_40_in_ruleEReferenceDecl3290);
+ match(input,40,FOLLOW_40_in_ruleEReferenceDecl3285);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getDerivedDerivedKeyword_1_7_0(), "derived");
@@ -3196,7 +3188,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1637:4: ( (lv_containment_9= 'val' ) | 'ref' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1633:4: ( (lv_containment_9= 'val' ) | 'ref' )
int alt30=2;
int LA30_0 = input.LA(1);
@@ -3208,19 +3200,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("1637:4: ( (lv_containment_9= 'val' ) | 'ref' )", 30, 0, input);
+ new NoViableAltException("1633:4: ( (lv_containment_9= 'val' ) | 'ref' )", 30, 0, input);
throw nvae;
}
switch (alt30) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1637:5: (lv_containment_9= 'val' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1633:5: (lv_containment_9= 'val' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1637:5: (lv_containment_9= 'val' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1639:6: lv_containment_9= 'val'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1633:5: (lv_containment_9= 'val' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1635:6: lv_containment_9= 'val'
{
lv_containment_9=(Token)input.LT(1);
- match(input,45,FOLLOW_45_in_ruleEReferenceDecl3327);
+ match(input,45,FOLLOW_45_in_ruleEReferenceDecl3322);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getContainmentValKeyword_2_0_0(), "containment");
@@ -3243,9 +3235,9 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1659:6: 'ref'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1655:6: 'ref'
{
- match(input,46,FOLLOW_46_in_ruleEReferenceDecl3355);
+ match(input,46,FOLLOW_46_in_ruleEReferenceDecl3350);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getRefKeyword_2_1(), null);
@@ -3255,13 +3247,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1663:2: (lv_eGenericType_11= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1666:6: lv_eGenericType_11= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1659:2: (lv_eGenericType_11= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1662:6: lv_eGenericType_11= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEReferenceDeclAccess().getEGenericTypeEGenericTypeReferenceDeclParserRuleCall_3_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEReferenceDecl3390);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEReferenceDecl3385);
lv_eGenericType_11=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -3281,7 +3273,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1684:2: ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1680:2: ( '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']' )?
int alt32=2;
int LA32_0 = input.LA(1);
@@ -3290,17 +3282,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt32) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1684:3: '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1680:3: '[' (lv_lowerBound_13= RULE_INT ) ( '..' (lv_upperBound_15= ruleSINT ) )? ']'
{
- match(input,42,FOLLOW_42_in_ruleEReferenceDecl3404);
+ match(input,42,FOLLOW_42_in_ruleEReferenceDecl3399);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getLeftSquareBracketKeyword_4_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1688:1: (lv_lowerBound_13= RULE_INT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1690:6: lv_lowerBound_13= RULE_INT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1684:1: (lv_lowerBound_13= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1686:6: lv_lowerBound_13= RULE_INT
{
lv_lowerBound_13=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEReferenceDecl3426);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEReferenceDecl3421);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getLowerBoundINTTerminalRuleCall_4_1_0(), "lowerBound");
@@ -3319,7 +3311,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1708:2: ( '..' (lv_upperBound_15= ruleSINT ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1704:2: ( '..' (lv_upperBound_15= ruleSINT ) )?
int alt31=2;
int LA31_0 = input.LA(1);
@@ -3328,19 +3320,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt31) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1708:3: '..' (lv_upperBound_15= ruleSINT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1704:3: '..' (lv_upperBound_15= ruleSINT )
{
- match(input,43,FOLLOW_43_in_ruleEReferenceDecl3444);
+ match(input,43,FOLLOW_43_in_ruleEReferenceDecl3439);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getFullStopFullStopKeyword_4_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1712:1: (lv_upperBound_15= ruleSINT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1715:6: lv_upperBound_15= ruleSINT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1708:1: (lv_upperBound_15= ruleSINT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1711:6: lv_upperBound_15= ruleSINT
{
currentNode=createCompositeNode(grammarAccess.getEReferenceDeclAccess().getUpperBoundSINTParserRuleCall_4_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleSINT_in_ruleEReferenceDecl3478);
+ pushFollow(FOLLOW_ruleSINT_in_ruleEReferenceDecl3473);
lv_upperBound_15=ruleSINT();
_fsp--;
@@ -3366,7 +3358,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,44,FOLLOW_44_in_ruleEReferenceDecl3493);
+ match(input,44,FOLLOW_44_in_ruleEReferenceDecl3488);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getRightSquareBracketKeyword_4_3(), null);
@@ -3376,7 +3368,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1737:3: ( '#' ( RULE_ID ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1733:3: ( '#' ( RULE_ID ) )?
int alt33=2;
int LA33_0 = input.LA(1);
@@ -3385,14 +3377,14 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt33) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1737:4: '#' ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1733:4: '#' ( RULE_ID )
{
- match(input,47,FOLLOW_47_in_ruleEReferenceDecl3505);
+ match(input,47,FOLLOW_47_in_ruleEReferenceDecl3500);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getNumberSignKeyword_5_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1741:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1744:3: RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1737:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1740:3: RULE_ID
{
if (current==null) {
@@ -3400,7 +3392,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEReferenceDecl3527);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEReferenceDecl3522);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getEOppositeEReferenceCrossReference_5_1_0(), "eOpposite");
@@ -3413,11 +3405,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1757:4: (lv_name_19= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1759:6: lv_name_19= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1753:4: (lv_name_19= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1755:6: lv_name_19= RULE_ID
{
lv_name_19=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEReferenceDecl3554);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEReferenceDecl3549);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getNameIDTerminalRuleCall_6_0(), "name");
@@ -3436,7 +3428,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,18,FOLLOW_18_in_ruleEReferenceDecl3571);
+ match(input,18,FOLLOW_18_in_ruleEReferenceDecl3566);
createLeafNode(grammarAccess.getEReferenceDeclAccess().getSemicolonKeyword_7(), null);
@@ -3463,7 +3455,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEEnumDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1788:1: entryRuleEEnumDecl returns [EObject current=null] : iv_ruleEEnumDecl= ruleEEnumDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1784:1: entryRuleEEnumDecl returns [EObject current=null] : iv_ruleEEnumDecl= ruleEEnumDecl EOF ;
public final EObject entryRuleEEnumDecl() throws RecognitionException {
EObject current = null;
@@ -3471,16 +3463,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1788:51: (iv_ruleEEnumDecl= ruleEEnumDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1789:2: iv_ruleEEnumDecl= ruleEEnumDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1784:51: (iv_ruleEEnumDecl= ruleEEnumDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1785:2: iv_ruleEEnumDecl= ruleEEnumDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEEnumDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEEnumDecl_in_entryRuleEEnumDecl3604);
+ pushFollow(FOLLOW_ruleEEnumDecl_in_entryRuleEEnumDecl3599);
iv_ruleEEnumDecl=ruleEEnumDecl();
_fsp--;
current =iv_ruleEEnumDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEEnumDecl3614);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEEnumDecl3609);
}
@@ -3498,7 +3490,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEEnumDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1796:1: ruleEEnumDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1792:1: ruleEEnumDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' ) ;
public final EObject ruleEEnumDecl() throws RecognitionException {
EObject current = null;
@@ -3511,13 +3503,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1801:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1802:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1797:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1798:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1802:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1802:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1798:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1798:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* 'enum' (lv_name_2= RULE_ID ) '{' (lv_eLiterals_4= ruleEEnumLiteralDecl )+ '}'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1802:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1798:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop34:
do {
int alt34=2;
@@ -3530,12 +3522,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt34) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1805:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1801:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEEnumDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEEnumDecl3673);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEEnumDecl3668);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -3561,15 +3553,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,48,FOLLOW_48_in_ruleEEnumDecl3687);
+ match(input,48,FOLLOW_48_in_ruleEEnumDecl3682);
createLeafNode(grammarAccess.getEEnumDeclAccess().getEnumKeyword_1(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1827:1: (lv_name_2= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1829:6: lv_name_2= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1823:1: (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1825:6: lv_name_2= RULE_ID
{
lv_name_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEEnumDecl3709);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEEnumDecl3704);
createLeafNode(grammarAccess.getEEnumDeclAccess().getNameIDTerminalRuleCall_2_0(), "name");
@@ -3588,11 +3580,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,22,FOLLOW_22_in_ruleEEnumDecl3726);
+ match(input,22,FOLLOW_22_in_ruleEEnumDecl3721);
createLeafNode(grammarAccess.getEEnumDeclAccess().getLeftCurlyBracketKeyword_3(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1851:1: (lv_eLiterals_4= ruleEEnumLiteralDecl )+
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1847:1: (lv_eLiterals_4= ruleEEnumLiteralDecl )+
int cnt35=0;
loop35:
do {
@@ -3606,12 +3598,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt35) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1854:6: lv_eLiterals_4= ruleEEnumLiteralDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1850:6: lv_eLiterals_4= ruleEEnumLiteralDecl
{
currentNode=createCompositeNode(grammarAccess.getEEnumDeclAccess().getELiteralsEEnumLiteralDeclParserRuleCall_4_0(), currentNode);
- pushFollow(FOLLOW_ruleEEnumLiteralDecl_in_ruleEEnumDecl3760);
+ pushFollow(FOLLOW_ruleEEnumLiteralDecl_in_ruleEEnumDecl3755);
lv_eLiterals_4=ruleEEnumLiteralDecl();
_fsp--;
@@ -3641,7 +3633,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
cnt35++;
} while (true);
- match(input,23,FOLLOW_23_in_ruleEEnumDecl3774);
+ match(input,23,FOLLOW_23_in_ruleEEnumDecl3769);
createLeafNode(grammarAccess.getEEnumDeclAccess().getRightCurlyBracketKeyword_5(), null);
@@ -3668,7 +3660,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEEnumLiteralDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1883:1: entryRuleEEnumLiteralDecl returns [EObject current=null] : iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1879:1: entryRuleEEnumLiteralDecl returns [EObject current=null] : iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF ;
public final EObject entryRuleEEnumLiteralDecl() throws RecognitionException {
EObject current = null;
@@ -3676,16 +3668,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1883:58: (iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1884:2: iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1879:58: (iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1880:2: iv_ruleEEnumLiteralDecl= ruleEEnumLiteralDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEEnumLiteralDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEEnumLiteralDecl_in_entryRuleEEnumLiteralDecl3807);
+ pushFollow(FOLLOW_ruleEEnumLiteralDecl_in_entryRuleEEnumLiteralDecl3802);
iv_ruleEEnumLiteralDecl=ruleEEnumLiteralDecl();
_fsp--;
current =iv_ruleEEnumLiteralDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEEnumLiteralDecl3817);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEEnumLiteralDecl3812);
}
@@ -3703,7 +3695,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEEnumLiteralDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1891:1: ruleEEnumLiteralDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1887:1: ruleEEnumLiteralDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' ) ;
public final EObject ruleEEnumLiteralDecl() throws RecognitionException {
EObject current = null;
@@ -3716,13 +3708,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1896:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1897:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1892:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1893:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1897:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1897:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1893:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1893:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_name_1= RULE_ID ) ( '=' (lv_value_3= RULE_INT ) )? (lv_literal_4= RULE_STRING )? ';'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1897:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1893:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop36:
do {
int alt36=2;
@@ -3735,12 +3727,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt36) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1900:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1896:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEEnumLiteralDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEEnumLiteralDecl3876);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEEnumLiteralDecl3871);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -3766,11 +3758,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1918:3: (lv_name_1= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1920:6: lv_name_1= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1914:3: (lv_name_1= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1916:6: lv_name_1= RULE_ID
{
lv_name_1=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEEnumLiteralDecl3903);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEEnumLiteralDecl3898);
createLeafNode(grammarAccess.getEEnumLiteralDeclAccess().getNameIDTerminalRuleCall_1_0(), "name");
@@ -3789,7 +3781,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1938:2: ( '=' (lv_value_3= RULE_INT ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1934:2: ( '=' (lv_value_3= RULE_INT ) )?
int alt37=2;
int LA37_0 = input.LA(1);
@@ -3798,17 +3790,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt37) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1938:3: '=' (lv_value_3= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1934:3: '=' (lv_value_3= RULE_INT )
{
- match(input,17,FOLLOW_17_in_ruleEEnumLiteralDecl3921);
+ match(input,17,FOLLOW_17_in_ruleEEnumLiteralDecl3916);
createLeafNode(grammarAccess.getEEnumLiteralDeclAccess().getEqualsSignKeyword_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1942:1: (lv_value_3= RULE_INT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1944:6: lv_value_3= RULE_INT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1938:1: (lv_value_3= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1940:6: lv_value_3= RULE_INT
{
lv_value_3=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEEnumLiteralDecl3943);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleEEnumLiteralDecl3938);
createLeafNode(grammarAccess.getEEnumLiteralDeclAccess().getValueINTTerminalRuleCall_2_1_0(), "value");
@@ -3833,7 +3825,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1962:4: (lv_literal_4= RULE_STRING )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1958:4: (lv_literal_4= RULE_STRING )?
int alt38=2;
int LA38_0 = input.LA(1);
@@ -3842,10 +3834,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt38) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1964:6: lv_literal_4= RULE_STRING
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1960:6: lv_literal_4= RULE_STRING
{
lv_literal_4=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEEnumLiteralDecl3975);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEEnumLiteralDecl3970);
createLeafNode(grammarAccess.getEEnumLiteralDeclAccess().getLiteralSTRINGTerminalRuleCall_3_0(), "literal");
@@ -3867,7 +3859,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,18,FOLLOW_18_in_ruleEEnumLiteralDecl3993);
+ match(input,18,FOLLOW_18_in_ruleEEnumLiteralDecl3988);
createLeafNode(grammarAccess.getEEnumLiteralDeclAccess().getSemicolonKeyword_4(), null);
@@ -3894,7 +3886,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleETypeParameterDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1993:1: entryRuleETypeParameterDecl returns [EObject current=null] : iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1989:1: entryRuleETypeParameterDecl returns [EObject current=null] : iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF ;
public final EObject entryRuleETypeParameterDecl() throws RecognitionException {
EObject current = null;
@@ -3902,16 +3894,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1993:60: (iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1994:2: iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1989:60: (iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1990:2: iv_ruleETypeParameterDecl= ruleETypeParameterDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getETypeParameterDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleETypeParameterDecl_in_entryRuleETypeParameterDecl4026);
+ pushFollow(FOLLOW_ruleETypeParameterDecl_in_entryRuleETypeParameterDecl4021);
iv_ruleETypeParameterDecl=ruleETypeParameterDecl();
_fsp--;
current =iv_ruleETypeParameterDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleETypeParameterDecl4036);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleETypeParameterDecl4031);
}
@@ -3929,7 +3921,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleETypeParameterDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2001:1: ruleETypeParameterDecl returns [EObject current=null] : ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1997:1: ruleETypeParameterDecl returns [EObject current=null] : ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? ) ;
public final EObject ruleETypeParameterDecl() throws RecognitionException {
EObject current = null;
@@ -3940,17 +3932,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2006:6: ( ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2007:1: ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2002:6: ( ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2003:1: ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2007:1: ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2007:2: (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2003:1: ( (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2003:2: (lv_name_0= RULE_ID ) ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )?
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2007:2: (lv_name_0= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2009:6: lv_name_0= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2003:2: (lv_name_0= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2005:6: lv_name_0= RULE_ID
{
lv_name_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleETypeParameterDecl4083);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleETypeParameterDecl4078);
createLeafNode(grammarAccess.getETypeParameterDeclAccess().getNameIDTerminalRuleCall_0_0(), "name");
@@ -3969,7 +3961,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2027:2: ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2023:2: ( 'extends' (lv_eBounds_2= ruleEGenericTypeDecl ) )?
int alt39=2;
int LA39_0 = input.LA(1);
@@ -3978,19 +3970,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt39) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2027:3: 'extends' (lv_eBounds_2= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2023:3: 'extends' (lv_eBounds_2= ruleEGenericTypeDecl )
{
- match(input,35,FOLLOW_35_in_ruleETypeParameterDecl4101);
+ match(input,35,FOLLOW_35_in_ruleETypeParameterDecl4096);
createLeafNode(grammarAccess.getETypeParameterDeclAccess().getExtendsKeyword_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2031:1: (lv_eBounds_2= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2034:6: lv_eBounds_2= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2027:1: (lv_eBounds_2= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2030:6: lv_eBounds_2= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getETypeParameterDeclAccess().getEBoundsEGenericTypeDeclParserRuleCall_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleETypeParameterDecl4135);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleETypeParameterDecl4130);
lv_eBounds_2=ruleEGenericTypeDecl();
_fsp--;
@@ -4039,7 +4031,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEGenericTypeReferenceDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2059:1: entryRuleEGenericTypeReferenceDecl returns [EObject current=null] : iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2055:1: entryRuleEGenericTypeReferenceDecl returns [EObject current=null] : iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF ;
public final EObject entryRuleEGenericTypeReferenceDecl() throws RecognitionException {
EObject current = null;
@@ -4047,16 +4039,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2059:67: (iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2060:2: iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2055:67: (iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2056:2: iv_ruleEGenericTypeReferenceDecl= ruleEGenericTypeReferenceDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEGenericTypeReferenceDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_entryRuleEGenericTypeReferenceDecl4174);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_entryRuleEGenericTypeReferenceDecl4169);
iv_ruleEGenericTypeReferenceDecl=ruleEGenericTypeReferenceDecl();
_fsp--;
current =iv_ruleEGenericTypeReferenceDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEGenericTypeReferenceDecl4184);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEGenericTypeReferenceDecl4179);
}
@@ -4074,7 +4066,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEGenericTypeReferenceDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2067:1: ruleEGenericTypeReferenceDecl returns [EObject current=null] : ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2063:1: ruleEGenericTypeReferenceDecl returns [EObject current=null] : ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) ) ;
public final EObject ruleEGenericTypeReferenceDecl() throws RecognitionException {
EObject current = null;
@@ -4086,10 +4078,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2072:6: ( ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2068:6: ( ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2069:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2069:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )
int alt42=2;
int LA42_0 = input.LA(1);
@@ -4101,19 +4093,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2073:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )", 42, 0, input);
+ new NoViableAltException("2069:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) )", 42, 0, input);
throw nvae;
}
switch (alt42) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2069:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:3: ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2069:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2069:3: ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2073:3: ( RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2076:3: RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2069:3: ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2072:3: RULE_ID
{
if (current==null) {
@@ -4121,14 +4113,14 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4232);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4227);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getEClassifierEClassifierCrossReference_0_0_0(), "eClassifier");
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2089:2: ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2085:2: ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
int alt41=2;
int LA41_0 = input.LA(1);
@@ -4137,19 +4129,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt41) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2089:3: '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2085:3: '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>'
{
- match(input,33,FOLLOW_33_in_ruleEGenericTypeReferenceDecl4245);
+ match(input,33,FOLLOW_33_in_ruleEGenericTypeReferenceDecl4240);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getLessThanSignKeyword_0_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2093:1: (lv_eTypeArguments_2= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2096:6: lv_eTypeArguments_2= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2089:1: (lv_eTypeArguments_2= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2092:6: lv_eTypeArguments_2= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getETypeArgumentsEGenericTypeDeclParserRuleCall_0_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4279);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4274);
lv_eTypeArguments_2=ruleEGenericTypeDecl();
_fsp--;
@@ -4169,7 +4161,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2114:2: ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2110:2: ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )*
loop40:
do {
int alt40=2;
@@ -4182,19 +4174,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt40) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2114:3: ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2110:3: ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl )
{
- match(input,28,FOLLOW_28_in_ruleEGenericTypeReferenceDecl4293);
+ match(input,28,FOLLOW_28_in_ruleEGenericTypeReferenceDecl4288);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getCommaKeyword_0_1_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2118:1: (lv_eTypeArguments_4= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2121:6: lv_eTypeArguments_4= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2114:1: (lv_eTypeArguments_4= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2117:6: lv_eTypeArguments_4= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getETypeArgumentsEGenericTypeDeclParserRuleCall_0_1_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4327);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4322);
lv_eTypeArguments_4=ruleEGenericTypeDecl();
_fsp--;
@@ -4223,7 +4215,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,34,FOLLOW_34_in_ruleEGenericTypeReferenceDecl4342);
+ match(input,34,FOLLOW_34_in_ruleEGenericTypeReferenceDecl4337);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getGreaterThanSignKeyword_0_1_3(), null);
@@ -4240,17 +4232,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2144:6: ( '#' ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2140:6: ( '#' ( RULE_ID ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2144:6: ( '#' ( RULE_ID ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2144:7: '#' ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2140:6: ( '#' ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2140:7: '#' ( RULE_ID )
{
- match(input,47,FOLLOW_47_in_ruleEGenericTypeReferenceDecl4361);
+ match(input,47,FOLLOW_47_in_ruleEGenericTypeReferenceDecl4356);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getNumberSignKeyword_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2148:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2151:3: RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2144:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2147:3: RULE_ID
{
if (current==null) {
@@ -4258,7 +4250,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4383);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4378);
createLeafNode(grammarAccess.getEGenericTypeReferenceDeclAccess().getETypeParameterETypeParameterCrossReference_1_1_0(), "eTypeParameter");
@@ -4294,7 +4286,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEGenericTypeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2171:1: entryRuleEGenericTypeDecl returns [EObject current=null] : iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2167:1: entryRuleEGenericTypeDecl returns [EObject current=null] : iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF ;
public final EObject entryRuleEGenericTypeDecl() throws RecognitionException {
EObject current = null;
@@ -4302,16 +4294,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2171:58: (iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2172:2: iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2167:58: (iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2168:2: iv_ruleEGenericTypeDecl= ruleEGenericTypeDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEGenericTypeDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_entryRuleEGenericTypeDecl4420);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_entryRuleEGenericTypeDecl4415);
iv_ruleEGenericTypeDecl=ruleEGenericTypeDecl();
_fsp--;
current =iv_ruleEGenericTypeDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEGenericTypeDecl4430);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEGenericTypeDecl4425);
}
@@ -4329,7 +4321,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEGenericTypeDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2179:1: ruleEGenericTypeDecl returns [EObject current=null] : ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2175:1: ruleEGenericTypeDecl returns [EObject current=null] : ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) ) ;
public final EObject ruleEGenericTypeDecl() throws RecognitionException {
EObject current = null;
@@ -4345,10 +4337,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2184:6: ( ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2180:6: ( ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2181:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2181:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )
int alt46=3;
switch ( input.LA(1) ) {
case RULE_ID:
@@ -4368,20 +4360,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
break;
default:
NoViableAltException nvae =
- new NoViableAltException("2185:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )", 46, 0, input);
+ new NoViableAltException("2181:1: ( ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? ) | ( '#' ( RULE_ID ) ) | ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) ) )", 46, 0, input);
throw nvae;
}
switch (alt46) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2181:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:3: ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2181:2: ( ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )? )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2181:3: ( RULE_ID ) ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2185:3: ( RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2188:3: RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2181:3: ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2184:3: RULE_ID
{
if (current==null) {
@@ -4389,14 +4381,14 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4478);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4473);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getEClassifierEClassifierCrossReference_0_0_0(), "eClassifier");
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2201:2: ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2197:2: ( '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>' )?
int alt44=2;
int LA44_0 = input.LA(1);
@@ -4405,19 +4397,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt44) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2201:3: '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2197:3: '<' (lv_eTypeArguments_2= ruleEGenericTypeDecl ) ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )* '>'
{
- match(input,33,FOLLOW_33_in_ruleEGenericTypeDecl4491);
+ match(input,33,FOLLOW_33_in_ruleEGenericTypeDecl4486);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getLessThanSignKeyword_0_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2205:1: (lv_eTypeArguments_2= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2208:6: lv_eTypeArguments_2= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2201:1: (lv_eTypeArguments_2= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2204:6: lv_eTypeArguments_2= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeDeclAccess().getETypeArgumentsEGenericTypeDeclParserRuleCall_0_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4525);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4520);
lv_eTypeArguments_2=ruleEGenericTypeDecl();
_fsp--;
@@ -4437,7 +4429,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2226:2: ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2222:2: ( ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl ) )*
loop43:
do {
int alt43=2;
@@ -4450,19 +4442,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt43) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2226:3: ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2222:3: ',' (lv_eTypeArguments_4= ruleEGenericTypeDecl )
{
- match(input,28,FOLLOW_28_in_ruleEGenericTypeDecl4539);
+ match(input,28,FOLLOW_28_in_ruleEGenericTypeDecl4534);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getCommaKeyword_0_1_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2230:1: (lv_eTypeArguments_4= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2233:6: lv_eTypeArguments_4= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2226:1: (lv_eTypeArguments_4= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2229:6: lv_eTypeArguments_4= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeDeclAccess().getETypeArgumentsEGenericTypeDeclParserRuleCall_0_1_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4573);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4568);
lv_eTypeArguments_4=ruleEGenericTypeDecl();
_fsp--;
@@ -4491,7 +4483,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,34,FOLLOW_34_in_ruleEGenericTypeDecl4588);
+ match(input,34,FOLLOW_34_in_ruleEGenericTypeDecl4583);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getGreaterThanSignKeyword_0_1_3(), null);
@@ -4508,17 +4500,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2256:6: ( '#' ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2252:6: ( '#' ( RULE_ID ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2256:6: ( '#' ( RULE_ID ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2256:7: '#' ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2252:6: ( '#' ( RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2252:7: '#' ( RULE_ID )
{
- match(input,47,FOLLOW_47_in_ruleEGenericTypeDecl4607);
+ match(input,47,FOLLOW_47_in_ruleEGenericTypeDecl4602);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getNumberSignKeyword_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2260:1: ( RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2263:3: RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2256:1: ( RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2259:3: RULE_ID
{
if (current==null) {
@@ -4526,7 +4518,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
associateNodeWithAstElement(currentNode, current);
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4629);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4624);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getETypeParameterETypeParameterCrossReference_1_1_0(), "eTypeParameter");
@@ -4540,16 +4532,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2277:6: ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2273:6: ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2277:6: ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2277:7: '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2273:6: ( '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2273:7: '?' ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )
{
- match(input,49,FOLLOW_49_in_ruleEGenericTypeDecl4649);
+ match(input,49,FOLLOW_49_in_ruleEGenericTypeDecl4644);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getQuestionMarkKeyword_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2281:1: ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2277:1: ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )
int alt45=2;
int LA45_0 = input.LA(1);
@@ -4561,28 +4553,28 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2281:1: ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )", 45, 0, input);
+ new NoViableAltException("2277:1: ( ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) ) | ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) ) )", 45, 0, input);
throw nvae;
}
switch (alt45) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2281:2: ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2277:2: ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2281:2: ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2281:3: 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2277:2: ( 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2277:3: 'extends' (lv_eUpperBound_10= ruleEGenericTypeDecl )
{
- match(input,35,FOLLOW_35_in_ruleEGenericTypeDecl4660);
+ match(input,35,FOLLOW_35_in_ruleEGenericTypeDecl4655);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getExtendsKeyword_2_1_0_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2285:1: (lv_eUpperBound_10= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2288:6: lv_eUpperBound_10= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2281:1: (lv_eUpperBound_10= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2284:6: lv_eUpperBound_10= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeDeclAccess().getEUpperBoundEGenericTypeDeclParserRuleCall_2_1_0_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4694);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4689);
lv_eUpperBound_10=ruleEGenericTypeDecl();
_fsp--;
@@ -4609,22 +4601,22 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2307:6: ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2303:6: ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2307:6: ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2307:7: 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2303:6: ( 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2303:7: 'super' (lv_eLowerBound_12= ruleEGenericTypeDecl )
{
- match(input,50,FOLLOW_50_in_ruleEGenericTypeDecl4715);
+ match(input,50,FOLLOW_50_in_ruleEGenericTypeDecl4710);
createLeafNode(grammarAccess.getEGenericTypeDeclAccess().getSuperKeyword_2_1_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2311:1: (lv_eLowerBound_12= ruleEGenericTypeDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2314:6: lv_eLowerBound_12= ruleEGenericTypeDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2307:1: (lv_eLowerBound_12= ruleEGenericTypeDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2310:6: lv_eLowerBound_12= ruleEGenericTypeDecl
{
currentNode=createCompositeNode(grammarAccess.getEGenericTypeDeclAccess().getELowerBoundEGenericTypeDeclParserRuleCall_2_1_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4749);
+ pushFollow(FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4744);
lv_eLowerBound_12=ruleEGenericTypeDecl();
_fsp--;
@@ -4682,7 +4674,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEOperationDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2339:1: entryRuleEOperationDecl returns [EObject current=null] : iv_ruleEOperationDecl= ruleEOperationDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2335:1: entryRuleEOperationDecl returns [EObject current=null] : iv_ruleEOperationDecl= ruleEOperationDecl EOF ;
public final EObject entryRuleEOperationDecl() throws RecognitionException {
EObject current = null;
@@ -4690,16 +4682,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2339:56: (iv_ruleEOperationDecl= ruleEOperationDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2340:2: iv_ruleEOperationDecl= ruleEOperationDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2335:56: (iv_ruleEOperationDecl= ruleEOperationDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2336:2: iv_ruleEOperationDecl= ruleEOperationDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEOperationDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEOperationDecl_in_entryRuleEOperationDecl4789);
+ pushFollow(FOLLOW_ruleEOperationDecl_in_entryRuleEOperationDecl4784);
iv_ruleEOperationDecl=ruleEOperationDecl();
_fsp--;
current =iv_ruleEOperationDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEOperationDecl4799);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEOperationDecl4794);
}
@@ -4717,7 +4709,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEOperationDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2347:1: ruleEOperationDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2343:1: ruleEOperationDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' ) ;
public final EObject ruleEOperationDecl() throws RecognitionException {
EObject current = null;
@@ -4744,13 +4736,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2352:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2353:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2348:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2349:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2353:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2353:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2349:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2349:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )* 'op' ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' ) (lv_name_6= RULE_ID ) ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )? '(' ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )? ')' ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )? ';'
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2353:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2349:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop47:
do {
int alt47=2;
@@ -4763,12 +4755,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt47) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2356:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2352:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEOperationDecl4858);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEOperationDecl4853);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -4794,7 +4786,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2374:3: ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2370:3: ( (lv_unique_1= 'bag' ) | (lv_ordered_2= 'random' ) )*
loop48:
do {
int alt48=3;
@@ -4810,13 +4802,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt48) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2374:4: (lv_unique_1= 'bag' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2370:4: (lv_unique_1= 'bag' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2374:4: (lv_unique_1= 'bag' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2376:6: lv_unique_1= 'bag'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2370:4: (lv_unique_1= 'bag' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2372:6: lv_unique_1= 'bag'
{
lv_unique_1=(Token)input.LT(1);
- match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEOperationDecl4885);
+ match(input,RULE_BAG,FOLLOW_RULE_BAG_in_ruleEOperationDecl4880);
createLeafNode(grammarAccess.getEOperationDeclAccess().getUniqueBagKeyword_1_0_0(), "unique");
@@ -4839,13 +4831,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2396:6: (lv_ordered_2= 'random' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2392:6: (lv_ordered_2= 'random' )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2396:6: (lv_ordered_2= 'random' )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2398:6: lv_ordered_2= 'random'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2392:6: (lv_ordered_2= 'random' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2394:6: lv_ordered_2= 'random'
{
lv_ordered_2=(Token)input.LT(1);
- match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEOperationDecl4925);
+ match(input,RULE_RANDOM,FOLLOW_RULE_RANDOM_in_ruleEOperationDecl4920);
createLeafNode(grammarAccess.getEOperationDeclAccess().getOrderedRandomKeyword_1_1_0(), "ordered");
@@ -4873,11 +4865,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,51,FOLLOW_51_in_ruleEOperationDecl4949);
+ match(input,51,FOLLOW_51_in_ruleEOperationDecl4944);
createLeafNode(grammarAccess.getEOperationDeclAccess().getOpKeyword_2(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2421:1: ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2417:1: ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' )
int alt49=2;
int LA49_0 = input.LA(1);
@@ -4889,21 +4881,21 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2421:1: ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' )", 49, 0, input);
+ new NoViableAltException("2417:1: ( (lv_eGenericType_4= ruleEGenericTypeReferenceDecl ) | 'void' )", 49, 0, input);
throw nvae;
}
switch (alt49) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2421:2: (lv_eGenericType_4= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2417:2: (lv_eGenericType_4= ruleEGenericTypeReferenceDecl )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2421:2: (lv_eGenericType_4= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2424:6: lv_eGenericType_4= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2417:2: (lv_eGenericType_4= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2420:6: lv_eGenericType_4= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEGenericTypeEGenericTypeReferenceDeclParserRuleCall_3_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl4984);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl4979);
lv_eGenericType_4=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -4927,9 +4919,9 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2443:6: 'void'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2439:6: 'void'
{
- match(input,52,FOLLOW_52_in_ruleEOperationDecl5003);
+ match(input,52,FOLLOW_52_in_ruleEOperationDecl4998);
createLeafNode(grammarAccess.getEOperationDeclAccess().getVoidKeyword_3_1(), null);
@@ -4939,11 +4931,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2447:2: (lv_name_6= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2449:6: lv_name_6= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2443:2: (lv_name_6= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2445:6: lv_name_6= RULE_ID
{
lv_name_6=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEOperationDecl5026);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEOperationDecl5021);
createLeafNode(grammarAccess.getEOperationDeclAccess().getNameIDTerminalRuleCall_4_0(), "name");
@@ -4962,7 +4954,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2467:2: ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2463:2: ( '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>' )?
int alt51=2;
int LA51_0 = input.LA(1);
@@ -4971,19 +4963,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt51) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2467:3: '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2463:3: '<' (lv_eTypeParameters_8= ruleETypeParameterDecl ) ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )* '>'
{
- match(input,33,FOLLOW_33_in_ruleEOperationDecl5044);
+ match(input,33,FOLLOW_33_in_ruleEOperationDecl5039);
createLeafNode(grammarAccess.getEOperationDeclAccess().getLessThanSignKeyword_5_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2471:1: (lv_eTypeParameters_8= ruleETypeParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2474:6: lv_eTypeParameters_8= ruleETypeParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2467:1: (lv_eTypeParameters_8= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2470:6: lv_eTypeParameters_8= ruleETypeParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getETypeParametersETypeParameterDeclParserRuleCall_5_1_0(), currentNode);
- pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5078);
+ pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5073);
lv_eTypeParameters_8=ruleETypeParameterDecl();
_fsp--;
@@ -5003,7 +4995,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2492:2: ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2488:2: ( ',' (lv_eTypeParameters_10= ruleETypeParameterDecl ) )*
loop50:
do {
int alt50=2;
@@ -5016,19 +5008,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt50) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2492:3: ',' (lv_eTypeParameters_10= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2488:3: ',' (lv_eTypeParameters_10= ruleETypeParameterDecl )
{
- match(input,28,FOLLOW_28_in_ruleEOperationDecl5092);
+ match(input,28,FOLLOW_28_in_ruleEOperationDecl5087);
createLeafNode(grammarAccess.getEOperationDeclAccess().getCommaKeyword_5_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2496:1: (lv_eTypeParameters_10= ruleETypeParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2499:6: lv_eTypeParameters_10= ruleETypeParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2492:1: (lv_eTypeParameters_10= ruleETypeParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2495:6: lv_eTypeParameters_10= ruleETypeParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getETypeParametersETypeParameterDeclParserRuleCall_5_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5126);
+ pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5121);
lv_eTypeParameters_10=ruleETypeParameterDecl();
_fsp--;
@@ -5057,7 +5049,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- match(input,34,FOLLOW_34_in_ruleEOperationDecl5141);
+ match(input,34,FOLLOW_34_in_ruleEOperationDecl5136);
createLeafNode(grammarAccess.getEOperationDeclAccess().getGreaterThanSignKeyword_5_3(), null);
@@ -5067,11 +5059,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,27,FOLLOW_27_in_ruleEOperationDecl5152);
+ match(input,27,FOLLOW_27_in_ruleEOperationDecl5147);
createLeafNode(grammarAccess.getEOperationDeclAccess().getLeftParenthesisKeyword_6(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2525:1: ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2521:1: ( (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )* )?
int alt53=2;
int LA53_0 = input.LA(1);
@@ -5080,15 +5072,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt53) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2525:2: (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2521:2: (lv_eParameters_13= ruleEParameterDecl ) ( ',' (lv_eParameters_15= ruleEParameterDecl ) )*
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2525:2: (lv_eParameters_13= ruleEParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2528:6: lv_eParameters_13= ruleEParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2521:2: (lv_eParameters_13= ruleEParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2524:6: lv_eParameters_13= ruleEParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEParametersEParameterDeclParserRuleCall_7_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5187);
+ pushFollow(FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5182);
lv_eParameters_13=ruleEParameterDecl();
_fsp--;
@@ -5108,7 +5100,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2546:2: ( ',' (lv_eParameters_15= ruleEParameterDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2542:2: ( ',' (lv_eParameters_15= ruleEParameterDecl ) )*
loop52:
do {
int alt52=2;
@@ -5121,19 +5113,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt52) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2546:3: ',' (lv_eParameters_15= ruleEParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2542:3: ',' (lv_eParameters_15= ruleEParameterDecl )
{
- match(input,28,FOLLOW_28_in_ruleEOperationDecl5201);
+ match(input,28,FOLLOW_28_in_ruleEOperationDecl5196);
createLeafNode(grammarAccess.getEOperationDeclAccess().getCommaKeyword_7_1_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2550:1: (lv_eParameters_15= ruleEParameterDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2553:6: lv_eParameters_15= ruleEParameterDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2546:1: (lv_eParameters_15= ruleEParameterDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2549:6: lv_eParameters_15= ruleEParameterDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEParametersEParameterDeclParserRuleCall_7_1_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5235);
+ pushFollow(FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5230);
lv_eParameters_15=ruleEParameterDecl();
_fsp--;
@@ -5168,11 +5160,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,29,FOLLOW_29_in_ruleEOperationDecl5252);
+ match(input,29,FOLLOW_29_in_ruleEOperationDecl5247);
createLeafNode(grammarAccess.getEOperationDeclAccess().getRightParenthesisKeyword_8(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2575:1: ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2571:1: ( 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )* )?
int alt55=2;
int LA55_0 = input.LA(1);
@@ -5181,19 +5173,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt55) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2575:2: 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2571:2: 'throws' (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl ) ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )*
{
- match(input,53,FOLLOW_53_in_ruleEOperationDecl5262);
+ match(input,53,FOLLOW_53_in_ruleEOperationDecl5257);
createLeafNode(grammarAccess.getEOperationDeclAccess().getThrowsKeyword_9_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2579:1: (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2582:6: lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2575:1: (lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2578:6: lv_eGenericExceptions_18= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEGenericExceptionsEGenericTypeReferenceDeclParserRuleCall_9_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5296);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5291);
lv_eGenericExceptions_18=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -5213,7 +5205,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2600:2: ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2596:2: ( ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl ) )*
loop54:
do {
int alt54=2;
@@ -5226,19 +5218,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt54) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2600:3: ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2596:3: ',' (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl )
{
- match(input,28,FOLLOW_28_in_ruleEOperationDecl5310);
+ match(input,28,FOLLOW_28_in_ruleEOperationDecl5305);
createLeafNode(grammarAccess.getEOperationDeclAccess().getCommaKeyword_9_2_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2604:1: (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2607:6: lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2600:1: (lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2603:6: lv_eGenericExceptions_20= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEOperationDeclAccess().getEGenericExceptionsEGenericTypeReferenceDeclParserRuleCall_9_2_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5344);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5339);
lv_eGenericExceptions_20=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -5273,7 +5265,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,18,FOLLOW_18_in_ruleEOperationDecl5361);
+ match(input,18,FOLLOW_18_in_ruleEOperationDecl5356);
createLeafNode(grammarAccess.getEOperationDeclAccess().getSemicolonKeyword_10(), null);
@@ -5300,7 +5292,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleEParameterDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2636:1: entryRuleEParameterDecl returns [EObject current=null] : iv_ruleEParameterDecl= ruleEParameterDecl EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2632:1: entryRuleEParameterDecl returns [EObject current=null] : iv_ruleEParameterDecl= ruleEParameterDecl EOF ;
public final EObject entryRuleEParameterDecl() throws RecognitionException {
EObject current = null;
@@ -5308,16 +5300,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2636:56: (iv_ruleEParameterDecl= ruleEParameterDecl EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2637:2: iv_ruleEParameterDecl= ruleEParameterDecl EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2632:56: (iv_ruleEParameterDecl= ruleEParameterDecl EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2633:2: iv_ruleEParameterDecl= ruleEParameterDecl EOF
{
currentNode = createCompositeNode(grammarAccess.getEParameterDeclRule(), currentNode);
- pushFollow(FOLLOW_ruleEParameterDecl_in_entryRuleEParameterDecl5394);
+ pushFollow(FOLLOW_ruleEParameterDecl_in_entryRuleEParameterDecl5389);
iv_ruleEParameterDecl=ruleEParameterDecl();
_fsp--;
current =iv_ruleEParameterDecl;
- match(input,EOF,FOLLOW_EOF_in_entryRuleEParameterDecl5404);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEParameterDecl5399);
}
@@ -5335,7 +5327,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleEParameterDecl
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2644:1: ruleEParameterDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2640:1: ruleEParameterDecl returns [EObject current=null] : ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) ) ;
public final EObject ruleEParameterDecl() throws RecognitionException {
EObject current = null;
@@ -5348,13 +5340,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2649:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2650:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2645:6: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2646:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2650:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2650:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2646:1: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2646:2: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_eGenericType_1= ruleEGenericTypeReferenceDecl ) (lv_name_2= RULE_ID )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2650:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2646:2: (lv_eAnnotations_0= ruleEAnnotationDecl )*
loop56:
do {
int alt56=2;
@@ -5367,12 +5359,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt56) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2653:6: lv_eAnnotations_0= ruleEAnnotationDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2649:6: lv_eAnnotations_0= ruleEAnnotationDecl
{
currentNode=createCompositeNode(grammarAccess.getEParameterDeclAccess().getEAnnotationsEAnnotationDeclParserRuleCall_0_0(), currentNode);
- pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEParameterDecl5463);
+ pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEParameterDecl5458);
lv_eAnnotations_0=ruleEAnnotationDecl();
_fsp--;
@@ -5398,13 +5390,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
} while (true);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2671:3: (lv_eGenericType_1= ruleEGenericTypeReferenceDecl )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2674:6: lv_eGenericType_1= ruleEGenericTypeReferenceDecl
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2667:3: (lv_eGenericType_1= ruleEGenericTypeReferenceDecl )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2670:6: lv_eGenericType_1= ruleEGenericTypeReferenceDecl
{
currentNode=createCompositeNode(grammarAccess.getEParameterDeclAccess().getEGenericTypeEGenericTypeReferenceDeclParserRuleCall_1_0(), currentNode);
- pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEParameterDecl5502);
+ pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEParameterDecl5497);
lv_eGenericType_1=ruleEGenericTypeReferenceDecl();
_fsp--;
@@ -5424,11 +5416,11 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2692:2: (lv_name_2= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2694:6: lv_name_2= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2688:2: (lv_name_2= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2690:6: lv_name_2= RULE_ID
{
lv_name_2=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEParameterDecl5528);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEParameterDecl5523);
createLeafNode(grammarAccess.getEParameterDeclAccess().getNameIDTerminalRuleCall_2_0(), "name");
@@ -5470,7 +5462,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleMapEntry
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2719:1: entryRuleMapEntry returns [EObject current=null] : iv_ruleMapEntry= ruleMapEntry EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2715:1: entryRuleMapEntry returns [EObject current=null] : iv_ruleMapEntry= ruleMapEntry EOF ;
public final EObject entryRuleMapEntry() throws RecognitionException {
EObject current = null;
@@ -5478,16 +5470,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2719:50: (iv_ruleMapEntry= ruleMapEntry EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2720:2: iv_ruleMapEntry= ruleMapEntry EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2715:50: (iv_ruleMapEntry= ruleMapEntry EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2716:2: iv_ruleMapEntry= ruleMapEntry EOF
{
currentNode = createCompositeNode(grammarAccess.getMapEntryRule(), currentNode);
- pushFollow(FOLLOW_ruleMapEntry_in_entryRuleMapEntry5569);
+ pushFollow(FOLLOW_ruleMapEntry_in_entryRuleMapEntry5564);
iv_ruleMapEntry=ruleMapEntry();
_fsp--;
current =iv_ruleMapEntry;
- match(input,EOF,FOLLOW_EOF_in_entryRuleMapEntry5579);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleMapEntry5574);
}
@@ -5505,7 +5497,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleMapEntry
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2727:1: ruleMapEntry returns [EObject current=null] : ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2723:1: ruleMapEntry returns [EObject current=null] : ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) ) ;
public final EObject ruleMapEntry() throws RecognitionException {
EObject current = null;
@@ -5515,17 +5507,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
EObject temp=null; setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2732:6: ( ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2733:1: ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2728:6: ( ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2729:1: ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2733:1: ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2733:2: (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2729:1: ( (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2729:2: (lv_key_0= RULE_ID ) '=' (lv_value_2= RULE_STRING )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2733:2: (lv_key_0= RULE_ID )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2735:6: lv_key_0= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2729:2: (lv_key_0= RULE_ID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2731:6: lv_key_0= RULE_ID
{
lv_key_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMapEntry5626);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMapEntry5621);
createLeafNode(grammarAccess.getMapEntryAccess().getKeyIDTerminalRuleCall_0_0(), "key");
@@ -5544,15 +5536,15 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
- match(input,17,FOLLOW_17_in_ruleMapEntry5643);
+ match(input,17,FOLLOW_17_in_ruleMapEntry5638);
createLeafNode(grammarAccess.getMapEntryAccess().getEqualsSignKeyword_1(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2757:1: (lv_value_2= RULE_STRING )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2759:6: lv_value_2= RULE_STRING
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2753:1: (lv_value_2= RULE_STRING )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2755:6: lv_value_2= RULE_STRING
{
lv_value_2=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleMapEntry5665);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleMapEntry5660);
createLeafNode(grammarAccess.getMapEntryAccess().getValueSTRINGTerminalRuleCall_2_0(), "value");
@@ -5594,7 +5586,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleQID
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2784:1: entryRuleQID returns [String current=null] : iv_ruleQID= ruleQID EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2780:1: entryRuleQID returns [String current=null] : iv_ruleQID= ruleQID EOF ;
public final String entryRuleQID() throws RecognitionException {
String current = null;
@@ -5602,16 +5594,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2784:44: (iv_ruleQID= ruleQID EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2785:2: iv_ruleQID= ruleQID EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2780:44: (iv_ruleQID= ruleQID EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2781:2: iv_ruleQID= ruleQID EOF
{
currentNode = createCompositeNode(grammarAccess.getQIDRule(), currentNode);
- pushFollow(FOLLOW_ruleQID_in_entryRuleQID5707);
+ pushFollow(FOLLOW_ruleQID_in_entryRuleQID5702);
iv_ruleQID=ruleQID();
_fsp--;
current =iv_ruleQID.getText();
- match(input,EOF,FOLLOW_EOF_in_entryRuleQID5718);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleQID5713);
}
@@ -5629,7 +5621,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleQID
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2792:1: ruleQID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2788:1: ruleQID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* ) ;
public final AntlrDatatypeRuleToken ruleQID() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -5640,21 +5632,21 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2798:6: ( (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2799:1: (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2794:6: ( (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2795:1: (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2799:1: (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2799:6: this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2795:1: (this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )* )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2795:6: this_ID_0= RULE_ID ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )*
{
this_ID_0=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQID5758);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQID5753);
current.merge(this_ID_0);
createLeafNode(grammarAccess.getQIDAccess().getIDTerminalRuleCall_0(), null);
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2806:1: ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )*
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2802:1: ( (kw= '.' | kw= '$' ) this_ID_3= RULE_ID )*
loop58:
do {
int alt58=2;
@@ -5667,9 +5659,9 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
switch (alt58) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2806:2: (kw= '.' | kw= '$' ) this_ID_3= RULE_ID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2802:2: (kw= '.' | kw= '$' ) this_ID_3= RULE_ID
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2806:2: (kw= '.' | kw= '$' )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2802:2: (kw= '.' | kw= '$' )
int alt57=2;
int LA57_0 = input.LA(1);
@@ -5681,16 +5673,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2806:2: (kw= '.' | kw= '$' )", 57, 0, input);
+ new NoViableAltException("2802:2: (kw= '.' | kw= '$' )", 57, 0, input);
throw nvae;
}
switch (alt57) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2807:2: kw= '.'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2803:2: kw= '.'
{
kw=(Token)input.LT(1);
- match(input,54,FOLLOW_54_in_ruleQID5778);
+ match(input,54,FOLLOW_54_in_ruleQID5773);
current.merge(kw);
createLeafNode(grammarAccess.getQIDAccess().getFullStopKeyword_1_0_0(), null);
@@ -5699,10 +5691,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2814:2: kw= '$'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2810:2: kw= '$'
{
kw=(Token)input.LT(1);
- match(input,55,FOLLOW_55_in_ruleQID5797);
+ match(input,55,FOLLOW_55_in_ruleQID5792);
current.merge(kw);
createLeafNode(grammarAccess.getQIDAccess().getDollarSignKeyword_1_0_1(), null);
@@ -5714,7 +5706,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
this_ID_3=(Token)input.LT(1);
- match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQID5813);
+ match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQID5808);
current.merge(this_ID_3);
@@ -5754,7 +5746,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleSTRING_OR_QID
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2834:1: entryRuleSTRING_OR_QID returns [String current=null] : iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2830:1: entryRuleSTRING_OR_QID returns [String current=null] : iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF ;
public final String entryRuleSTRING_OR_QID() throws RecognitionException {
String current = null;
@@ -5762,16 +5754,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2834:54: (iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2835:2: iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2830:54: (iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2831:2: iv_ruleSTRING_OR_QID= ruleSTRING_OR_QID EOF
{
currentNode = createCompositeNode(grammarAccess.getSTRING_OR_QIDRule(), currentNode);
- pushFollow(FOLLOW_ruleSTRING_OR_QID_in_entryRuleSTRING_OR_QID5859);
+ pushFollow(FOLLOW_ruleSTRING_OR_QID_in_entryRuleSTRING_OR_QID5854);
iv_ruleSTRING_OR_QID=ruleSTRING_OR_QID();
_fsp--;
current =iv_ruleSTRING_OR_QID.getText();
- match(input,EOF,FOLLOW_EOF_in_entryRuleSTRING_OR_QID5870);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleSTRING_OR_QID5865);
}
@@ -5789,7 +5781,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleSTRING_OR_QID
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2842:1: ruleSTRING_OR_QID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_STRING_0= RULE_STRING | this_QID_1= ruleQID ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2838:1: ruleSTRING_OR_QID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_STRING_0= RULE_STRING | this_QID_1= ruleQID ) ;
public final AntlrDatatypeRuleToken ruleSTRING_OR_QID() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -5800,10 +5792,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2848:6: ( (this_STRING_0= RULE_STRING | this_QID_1= ruleQID ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2849:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2844:6: ( (this_STRING_0= RULE_STRING | this_QID_1= ruleQID ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2845:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2849:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2845:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )
int alt59=2;
int LA59_0 = input.LA(1);
@@ -5815,16 +5807,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
else {
NoViableAltException nvae =
- new NoViableAltException("2849:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )", 59, 0, input);
+ new NoViableAltException("2845:1: (this_STRING_0= RULE_STRING | this_QID_1= ruleQID )", 59, 0, input);
throw nvae;
}
switch (alt59) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2849:6: this_STRING_0= RULE_STRING
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2845:6: this_STRING_0= RULE_STRING
{
this_STRING_0=(Token)input.LT(1);
- match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSTRING_OR_QID5910);
+ match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSTRING_OR_QID5905);
current.merge(this_STRING_0);
@@ -5835,12 +5827,12 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2858:5: this_QID_1= ruleQID
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2854:5: this_QID_1= ruleQID
{
currentNode=createCompositeNode(grammarAccess.getSTRING_OR_QIDAccess().getQIDParserRuleCall_1(), currentNode);
- pushFollow(FOLLOW_ruleQID_in_ruleSTRING_OR_QID5943);
+ pushFollow(FOLLOW_ruleQID_in_ruleSTRING_OR_QID5938);
this_QID_1=ruleQID();
_fsp--;
@@ -5877,7 +5869,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start entryRuleSINT
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2876:1: entryRuleSINT returns [String current=null] : iv_ruleSINT= ruleSINT EOF ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2872:1: entryRuleSINT returns [String current=null] : iv_ruleSINT= ruleSINT EOF ;
public final String entryRuleSINT() throws RecognitionException {
String current = null;
@@ -5885,16 +5877,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2876:45: (iv_ruleSINT= ruleSINT EOF )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2877:2: iv_ruleSINT= ruleSINT EOF
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2872:45: (iv_ruleSINT= ruleSINT EOF )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2873:2: iv_ruleSINT= ruleSINT EOF
{
currentNode = createCompositeNode(grammarAccess.getSINTRule(), currentNode);
- pushFollow(FOLLOW_ruleSINT_in_entryRuleSINT5987);
+ pushFollow(FOLLOW_ruleSINT_in_entryRuleSINT5982);
iv_ruleSINT=ruleSINT();
_fsp--;
current =iv_ruleSINT.getText();
- match(input,EOF,FOLLOW_EOF_in_entryRuleSINT5998);
+ match(input,EOF,FOLLOW_EOF_in_entryRuleSINT5993);
}
@@ -5912,7 +5904,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
// $ANTLR start ruleSINT
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2884:1: ruleSINT returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_INT_1= RULE_INT ) ;
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2880:1: ruleSINT returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_INT_1= RULE_INT ) ;
public final AntlrDatatypeRuleToken ruleSINT() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -5922,13 +5914,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
setCurrentLookahead(); resetLookahead();
try {
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2890:6: ( ( (kw= '-' )? this_INT_1= RULE_INT ) )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2891:1: ( (kw= '-' )? this_INT_1= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2886:6: ( ( (kw= '-' )? this_INT_1= RULE_INT ) )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2887:1: ( (kw= '-' )? this_INT_1= RULE_INT )
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2891:1: ( (kw= '-' )? this_INT_1= RULE_INT )
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2891:2: (kw= '-' )? this_INT_1= RULE_INT
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2887:1: ( (kw= '-' )? this_INT_1= RULE_INT )
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2887:2: (kw= '-' )? this_INT_1= RULE_INT
{
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2891:2: (kw= '-' )?
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2887:2: (kw= '-' )?
int alt60=2;
int LA60_0 = input.LA(1);
@@ -5937,10 +5929,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
switch (alt60) {
case 1 :
- // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2892:2: kw= '-'
+ // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:2888:2: kw= '-'
{
kw=(Token)input.LT(1);
- match(input,56,FOLLOW_56_in_ruleSINT6037);
+ match(input,56,FOLLOW_56_in_ruleSINT6032);
current.merge(kw);
createLeafNode(grammarAccess.getSINTAccess().getHyphenMinusKeyword_0(), null);
@@ -5952,7 +5944,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
}
this_INT_1=(Token)input.LT(1);
- match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSINT6054);
+ match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSINT6049);
current.merge(this_INT_1);
@@ -6059,7 +6051,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
this.transition = DFA4_transition;
}
public String getDescription() {
- return "()* loopback of 326:1: ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )*";
+ return "()* loopback of 322:1: ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )*";
}
}
static final String DFA6_eotS =
@@ -6133,7 +6125,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
this.transition = DFA6_transition;
}
public String getDescription() {
- return "()* loopback of 443:1: ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )*";
+ return "()* loopback of 439:1: ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )*";
}
}
static final String DFA7_eotS =
@@ -6202,7 +6194,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
this.transition = DFA7_transition;
}
public String getDescription() {
- return "511:1: (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl )";
+ return "507:1: (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl )";
}
}
static final String DFA10_eotS =
@@ -6271,7 +6263,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
this.transition = DFA10_transition;
}
public String getDescription() {
- return "551:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )";
+ return "547:1: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= RULE_SERIALIZABLE )? ( 'datatype' (lv_name_3= RULE_ID ) ':' (lv_instanceClassName_5= ruleSTRING_OR_QID ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl )";
}
}
static final String DFA21_eotS =
@@ -6349,7 +6341,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
this.transition = DFA21_transition;
}
public String getDescription() {
- return "()* loopback of 997:1: ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )*";
+ return "()* loopback of 993:1: ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )*";
}
}
static final String DFA22_eotS =
@@ -6436,233 +6428,233 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser {
this.transition = DFA22_transition;
}
public String getDescription() {
- return "1065:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )";
+ return "1061:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl )";
}
}
public static final BitSet FOLLOW_ruleEcoreDsl_in_entryRuleEcoreDsl71 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleEcoreDsl81 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleImportStatementDecl_in_ruleEcoreDsl140 = new BitSet(new long[]{0x0000000004090000L});
+ public static final BitSet FOLLOW_ruleReferencedMetamodel_in_ruleEcoreDsl140 = new BitSet(new long[]{0x0000000004090000L});
public static final BitSet FOLLOW_ruleEPackageDecl_in_ruleEcoreDsl179 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleImportStatementDecl_in_entryRuleImportStatementDecl216 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleImportStatementDecl226 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_16_in_ruleImportStatementDecl260 = new BitSet(new long[]{0x0000000000000030L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleImportStatementDecl283 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_17_in_ruleImportStatementDecl300 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleImportStatementDecl324 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_18_in_ruleImportStatementDecl341 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEPackageDecl_in_entryRuleEPackageDecl374 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEPackageDecl384 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEPackageDecl443 = new BitSet(new long[]{0x0000000004080000L});
- public static final BitSet FOLLOW_19_in_ruleEPackageDecl457 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleQID_in_ruleEPackageDecl491 = new BitSet(new long[]{0x0000000000100000L});
- public static final BitSet FOLLOW_20_in_ruleEPackageDecl504 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_17_in_ruleEPackageDecl513 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleEPackageDecl535 = new BitSet(new long[]{0x0000000000200000L});
- public static final BitSet FOLLOW_21_in_ruleEPackageDecl552 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_17_in_ruleEPackageDecl561 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleQID_in_ruleEPackageDecl595 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_22_in_ruleEPackageDecl608 = new BitSet(new long[]{0x00010001C5880040L});
- public static final BitSet FOLLOW_ruleSubEPackageDecl_in_ruleEPackageDecl643 = new BitSet(new long[]{0x00010001C5880040L});
- public static final BitSet FOLLOW_ruleEClassifierDecl_in_ruleEPackageDecl687 = new BitSet(new long[]{0x00010001C5880040L});
- public static final BitSet FOLLOW_23_in_ruleEPackageDecl702 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleSubEPackageDecl_in_entryRuleSubEPackageDecl735 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleSubEPackageDecl745 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleSubEPackageDecl804 = new BitSet(new long[]{0x0000000004080000L});
- public static final BitSet FOLLOW_19_in_ruleSubEPackageDecl818 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleSubEPackageDecl840 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_22_in_ruleSubEPackageDecl857 = new BitSet(new long[]{0x00010001C5880040L});
- public static final BitSet FOLLOW_ruleSubEPackageDecl_in_ruleSubEPackageDecl892 = new BitSet(new long[]{0x00010001C5880040L});
- public static final BitSet FOLLOW_ruleEClassifierDecl_in_ruleSubEPackageDecl936 = new BitSet(new long[]{0x00010001C5880040L});
- public static final BitSet FOLLOW_23_in_ruleSubEPackageDecl951 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEClassifierDecl_in_entryRuleEClassifierDecl984 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEClassifierDecl994 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEClassDecl_in_ruleEClassifierDecl1041 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEDataTypeDecl_in_ruleEClassifierDecl1068 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEDataTypeDecl_in_entryRuleEDataTypeDecl1100 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEDataTypeDecl1110 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEDataTypeDecl1170 = new BitSet(new long[]{0x0000000005000040L});
- public static final BitSet FOLLOW_RULE_SERIALIZABLE_in_ruleEDataTypeDecl1197 = new BitSet(new long[]{0x0000000001000000L});
- public static final BitSet FOLLOW_24_in_ruleEDataTypeDecl1216 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEDataTypeDecl1238 = new BitSet(new long[]{0x0000000002000000L});
- public static final BitSet FOLLOW_25_in_ruleEDataTypeDecl1255 = new BitSet(new long[]{0x0000000000000030L});
- public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEDataTypeDecl1289 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_18_in_ruleEDataTypeDecl1302 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEEnumDecl_in_ruleEDataTypeDecl1332 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_entryRuleEAnnotationDecl1364 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEAnnotationDecl1374 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_26_in_ruleEAnnotationDecl1408 = new BitSet(new long[]{0x0000000000000030L});
- public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEAnnotationDecl1442 = new BitSet(new long[]{0x0000000008000002L});
- public static final BitSet FOLLOW_27_in_ruleEAnnotationDecl1456 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1490 = new BitSet(new long[]{0x0000000030000000L});
- public static final BitSet FOLLOW_28_in_ruleEAnnotationDecl1504 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1538 = new BitSet(new long[]{0x0000000030000000L});
- public static final BitSet FOLLOW_29_in_ruleEAnnotationDecl1553 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEClassDecl_in_entryRuleEClassDecl1588 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEClassDecl1598 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEClassDecl1657 = new BitSet(new long[]{0x00000001C4000000L});
- public static final BitSet FOLLOW_30_in_ruleEClassDecl1683 = new BitSet(new long[]{0x0000000180000000L});
- public static final BitSet FOLLOW_31_in_ruleEClassDecl1719 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_32_in_ruleEClassDecl1747 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEClassDecl1770 = new BitSet(new long[]{0x0000000A02400000L});
- public static final BitSet FOLLOW_33_in_ruleEClassDecl1788 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1822 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_28_in_ruleEClassDecl1836 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1870 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_34_in_ruleEClassDecl1885 = new BitSet(new long[]{0x0000000802400000L});
- public static final BitSet FOLLOW_35_in_ruleEClassDecl1897 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1931 = new BitSet(new long[]{0x0000000012400000L});
- public static final BitSet FOLLOW_28_in_ruleEClassDecl1945 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1979 = new BitSet(new long[]{0x0000000012400000L});
- public static final BitSet FOLLOW_25_in_ruleEClassDecl1997 = new BitSet(new long[]{0x0000000000000030L});
- public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEClassDecl2031 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_22_in_ruleEClassDecl2046 = new BitSet(new long[]{0x000863F004800B80L});
- public static final BitSet FOLLOW_ruleEStructuralFeatureDecl_in_ruleEClassDecl2081 = new BitSet(new long[]{0x000863F004800B80L});
- public static final BitSet FOLLOW_ruleEOperationDecl_in_ruleEClassDecl2125 = new BitSet(new long[]{0x000863F004800B80L});
- public static final BitSet FOLLOW_23_in_ruleEClassDecl2140 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEStructuralFeatureDecl_in_entryRuleEStructuralFeatureDecl2173 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEStructuralFeatureDecl2183 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAttributeDecl_in_ruleEStructuralFeatureDecl2230 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEReferenceDecl_in_ruleEStructuralFeatureDecl2257 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAttributeDecl_in_entryRuleEAttributeDecl2289 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEAttributeDecl2299 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEAttributeDecl2358 = new BitSet(new long[]{0x000003F004000380L});
- public static final BitSet FOLLOW_36_in_ruleEAttributeDecl2385 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_RULE_BAG_in_ruleEAttributeDecl2426 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEAttributeDecl2462 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_RULE_READONLY_in_ruleEAttributeDecl2498 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_37_in_ruleEAttributeDecl2533 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_38_in_ruleEAttributeDecl2573 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_39_in_ruleEAttributeDecl2613 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_40_in_ruleEAttributeDecl2653 = new BitSet(new long[]{0x000003F000000380L});
- public static final BitSet FOLLOW_41_in_ruleEAttributeDecl2677 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEAttributeDecl2711 = new BitSet(new long[]{0x0000040000000010L});
- public static final BitSet FOLLOW_42_in_ruleEAttributeDecl2725 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleEAttributeDecl2747 = new BitSet(new long[]{0x0000180000000000L});
- public static final BitSet FOLLOW_43_in_ruleEAttributeDecl2765 = new BitSet(new long[]{0x0100000000000400L});
- public static final BitSet FOLLOW_ruleSINT_in_ruleEAttributeDecl2799 = new BitSet(new long[]{0x0000100000000000L});
- public static final BitSet FOLLOW_44_in_ruleEAttributeDecl2814 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEAttributeDecl2838 = new BitSet(new long[]{0x0000000000060000L});
- public static final BitSet FOLLOW_17_in_ruleEAttributeDecl2856 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleEAttributeDecl2878 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_18_in_ruleEAttributeDecl2897 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEReferenceDecl_in_entryRuleEReferenceDecl2930 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEReferenceDecl2940 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEReferenceDecl2999 = new BitSet(new long[]{0x000061E004000B80L});
- public static final BitSet FOLLOW_RULE_LOCAL_in_ruleEReferenceDecl3027 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_RULE_BAG_in_ruleEReferenceDecl3063 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEReferenceDecl3099 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_RULE_READONLY_in_ruleEReferenceDecl3135 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_37_in_ruleEReferenceDecl3170 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_38_in_ruleEReferenceDecl3210 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_39_in_ruleEReferenceDecl3250 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_40_in_ruleEReferenceDecl3290 = new BitSet(new long[]{0x000061E000000B80L});
- public static final BitSet FOLLOW_45_in_ruleEReferenceDecl3327 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_46_in_ruleEReferenceDecl3355 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEReferenceDecl3390 = new BitSet(new long[]{0x0000840000000010L});
- public static final BitSet FOLLOW_42_in_ruleEReferenceDecl3404 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleEReferenceDecl3426 = new BitSet(new long[]{0x0000180000000000L});
- public static final BitSet FOLLOW_43_in_ruleEReferenceDecl3444 = new BitSet(new long[]{0x0100000000000400L});
- public static final BitSet FOLLOW_ruleSINT_in_ruleEReferenceDecl3478 = new BitSet(new long[]{0x0000100000000000L});
- public static final BitSet FOLLOW_44_in_ruleEReferenceDecl3493 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_47_in_ruleEReferenceDecl3505 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEReferenceDecl3527 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEReferenceDecl3554 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_18_in_ruleEReferenceDecl3571 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEEnumDecl_in_entryRuleEEnumDecl3604 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEEnumDecl3614 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEEnumDecl3673 = new BitSet(new long[]{0x0001000004000000L});
- public static final BitSet FOLLOW_48_in_ruleEEnumDecl3687 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEEnumDecl3709 = new BitSet(new long[]{0x0000000000400000L});
- public static final BitSet FOLLOW_22_in_ruleEEnumDecl3726 = new BitSet(new long[]{0x0000000004000010L});
- public static final BitSet FOLLOW_ruleEEnumLiteralDecl_in_ruleEEnumDecl3760 = new BitSet(new long[]{0x0000000004800010L});
- public static final BitSet FOLLOW_23_in_ruleEEnumDecl3774 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEEnumLiteralDecl_in_entryRuleEEnumLiteralDecl3807 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEEnumLiteralDecl3817 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEEnumLiteralDecl3876 = new BitSet(new long[]{0x0000000004000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEEnumLiteralDecl3903 = new BitSet(new long[]{0x0000000000060020L});
- public static final BitSet FOLLOW_17_in_ruleEEnumLiteralDecl3921 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleEEnumLiteralDecl3943 = new BitSet(new long[]{0x0000000000040020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleEEnumLiteralDecl3975 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_18_in_ruleEEnumLiteralDecl3993 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleETypeParameterDecl_in_entryRuleETypeParameterDecl4026 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleETypeParameterDecl4036 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleETypeParameterDecl4083 = new BitSet(new long[]{0x0000000800000002L});
- public static final BitSet FOLLOW_35_in_ruleETypeParameterDecl4101 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleETypeParameterDecl4135 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_entryRuleEGenericTypeReferenceDecl4174 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEGenericTypeReferenceDecl4184 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4232 = new BitSet(new long[]{0x0000000200000002L});
- public static final BitSet FOLLOW_33_in_ruleEGenericTypeReferenceDecl4245 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4279 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_28_in_ruleEGenericTypeReferenceDecl4293 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4327 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_34_in_ruleEGenericTypeReferenceDecl4342 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_47_in_ruleEGenericTypeReferenceDecl4361 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4383 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_entryRuleEGenericTypeDecl4420 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEGenericTypeDecl4430 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4478 = new BitSet(new long[]{0x0000000200000002L});
- public static final BitSet FOLLOW_33_in_ruleEGenericTypeDecl4491 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4525 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_28_in_ruleEGenericTypeDecl4539 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4573 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_34_in_ruleEGenericTypeDecl4588 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_47_in_ruleEGenericTypeDecl4607 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4629 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_49_in_ruleEGenericTypeDecl4649 = new BitSet(new long[]{0x0004000800000000L});
- public static final BitSet FOLLOW_35_in_ruleEGenericTypeDecl4660 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4694 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_50_in_ruleEGenericTypeDecl4715 = new BitSet(new long[]{0x0002800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4749 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEOperationDecl_in_entryRuleEOperationDecl4789 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEOperationDecl4799 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEOperationDecl4858 = new BitSet(new long[]{0x0008000004000180L});
- public static final BitSet FOLLOW_RULE_BAG_in_ruleEOperationDecl4885 = new BitSet(new long[]{0x0008000000000180L});
- public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEOperationDecl4925 = new BitSet(new long[]{0x0008000000000180L});
- public static final BitSet FOLLOW_51_in_ruleEOperationDecl4949 = new BitSet(new long[]{0x0010800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl4984 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_52_in_ruleEOperationDecl5003 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEOperationDecl5026 = new BitSet(new long[]{0x0000000208000000L});
- public static final BitSet FOLLOW_33_in_ruleEOperationDecl5044 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5078 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_28_in_ruleEOperationDecl5092 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5126 = new BitSet(new long[]{0x0000000410000000L});
- public static final BitSet FOLLOW_34_in_ruleEOperationDecl5141 = new BitSet(new long[]{0x0000000008000000L});
- public static final BitSet FOLLOW_27_in_ruleEOperationDecl5152 = new BitSet(new long[]{0x0000800024000010L});
- public static final BitSet FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5187 = new BitSet(new long[]{0x0000000030000000L});
- public static final BitSet FOLLOW_28_in_ruleEOperationDecl5201 = new BitSet(new long[]{0x0000800004000010L});
- public static final BitSet FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5235 = new BitSet(new long[]{0x0000000030000000L});
- public static final BitSet FOLLOW_29_in_ruleEOperationDecl5252 = new BitSet(new long[]{0x0020000000040000L});
- public static final BitSet FOLLOW_53_in_ruleEOperationDecl5262 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5296 = new BitSet(new long[]{0x0000000010040000L});
- public static final BitSet FOLLOW_28_in_ruleEOperationDecl5310 = new BitSet(new long[]{0x0000800000000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5344 = new BitSet(new long[]{0x0000000010040000L});
- public static final BitSet FOLLOW_18_in_ruleEOperationDecl5361 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEParameterDecl_in_entryRuleEParameterDecl5394 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEParameterDecl5404 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEParameterDecl5463 = new BitSet(new long[]{0x0000800004000010L});
- public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEParameterDecl5502 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEParameterDecl5528 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleMapEntry_in_entryRuleMapEntry5569 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleMapEntry5579 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleMapEntry5626 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_17_in_ruleMapEntry5643 = new BitSet(new long[]{0x0000000000000020L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleMapEntry5665 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQID_in_entryRuleQID5707 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleQID5718 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleQID5758 = new BitSet(new long[]{0x00C0000000000002L});
- public static final BitSet FOLLOW_54_in_ruleQID5778 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_55_in_ruleQID5797 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleQID5813 = new BitSet(new long[]{0x00C0000000000002L});
- public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_entryRuleSTRING_OR_QID5859 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleSTRING_OR_QID5870 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleSTRING_OR_QID5910 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQID_in_ruleSTRING_OR_QID5943 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleSINT_in_entryRuleSINT5987 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleSINT5998 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_56_in_ruleSINT6037 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_RULE_INT_in_ruleSINT6054 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleReferencedMetamodel_in_entryRuleReferencedMetamodel216 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleReferencedMetamodel226 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_16_in_ruleReferencedMetamodel260 = new BitSet(new long[]{0x0000000000000030L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleReferencedMetamodel283 = new BitSet(new long[]{0x0000000000020000L});
+ public static final BitSet FOLLOW_17_in_ruleReferencedMetamodel300 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleReferencedMetamodel324 = new BitSet(new long[]{0x0000000000040000L});
+ public static final BitSet FOLLOW_18_in_ruleReferencedMetamodel336 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEPackageDecl_in_entryRuleEPackageDecl369 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEPackageDecl379 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEPackageDecl438 = new BitSet(new long[]{0x0000000004080000L});
+ public static final BitSet FOLLOW_19_in_ruleEPackageDecl452 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleQID_in_ruleEPackageDecl486 = new BitSet(new long[]{0x0000000000100000L});
+ public static final BitSet FOLLOW_20_in_ruleEPackageDecl499 = new BitSet(new long[]{0x0000000000020000L});
+ public static final BitSet FOLLOW_17_in_ruleEPackageDecl508 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleEPackageDecl530 = new BitSet(new long[]{0x0000000000200000L});
+ public static final BitSet FOLLOW_21_in_ruleEPackageDecl547 = new BitSet(new long[]{0x0000000000020000L});
+ public static final BitSet FOLLOW_17_in_ruleEPackageDecl556 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleQID_in_ruleEPackageDecl590 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_22_in_ruleEPackageDecl603 = new BitSet(new long[]{0x00010001C5880040L});
+ public static final BitSet FOLLOW_ruleSubEPackageDecl_in_ruleEPackageDecl638 = new BitSet(new long[]{0x00010001C5880040L});
+ public static final BitSet FOLLOW_ruleEClassifierDecl_in_ruleEPackageDecl682 = new BitSet(new long[]{0x00010001C5880040L});
+ public static final BitSet FOLLOW_23_in_ruleEPackageDecl697 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleSubEPackageDecl_in_entryRuleSubEPackageDecl730 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleSubEPackageDecl740 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleSubEPackageDecl799 = new BitSet(new long[]{0x0000000004080000L});
+ public static final BitSet FOLLOW_19_in_ruleSubEPackageDecl813 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleSubEPackageDecl835 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_22_in_ruleSubEPackageDecl852 = new BitSet(new long[]{0x00010001C5880040L});
+ public static final BitSet FOLLOW_ruleSubEPackageDecl_in_ruleSubEPackageDecl887 = new BitSet(new long[]{0x00010001C5880040L});
+ public static final BitSet FOLLOW_ruleEClassifierDecl_in_ruleSubEPackageDecl931 = new BitSet(new long[]{0x00010001C5880040L});
+ public static final BitSet FOLLOW_23_in_ruleSubEPackageDecl946 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEClassifierDecl_in_entryRuleEClassifierDecl979 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEClassifierDecl989 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEClassDecl_in_ruleEClassifierDecl1036 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEDataTypeDecl_in_ruleEClassifierDecl1063 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEDataTypeDecl_in_entryRuleEDataTypeDecl1095 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEDataTypeDecl1105 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEDataTypeDecl1165 = new BitSet(new long[]{0x0000000005000040L});
+ public static final BitSet FOLLOW_RULE_SERIALIZABLE_in_ruleEDataTypeDecl1192 = new BitSet(new long[]{0x0000000001000000L});
+ public static final BitSet FOLLOW_24_in_ruleEDataTypeDecl1211 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEDataTypeDecl1233 = new BitSet(new long[]{0x0000000002000000L});
+ public static final BitSet FOLLOW_25_in_ruleEDataTypeDecl1250 = new BitSet(new long[]{0x0000000000000030L});
+ public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEDataTypeDecl1284 = new BitSet(new long[]{0x0000000000040000L});
+ public static final BitSet FOLLOW_18_in_ruleEDataTypeDecl1297 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEEnumDecl_in_ruleEDataTypeDecl1327 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_entryRuleEAnnotationDecl1359 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEAnnotationDecl1369 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_26_in_ruleEAnnotationDecl1403 = new BitSet(new long[]{0x0000000000000030L});
+ public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEAnnotationDecl1437 = new BitSet(new long[]{0x0000000008000002L});
+ public static final BitSet FOLLOW_27_in_ruleEAnnotationDecl1451 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1485 = new BitSet(new long[]{0x0000000030000000L});
+ public static final BitSet FOLLOW_28_in_ruleEAnnotationDecl1499 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleMapEntry_in_ruleEAnnotationDecl1533 = new BitSet(new long[]{0x0000000030000000L});
+ public static final BitSet FOLLOW_29_in_ruleEAnnotationDecl1548 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEClassDecl_in_entryRuleEClassDecl1583 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEClassDecl1593 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEClassDecl1652 = new BitSet(new long[]{0x00000001C4000000L});
+ public static final BitSet FOLLOW_30_in_ruleEClassDecl1678 = new BitSet(new long[]{0x0000000180000000L});
+ public static final BitSet FOLLOW_31_in_ruleEClassDecl1714 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_32_in_ruleEClassDecl1742 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEClassDecl1765 = new BitSet(new long[]{0x0000000A02400000L});
+ public static final BitSet FOLLOW_33_in_ruleEClassDecl1783 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1817 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_28_in_ruleEClassDecl1831 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1865 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_34_in_ruleEClassDecl1880 = new BitSet(new long[]{0x0000000802400000L});
+ public static final BitSet FOLLOW_35_in_ruleEClassDecl1892 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1926 = new BitSet(new long[]{0x0000000012400000L});
+ public static final BitSet FOLLOW_28_in_ruleEClassDecl1940 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl1974 = new BitSet(new long[]{0x0000000012400000L});
+ public static final BitSet FOLLOW_25_in_ruleEClassDecl1992 = new BitSet(new long[]{0x0000000000000030L});
+ public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_ruleEClassDecl2026 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_22_in_ruleEClassDecl2041 = new BitSet(new long[]{0x000863F004800B80L});
+ public static final BitSet FOLLOW_ruleEStructuralFeatureDecl_in_ruleEClassDecl2076 = new BitSet(new long[]{0x000863F004800B80L});
+ public static final BitSet FOLLOW_ruleEOperationDecl_in_ruleEClassDecl2120 = new BitSet(new long[]{0x000863F004800B80L});
+ public static final BitSet FOLLOW_23_in_ruleEClassDecl2135 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEStructuralFeatureDecl_in_entryRuleEStructuralFeatureDecl2168 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEStructuralFeatureDecl2178 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAttributeDecl_in_ruleEStructuralFeatureDecl2225 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEReferenceDecl_in_ruleEStructuralFeatureDecl2252 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAttributeDecl_in_entryRuleEAttributeDecl2284 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEAttributeDecl2294 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEAttributeDecl2353 = new BitSet(new long[]{0x000003F004000380L});
+ public static final BitSet FOLLOW_36_in_ruleEAttributeDecl2380 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_RULE_BAG_in_ruleEAttributeDecl2421 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEAttributeDecl2457 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_RULE_READONLY_in_ruleEAttributeDecl2493 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_37_in_ruleEAttributeDecl2528 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_38_in_ruleEAttributeDecl2568 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_39_in_ruleEAttributeDecl2608 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_40_in_ruleEAttributeDecl2648 = new BitSet(new long[]{0x000003F000000380L});
+ public static final BitSet FOLLOW_41_in_ruleEAttributeDecl2672 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEAttributeDecl2706 = new BitSet(new long[]{0x0000040000000010L});
+ public static final BitSet FOLLOW_42_in_ruleEAttributeDecl2720 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleEAttributeDecl2742 = new BitSet(new long[]{0x0000180000000000L});
+ public static final BitSet FOLLOW_43_in_ruleEAttributeDecl2760 = new BitSet(new long[]{0x0100000000000400L});
+ public static final BitSet FOLLOW_ruleSINT_in_ruleEAttributeDecl2794 = new BitSet(new long[]{0x0000100000000000L});
+ public static final BitSet FOLLOW_44_in_ruleEAttributeDecl2809 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEAttributeDecl2833 = new BitSet(new long[]{0x0000000000060000L});
+ public static final BitSet FOLLOW_17_in_ruleEAttributeDecl2851 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleEAttributeDecl2873 = new BitSet(new long[]{0x0000000000040000L});
+ public static final BitSet FOLLOW_18_in_ruleEAttributeDecl2892 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEReferenceDecl_in_entryRuleEReferenceDecl2925 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEReferenceDecl2935 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEReferenceDecl2994 = new BitSet(new long[]{0x000061E004000B80L});
+ public static final BitSet FOLLOW_RULE_LOCAL_in_ruleEReferenceDecl3022 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_RULE_BAG_in_ruleEReferenceDecl3058 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEReferenceDecl3094 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_RULE_READONLY_in_ruleEReferenceDecl3130 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_37_in_ruleEReferenceDecl3165 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_38_in_ruleEReferenceDecl3205 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_39_in_ruleEReferenceDecl3245 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_40_in_ruleEReferenceDecl3285 = new BitSet(new long[]{0x000061E000000B80L});
+ public static final BitSet FOLLOW_45_in_ruleEReferenceDecl3322 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_46_in_ruleEReferenceDecl3350 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEReferenceDecl3385 = new BitSet(new long[]{0x0000840000000010L});
+ public static final BitSet FOLLOW_42_in_ruleEReferenceDecl3399 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleEReferenceDecl3421 = new BitSet(new long[]{0x0000180000000000L});
+ public static final BitSet FOLLOW_43_in_ruleEReferenceDecl3439 = new BitSet(new long[]{0x0100000000000400L});
+ public static final BitSet FOLLOW_ruleSINT_in_ruleEReferenceDecl3473 = new BitSet(new long[]{0x0000100000000000L});
+ public static final BitSet FOLLOW_44_in_ruleEReferenceDecl3488 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_47_in_ruleEReferenceDecl3500 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEReferenceDecl3522 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEReferenceDecl3549 = new BitSet(new long[]{0x0000000000040000L});
+ public static final BitSet FOLLOW_18_in_ruleEReferenceDecl3566 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEEnumDecl_in_entryRuleEEnumDecl3599 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEEnumDecl3609 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEEnumDecl3668 = new BitSet(new long[]{0x0001000004000000L});
+ public static final BitSet FOLLOW_48_in_ruleEEnumDecl3682 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEEnumDecl3704 = new BitSet(new long[]{0x0000000000400000L});
+ public static final BitSet FOLLOW_22_in_ruleEEnumDecl3721 = new BitSet(new long[]{0x0000000004000010L});
+ public static final BitSet FOLLOW_ruleEEnumLiteralDecl_in_ruleEEnumDecl3755 = new BitSet(new long[]{0x0000000004800010L});
+ public static final BitSet FOLLOW_23_in_ruleEEnumDecl3769 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEEnumLiteralDecl_in_entryRuleEEnumLiteralDecl3802 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEEnumLiteralDecl3812 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEEnumLiteralDecl3871 = new BitSet(new long[]{0x0000000004000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEEnumLiteralDecl3898 = new BitSet(new long[]{0x0000000000060020L});
+ public static final BitSet FOLLOW_17_in_ruleEEnumLiteralDecl3916 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleEEnumLiteralDecl3938 = new BitSet(new long[]{0x0000000000040020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleEEnumLiteralDecl3970 = new BitSet(new long[]{0x0000000000040000L});
+ public static final BitSet FOLLOW_18_in_ruleEEnumLiteralDecl3988 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleETypeParameterDecl_in_entryRuleETypeParameterDecl4021 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleETypeParameterDecl4031 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleETypeParameterDecl4078 = new BitSet(new long[]{0x0000000800000002L});
+ public static final BitSet FOLLOW_35_in_ruleETypeParameterDecl4096 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleETypeParameterDecl4130 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_entryRuleEGenericTypeReferenceDecl4169 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEGenericTypeReferenceDecl4179 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4227 = new BitSet(new long[]{0x0000000200000002L});
+ public static final BitSet FOLLOW_33_in_ruleEGenericTypeReferenceDecl4240 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4274 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_28_in_ruleEGenericTypeReferenceDecl4288 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeReferenceDecl4322 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_34_in_ruleEGenericTypeReferenceDecl4337 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_47_in_ruleEGenericTypeReferenceDecl4356 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeReferenceDecl4378 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_entryRuleEGenericTypeDecl4415 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEGenericTypeDecl4425 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4473 = new BitSet(new long[]{0x0000000200000002L});
+ public static final BitSet FOLLOW_33_in_ruleEGenericTypeDecl4486 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4520 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_28_in_ruleEGenericTypeDecl4534 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4568 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_34_in_ruleEGenericTypeDecl4583 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_47_in_ruleEGenericTypeDecl4602 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEGenericTypeDecl4624 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_49_in_ruleEGenericTypeDecl4644 = new BitSet(new long[]{0x0004000800000000L});
+ public static final BitSet FOLLOW_35_in_ruleEGenericTypeDecl4655 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4689 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_50_in_ruleEGenericTypeDecl4710 = new BitSet(new long[]{0x0002800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeDecl_in_ruleEGenericTypeDecl4744 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEOperationDecl_in_entryRuleEOperationDecl4784 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEOperationDecl4794 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEOperationDecl4853 = new BitSet(new long[]{0x0008000004000180L});
+ public static final BitSet FOLLOW_RULE_BAG_in_ruleEOperationDecl4880 = new BitSet(new long[]{0x0008000000000180L});
+ public static final BitSet FOLLOW_RULE_RANDOM_in_ruleEOperationDecl4920 = new BitSet(new long[]{0x0008000000000180L});
+ public static final BitSet FOLLOW_51_in_ruleEOperationDecl4944 = new BitSet(new long[]{0x0010800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl4979 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_52_in_ruleEOperationDecl4998 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEOperationDecl5021 = new BitSet(new long[]{0x0000000208000000L});
+ public static final BitSet FOLLOW_33_in_ruleEOperationDecl5039 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5073 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_28_in_ruleEOperationDecl5087 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ruleETypeParameterDecl_in_ruleEOperationDecl5121 = new BitSet(new long[]{0x0000000410000000L});
+ public static final BitSet FOLLOW_34_in_ruleEOperationDecl5136 = new BitSet(new long[]{0x0000000008000000L});
+ public static final BitSet FOLLOW_27_in_ruleEOperationDecl5147 = new BitSet(new long[]{0x0000800024000010L});
+ public static final BitSet FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5182 = new BitSet(new long[]{0x0000000030000000L});
+ public static final BitSet FOLLOW_28_in_ruleEOperationDecl5196 = new BitSet(new long[]{0x0000800004000010L});
+ public static final BitSet FOLLOW_ruleEParameterDecl_in_ruleEOperationDecl5230 = new BitSet(new long[]{0x0000000030000000L});
+ public static final BitSet FOLLOW_29_in_ruleEOperationDecl5247 = new BitSet(new long[]{0x0020000000040000L});
+ public static final BitSet FOLLOW_53_in_ruleEOperationDecl5257 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5291 = new BitSet(new long[]{0x0000000010040000L});
+ public static final BitSet FOLLOW_28_in_ruleEOperationDecl5305 = new BitSet(new long[]{0x0000800000000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEOperationDecl5339 = new BitSet(new long[]{0x0000000010040000L});
+ public static final BitSet FOLLOW_18_in_ruleEOperationDecl5356 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEParameterDecl_in_entryRuleEParameterDecl5389 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEParameterDecl5399 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEAnnotationDecl_in_ruleEParameterDecl5458 = new BitSet(new long[]{0x0000800004000010L});
+ public static final BitSet FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEParameterDecl5497 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleEParameterDecl5523 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleMapEntry_in_entryRuleMapEntry5564 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleMapEntry5574 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleMapEntry5621 = new BitSet(new long[]{0x0000000000020000L});
+ public static final BitSet FOLLOW_17_in_ruleMapEntry5638 = new BitSet(new long[]{0x0000000000000020L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleMapEntry5660 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQID_in_entryRuleQID5702 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleQID5713 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleQID5753 = new BitSet(new long[]{0x00C0000000000002L});
+ public static final BitSet FOLLOW_54_in_ruleQID5773 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_55_in_ruleQID5792 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleQID5808 = new BitSet(new long[]{0x00C0000000000002L});
+ public static final BitSet FOLLOW_ruleSTRING_OR_QID_in_entryRuleSTRING_OR_QID5854 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleSTRING_OR_QID5865 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleSTRING_OR_QID5905 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQID_in_ruleSTRING_OR_QID5938 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleSINT_in_entryRuleSINT5982 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleSINT5993 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_56_in_ruleSINT6032 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_RULE_INT_in_ruleSINT6049 = new BitSet(new long[]{0x0000000000000002L});
} \ No newline at end of file
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g
index 4cb13bd..aac5468 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl__.g
@@ -49,40 +49,40 @@ T54 : '.' ;
T55 : '$' ;
T56 : '-' ;
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2911
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2907
RULE_BAG : 'bag';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2913
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2909
RULE_RANDOM : 'random';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2915
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2911
RULE_READONLY : 'readonly';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2917
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2913
RULE_LOCAL : 'local';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2919
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2915
RULE_SERIALIZABLE : '!serializable';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2921
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2917
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2923
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2919
RULE_INT : ('0'..'9')+;
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2925
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2921
RULE_STRING : ('"' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'|'\'' ('\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'\\')|~(('\\'|'\'')))* '\'');
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2927
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2923
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2929
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2925
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2931
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2927
RULE_WS : (' '|'\t'|'\r'|'\n')+;
-// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2933
+// $ANTLR src "../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g" 2929
RULE_ANY_OTHER : .;
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslDelimiters.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslDelimiters.java
index 017ac2e..6261709 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslDelimiters.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslDelimiters.java
@@ -26,12 +26,12 @@ public final class EcoreDslDelimiters {
public static final ISequenceMatcher ruleCall$15$Delimiter = new SetBasedKeywordMatcher(
"import", "package", "nsURI", "nsPrefix", "datatype", "abstract", "interface", "class", "extends", "ID", "volatile", "transient", "unsettable", "derived", "attr", "val", "ref", "enum", "super", "bag", "random", "op", "void", "throws");
- public static final ISequenceMatcher ruleCall$18$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ public static final ISequenceMatcher ruleCall$20$Delimiter = ISequenceMatcher.Factory.nullMatcher();
- public static final ISequenceMatcher ruleCall$150$Delimiter = new SetBasedKeywordMatcher(
+ public static final ISequenceMatcher ruleCall$152$Delimiter = new SetBasedKeywordMatcher(
"bag");
- public static final ISequenceMatcher ruleCall$152$Delimiter = new SetBasedKeywordMatcher(
+ public static final ISequenceMatcher ruleCall$154$Delimiter = new SetBasedKeywordMatcher(
"random");
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java
index adc5a1f..1cffebe 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/EcoreDslParserConfiguration.java
@@ -10,7 +10,7 @@ import org.eclipse.xtext.example.services.EcoreDslGrammarAccess;
import org.eclipse.xtext.common.parser.packrat.TerminalsParserConfiguration;
import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEcoreDslConsumer;
-import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslImportStatementDeclConsumer;
+import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslReferencedMetamodelConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEPackageDeclConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslSubEPackageDeclConsumer;
import org.eclipse.xtext.example.parser.packrat.consumers.EcoreDslEClassifierDeclConsumer;
@@ -48,7 +48,7 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
private final TerminalsParserConfiguration terminalsConfiguration;
private EcoreDslEcoreDslConsumer ecoreDslConsumer;
- private EcoreDslImportStatementDeclConsumer importStatementDeclConsumer;
+ private EcoreDslReferencedMetamodelConsumer referencedMetamodelConsumer;
private EcoreDslEPackageDeclConsumer ePackageDeclConsumer;
private EcoreDslSubEPackageDeclConsumer subEPackageDeclConsumer;
private EcoreDslEClassifierDeclConsumer eClassifierDeclConsumer;
@@ -92,7 +92,7 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
ecoreDslConsumer = new EcoreDslEcoreDslConsumer(
this, null
);
- importStatementDeclConsumer = new EcoreDslImportStatementDeclConsumer(
+ referencedMetamodelConsumer = new EcoreDslReferencedMetamodelConsumer(
this, null
);
ePackageDeclConsumer = new EcoreDslEPackageDeclConsumer(
@@ -170,7 +170,7 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
if (grammarAccess == null)
throw new NullPointerException("grammarAccess may not be null, you call configureConsumers");
getEcoreDslConsumer().setRule(grammarAccess.getEcoreDslAccess());
- getImportStatementDeclConsumer().setRule(grammarAccess.getImportStatementDeclAccess());
+ getReferencedMetamodelConsumer().setRule(grammarAccess.getReferencedMetamodelAccess());
getEPackageDeclConsumer().setRule(grammarAccess.getEPackageDeclAccess());
getSubEPackageDeclConsumer().setRule(grammarAccess.getSubEPackageDeclAccess());
getEClassifierDeclConsumer().setRule(grammarAccess.getEClassifierDeclAccess());
@@ -206,10 +206,10 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
getEcoreDslConsumer().setEPackageDeclConsumer(getEPackageDeclConsumer());
- getEcoreDslConsumer().setImportStatementDeclConsumer(getImportStatementDeclConsumer());
+ getEcoreDslConsumer().setReferencedMetamodelConsumer(getReferencedMetamodelConsumer());
- getImportStatementDeclConsumer().setIdConsumer(getIdConsumer());
- getImportStatementDeclConsumer().setStringConsumer(getStringConsumer());
+ getReferencedMetamodelConsumer().setIdConsumer(getIdConsumer());
+ getReferencedMetamodelConsumer().setStringConsumer(getStringConsumer());
getEPackageDeclConsumer().setEAnnotationDeclConsumer(getEAnnotationDeclConsumer());
getEPackageDeclConsumer().setEClassifierDeclConsumer(getEClassifierDeclConsumer());
@@ -303,11 +303,11 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
getSintConsumer().setIntConsumer(getIntConsumer());
- getImportStatementDeclConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
- getImportStatementDeclConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
- getImportStatementDeclConsumer().setKeyword$9$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
- getImportStatementDeclConsumer().setRuleCall$5$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
- getImportStatementDeclConsumer().setRuleCall$8$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
+ getReferencedMetamodelConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
+ getReferencedMetamodelConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
+ getReferencedMetamodelConsumer().setKeyword$11$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
+ getReferencedMetamodelConsumer().setRuleCall$5$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
+ getReferencedMetamodelConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
getEPackageDeclConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
getEPackageDeclConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
getEPackageDeclConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
@@ -315,7 +315,7 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
getEPackageDeclConsumer().setKeyword$12$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getEPackageDeclConsumer().setKeyword$15$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getEPackageDeclConsumer().setKeyword$21$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
- getEPackageDeclConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
+ getEPackageDeclConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
getSubEPackageDeclConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
getSubEPackageDeclConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getSubEPackageDeclConsumer().setKeyword$13$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
@@ -323,7 +323,7 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
getEDataTypeDeclConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
getEDataTypeDeclConsumer().setKeyword$11$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getEDataTypeDeclConsumer().setKeyword$14$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
- getEDataTypeDeclConsumer().setRuleCall$6$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
+ getEDataTypeDeclConsumer().setRuleCall$6$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
getEDataTypeDeclConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
getEAnnotationDeclConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getEAnnotationDeclConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
@@ -352,12 +352,12 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
getEAttributeDeclConsumer().setKeyword$32$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getEAttributeDeclConsumer().setKeyword$36$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getEAttributeDeclConsumer().setKeyword$39$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
- getEAttributeDeclConsumer().setRuleCall$8$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$150$Delimiter);
- getEAttributeDeclConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$152$Delimiter);
- getEAttributeDeclConsumer().setRuleCall$12$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
- getEAttributeDeclConsumer().setRuleCall$27$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
+ getEAttributeDeclConsumer().setRuleCall$8$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$152$Delimiter);
+ getEAttributeDeclConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$154$Delimiter);
+ getEAttributeDeclConsumer().setRuleCall$12$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
+ getEAttributeDeclConsumer().setRuleCall$27$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
getEAttributeDeclConsumer().setRuleCall$34$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
- getEAttributeDeclConsumer().setRuleCall$38$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
+ getEAttributeDeclConsumer().setRuleCall$38$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
getEReferenceDeclConsumer().setKeyword$14$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
getEReferenceDeclConsumer().setKeyword$16$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
getEReferenceDeclConsumer().setKeyword$18$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
@@ -369,11 +369,11 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
getEReferenceDeclConsumer().setKeyword$35$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getEReferenceDeclConsumer().setKeyword$37$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getEReferenceDeclConsumer().setKeyword$44$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
- getEReferenceDeclConsumer().setRuleCall$6$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
- getEReferenceDeclConsumer().setRuleCall$8$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$150$Delimiter);
- getEReferenceDeclConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$152$Delimiter);
- getEReferenceDeclConsumer().setRuleCall$12$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
- getEReferenceDeclConsumer().setRuleCall$30$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
+ getEReferenceDeclConsumer().setRuleCall$6$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
+ getEReferenceDeclConsumer().setRuleCall$8$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$152$Delimiter);
+ getEReferenceDeclConsumer().setRuleCall$10$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$154$Delimiter);
+ getEReferenceDeclConsumer().setRuleCall$12$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
+ getEReferenceDeclConsumer().setRuleCall$30$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
getEReferenceDeclConsumer().setRuleCall$41$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
getEReferenceDeclConsumer().setRuleCall$43$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
getEEnumDeclConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
@@ -383,8 +383,8 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
getEEnumLiteralDeclConsumer().setKeyword$7$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getEEnumLiteralDeclConsumer().setKeyword$12$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getEEnumLiteralDeclConsumer().setRuleCall$5$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
- getEEnumLiteralDeclConsumer().setRuleCall$9$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
- getEEnumLiteralDeclConsumer().setRuleCall$11$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
+ getEEnumLiteralDeclConsumer().setRuleCall$9$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
+ getEEnumLiteralDeclConsumer().setRuleCall$11$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
getETypeParameterDeclConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$12$Delimiter);
getETypeParameterDeclConsumer().setRuleCall$3$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
getEGenericTypeReferenceDeclConsumer().setKeyword$8$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
@@ -419,14 +419,14 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
getEParameterDeclConsumer().setRuleCall$7$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
getMapEntryConsumer().setKeyword$4$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getMapEntryConsumer().setRuleCall$3$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
- getMapEntryConsumer().setRuleCall$6$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
+ getMapEntryConsumer().setRuleCall$6$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
getQidConsumer().setKeyword$5$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getQidConsumer().setKeyword$6$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
getQidConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
getQidConsumer().setRuleCall$7$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$15$Delimiter);
- getStringOrQidConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
+ getStringOrQidConsumer().setRuleCall$2$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
getSintConsumer().setKeyword$2$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.keyword$16$Delimiter);
- getSintConsumer().setRuleCall$3$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$18$Delimiter);
+ getSintConsumer().setRuleCall$3$Delimiter(org.eclipse.xtext.example.parser.packrat.EcoreDslDelimiters.ruleCall$20$Delimiter);
}
public TerminalsParserConfiguration getTerminalsConfiguration() {
@@ -437,8 +437,8 @@ public class EcoreDslParserConfiguration extends AbstractParserConfiguration {
return ecoreDslConsumer;
}
- public EcoreDslImportStatementDeclConsumer getImportStatementDeclConsumer() {
- return importStatementDeclConsumer;
+ public EcoreDslReferencedMetamodelConsumer getReferencedMetamodelConsumer() {
+ return referencedMetamodelConsumer;
}
public EcoreDslEPackageDeclConsumer getEPackageDeclConsumer() {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java
index 3691bc2..0541384 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslEcoreDslConsumer.java
@@ -24,7 +24,7 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer {
private INonTerminalConsumer ePackageDeclConsumer;
- private INonTerminalConsumer importStatementDeclConsumer;
+ private INonTerminalConsumer referencedMetamodelConsumer;
private IElementConsumer group$1$Consumer;
@@ -69,7 +69,7 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer {
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeNonTerminal(importStatementDeclConsumer, "imports", true, false, false, getElement(), optional);
+ return consumeNonTerminal(referencedMetamodelConsumer, "metamodelDeclarations", true, false, false, getElement(), optional);
}
}
@@ -114,8 +114,8 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer {
this.rule = rule;
group$1$Consumer = new Group$1$Consumer(rule.getGroup());
- assignment$2$Consumer = new Assignment$2$Consumer(rule.getImportsAssignment_0());
- ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.getImportsImportStatementDeclParserRuleCall_0_0());
+ assignment$2$Consumer = new Assignment$2$Consumer(rule.getMetamodelDeclarationsAssignment_0());
+ ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.getMetamodelDeclarationsReferencedMetamodelParserRuleCall_0_0());
assignment$4$Consumer = new Assignment$4$Consumer(rule.getPackageAssignment_1());
ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.getPackageEPackageDeclParserRuleCall_1_0());
}
@@ -134,8 +134,8 @@ public final class EcoreDslEcoreDslConsumer extends NonTerminalConsumer {
this.ePackageDeclConsumer = ePackageDeclConsumer;
}
- public void setImportStatementDeclConsumer(INonTerminalConsumer importStatementDeclConsumer) {
- this.importStatementDeclConsumer = importStatementDeclConsumer;
+ public void setReferencedMetamodelConsumer(INonTerminalConsumer referencedMetamodelConsumer) {
+ this.referencedMetamodelConsumer = referencedMetamodelConsumer;
}
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslReferencedMetamodelConsumer.java
index 3c95594..0654682 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslImportStatementDeclConsumer.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/EcoreDslReferencedMetamodelConsumer.java
@@ -7,6 +7,7 @@ import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.Assignment;
+import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.Group;
import org.eclipse.xtext.Keyword;
import org.eclipse.xtext.RuleCall;
@@ -18,11 +19,11 @@ import org.eclipse.xtext.parser.packrat.consumers.NonTerminalConsumer;
import org.eclipse.xtext.parser.packrat.matching.ICharacterClass;
import org.eclipse.xtext.parser.packrat.matching.ISequenceMatcher;
-import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.ImportStatementDeclElements;
+import org.eclipse.xtext.example.services.EcoreDslGrammarAccess.ReferencedMetamodelElements;
-public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsumer {
+public final class EcoreDslReferencedMetamodelConsumer extends NonTerminalConsumer {
- private ImportStatementDeclElements rule;
+ private ReferencedMetamodelElements rule;
private ITerminalConsumer idConsumer;
@@ -42,19 +43,19 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
private IElementConsumer assignment$7$Consumer;
- private IElementConsumer ruleCall$8$Consumer;
+ private IElementConsumer crossReference$8$Consumer;
- private IElementConsumer keyword$9$Consumer;
+ private IElementConsumer keyword$11$Consumer;
private ICharacterClass keyword$2$Delimiter;
private ICharacterClass keyword$6$Delimiter;
- private ICharacterClass keyword$9$Delimiter;
+ private ICharacterClass keyword$11$Delimiter;
private ISequenceMatcher ruleCall$5$Delimiter;
- private ISequenceMatcher ruleCall$8$Delimiter;
+ private ISequenceMatcher ruleCall$10$Delimiter;
protected class Group$1$Consumer extends GroupConsumer {
@@ -67,7 +68,7 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
acceptor.accept(keyword$2$Consumer);
acceptor.accept(group$3$Consumer);
acceptor.accept(assignment$7$Consumer);
- acceptor.accept(keyword$9$Consumer);
+ acceptor.accept(keyword$11$Consumer);
}
}
@@ -140,41 +141,41 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
@Override
protected IElementConsumer getConsumer() {
- return ruleCall$8$Consumer;
+ return crossReference$8$Consumer;
}
}
- protected class RuleCall$8$Consumer extends ElementConsumer<RuleCall> {
+ protected class CrossReference$8$Consumer extends ElementConsumer<CrossReference> {
- protected RuleCall$8$Consumer(final RuleCall ruleCall) {
- super(ruleCall);
+ protected CrossReference$8$Consumer(final CrossReference crossReference) {
+ super(crossReference);
}
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeTerminal(stringConsumer, "importURI", false, false, getElement(), getRuleCall$8$Delimiter(), optional);
+ return consumeTerminal(stringConsumer, "ePackage", false, false, getElement(), getRuleCall$10$Delimiter(), optional);
}
}
- protected class Keyword$9$Consumer extends ElementConsumer<Keyword> {
+ protected class Keyword$11$Consumer extends ElementConsumer<Keyword> {
- protected Keyword$9$Consumer(final Keyword keyword) {
+ protected Keyword$11$Consumer(final Keyword keyword) {
super(keyword);
}
@Override
protected int doConsume(boolean optional) throws Exception {
- return consumeKeyword(getElement(), null, false, false, getKeyword$9$Delimiter(), optional);
+ return consumeKeyword(getElement(), null, false, false, getKeyword$11$Delimiter(), optional);
}
}
- public EcoreDslImportStatementDeclConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) {
+ public EcoreDslReferencedMetamodelConsumer(INonTerminalConsumerConfiguration configuration, ITerminalConsumer[] hiddenTokens) {
super(configuration, hiddenTokens);
keyword$2$Delimiter = ICharacterClass.Factory.nullClass();
keyword$6$Delimiter = ICharacterClass.Factory.nullClass();
- keyword$9$Delimiter = ICharacterClass.Factory.nullClass();
+ keyword$11$Delimiter = ICharacterClass.Factory.nullClass();
ruleCall$5$Delimiter = ISequenceMatcher.Factory.nullMatcher();
- ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher();
+ ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher();
}
@Override
@@ -182,11 +183,11 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
return group$1$Consumer.consume();
}
- public ImportStatementDeclElements getRule() {
+ public ReferencedMetamodelElements getRule() {
return rule;
}
- public void setRule(ImportStatementDeclElements rule) {
+ public void setRule(ReferencedMetamodelElements rule) {
this.rule = rule;
group$1$Consumer = new Group$1$Consumer(rule.getGroup());
@@ -195,9 +196,9 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
assignment$4$Consumer = new Assignment$4$Consumer(rule.getAliasAssignment_1_0());
ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.getAliasIDTerminalRuleCall_1_0_0());
keyword$6$Consumer = new Keyword$6$Consumer(rule.getEqualsSignKeyword_1_1());
- assignment$7$Consumer = new Assignment$7$Consumer(rule.getImportURIAssignment_2());
- ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.getImportURISTRINGTerminalRuleCall_2_0());
- keyword$9$Consumer = new Keyword$9$Consumer(rule.getSemicolonKeyword_3());
+ assignment$7$Consumer = new Assignment$7$Consumer(rule.getEPackageAssignment_2());
+ crossReference$8$Consumer = new CrossReference$8$Consumer(rule.getEPackageEPackageCrossReference_2_0());
+ keyword$11$Consumer = new Keyword$11$Consumer(rule.getSemicolonKeyword_3());
}
@Override
@@ -234,12 +235,12 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
}
- public ICharacterClass getKeyword$9$Delimiter() {
- return keyword$9$Delimiter;
+ public ICharacterClass getKeyword$11$Delimiter() {
+ return keyword$11$Delimiter;
}
- public void setKeyword$9$Delimiter(ICharacterClass characterClass) {
- keyword$9$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
+ public void setKeyword$11$Delimiter(ICharacterClass characterClass) {
+ keyword$11$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass();
}
public ISequenceMatcher getRuleCall$5$Delimiter() {
@@ -250,12 +251,12 @@ public final class EcoreDslImportStatementDeclConsumer extends NonTerminalConsum
ruleCall$5$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
}
- public ISequenceMatcher getRuleCall$8$Delimiter() {
- return ruleCall$8$Delimiter;
+ public ISequenceMatcher getRuleCall$10$Delimiter() {
+ return ruleCall$10$Delimiter;
}
- public void setRuleCall$8$Delimiter(ISequenceMatcher matcher) {
- ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
+ public void setRuleCall$10$Delimiter(ISequenceMatcher matcher) {
+ ruleCall$10$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher();
}
}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java
index 9fdce6a..13c3a93 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/services/EcoreDslGrammarAccess.java
@@ -20,23 +20,23 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
public class EcoreDslElements implements IParserRuleAccess {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "EcoreDsl");
private final Group cGroup = (Group)rule.eContents().get(1);
- private final Assignment cImportsAssignment_0 = (Assignment)cGroup.eContents().get(0);
- private final RuleCall cImportsImportStatementDeclParserRuleCall_0_0 = (RuleCall)cImportsAssignment_0.eContents().get(0);
+ private final Assignment cMetamodelDeclarationsAssignment_0 = (Assignment)cGroup.eContents().get(0);
+ private final RuleCall cMetamodelDeclarationsReferencedMetamodelParserRuleCall_0_0 = (RuleCall)cMetamodelDeclarationsAssignment_0.eContents().get(0);
private final Assignment cPackageAssignment_1 = (Assignment)cGroup.eContents().get(1);
private final RuleCall cPackageEPackageDeclParserRuleCall_1_0 = (RuleCall)cPackageAssignment_1.eContents().get(0);
//EcoreDsl:
- // (imports+=ImportStatementDecl)* package=EPackageDecl;
+ // (metamodelDeclarations+=ReferencedMetamodel)* package=EPackageDecl;
public ParserRule getRule() { return rule; }
- //(imports+=ImportStatementDecl)* package=EPackageDecl
+ //(metamodelDeclarations+=ReferencedMetamodel)* package=EPackageDecl
public Group getGroup() { return cGroup; }
- //(imports+=ImportStatementDecl)*
- public Assignment getImportsAssignment_0() { return cImportsAssignment_0; }
+ //(metamodelDeclarations+=ReferencedMetamodel)*
+ public Assignment getMetamodelDeclarationsAssignment_0() { return cMetamodelDeclarationsAssignment_0; }
- //ImportStatementDecl
- public RuleCall getImportsImportStatementDeclParserRuleCall_0_0() { return cImportsImportStatementDeclParserRuleCall_0_0; }
+ //ReferencedMetamodel
+ public RuleCall getMetamodelDeclarationsReferencedMetamodelParserRuleCall_0_0() { return cMetamodelDeclarationsReferencedMetamodelParserRuleCall_0_0; }
//package=EPackageDecl
public Assignment getPackageAssignment_1() { return cPackageAssignment_1; }
@@ -45,23 +45,24 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
public RuleCall getPackageEPackageDeclParserRuleCall_1_0() { return cPackageEPackageDeclParserRuleCall_1_0; }
}
- public class ImportStatementDeclElements implements IParserRuleAccess {
- private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ImportStatementDecl");
+ public class ReferencedMetamodelElements implements IParserRuleAccess {
+ private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ReferencedMetamodel");
private final Group cGroup = (Group)rule.eContents().get(1);
private final Keyword cImportKeyword_0 = (Keyword)cGroup.eContents().get(0);
private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
private final Assignment cAliasAssignment_1_0 = (Assignment)cGroup_1.eContents().get(0);
private final RuleCall cAliasIDTerminalRuleCall_1_0_0 = (RuleCall)cAliasAssignment_1_0.eContents().get(0);
private final Keyword cEqualsSignKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1);
- private final Assignment cImportURIAssignment_2 = (Assignment)cGroup.eContents().get(2);
- private final RuleCall cImportURISTRINGTerminalRuleCall_2_0 = (RuleCall)cImportURIAssignment_2.eContents().get(0);
+ private final Assignment cEPackageAssignment_2 = (Assignment)cGroup.eContents().get(2);
+ private final CrossReference cEPackageEPackageCrossReference_2_0 = (CrossReference)cEPackageAssignment_2.eContents().get(0);
+ private final RuleCall cEPackageEPackageSTRINGTerminalRuleCall_2_0_1 = (RuleCall)cEPackageEPackageCrossReference_2_0.eContents().get(1);
private final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);
- //ImportStatementDecl:
- // "import" (alias=ID "=")? importURI=STRING ";";
+ //ReferencedMetamodel:
+ // "import" (alias=ID "=")? ePackage=[ecore::EPackage|STRING] ";";
public ParserRule getRule() { return rule; }
- //"import" (alias=ID "=")? importURI=STRING ";"
+ //"import" (alias=ID "=")? ePackage=[ecore::EPackage|STRING] ";"
public Group getGroup() { return cGroup; }
//"import"
@@ -79,11 +80,14 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
//"="
public Keyword getEqualsSignKeyword_1_1() { return cEqualsSignKeyword_1_1; }
- //importURI=STRING
- public Assignment getImportURIAssignment_2() { return cImportURIAssignment_2; }
+ //ePackage=[ecore::EPackage|STRING]
+ public Assignment getEPackageAssignment_2() { return cEPackageAssignment_2; }
+
+ //[ecore::EPackage|STRING]
+ public CrossReference getEPackageEPackageCrossReference_2_0() { return cEPackageEPackageCrossReference_2_0; }
//STRING
- public RuleCall getImportURISTRINGTerminalRuleCall_2_0() { return cImportURISTRINGTerminalRuleCall_2_0; }
+ public RuleCall getEPackageEPackageSTRINGTerminalRuleCall_2_0_1() { return cEPackageEPackageSTRINGTerminalRuleCall_2_0_1; }
//";"
public Keyword getSemicolonKeyword_3() { return cSemicolonKeyword_3; }
@@ -1591,7 +1595,7 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
private EcoreDslElements pEcoreDsl;
- private ImportStatementDeclElements pImportStatementDecl;
+ private ReferencedMetamodelElements pReferencedMetamodel;
private EPackageDeclElements pEPackageDecl;
private SubEPackageDeclElements pSubEPackageDecl;
private EClassifierDeclElements pEClassifierDecl;
@@ -1640,7 +1644,7 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
//EcoreDsl:
- // (imports+=ImportStatementDecl)* package=EPackageDecl;
+ // (metamodelDeclarations+=ReferencedMetamodel)* package=EPackageDecl;
public EcoreDslElements getEcoreDslAccess() {
return (pEcoreDsl != null) ? pEcoreDsl : (pEcoreDsl = new EcoreDslElements());
}
@@ -1649,14 +1653,14 @@ public class EcoreDslGrammarAccess implements IGrammarAccess {
return getEcoreDslAccess().getRule();
}
- //ImportStatementDecl:
- // "import" (alias=ID "=")? importURI=STRING ";";
- public ImportStatementDeclElements getImportStatementDeclAccess() {
- return (pImportStatementDecl != null) ? pImportStatementDecl : (pImportStatementDecl = new ImportStatementDeclElements());
+ //ReferencedMetamodel:
+ // "import" (alias=ID "=")? ePackage=[ecore::EPackage|STRING] ";";
+ public ReferencedMetamodelElements getReferencedMetamodelAccess() {
+ return (pReferencedMetamodel != null) ? pReferencedMetamodel : (pReferencedMetamodel = new ReferencedMetamodelElements());
}
- public ParserRule getImportStatementDeclRule() {
- return getImportStatementDeclAccess().getRule();
+ public ParserRule getReferencedMetamodelRule() {
+ return getReferencedMetamodelAccess().getRule();
}
//EPackageDecl returns ecore::EPackage:
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDsl.xtext b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDsl.xtext
index 61d8c8a..3f0e668 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDsl.xtext
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDsl.xtext
@@ -4,9 +4,9 @@ import "http://www.eclipse.org/emf/2002/Ecore" as ecore
generate ecoredsl "http://example.xtext.org/EcoreDsl"
-EcoreDsl: (imports+=ImportStatementDecl)* package=EPackageDecl;
+EcoreDsl: (metamodelDeclarations+=ReferencedMetamodel)* package=EPackageDecl;
-ImportStatementDecl : "import" (alias=ID "=")? importURI=STRING ";" ;
+ReferencedMetamodel : "import" (alias=ID "=")? ePackage=[ecore::EPackage|STRING] ";" ;
EPackageDecl returns ecore::EPackage: (eAnnotations+=EAnnotationDecl)* "package" name=QID "nsURI" "=" nsURI=STRING "nsPrefix" "=" nsPrefix=QID "{"
(eSubpackages+=SubEPackageDecl | eClassifiers+=EClassifierDecl)* "}"
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslRuntimeModule.java b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslRuntimeModule.java
index 67ae147..930a09a 100644
--- a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslRuntimeModule.java
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/EcoreDslRuntimeModule.java
@@ -9,24 +9,15 @@
package org.eclipse.xtext.example;
import org.apache.log4j.Logger;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.ecore.EcoreFactory;
import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.xtext.common.services.DefaultTerminalConverters;
-import org.eclipse.xtext.conversion.IValueConverter;
-import org.eclipse.xtext.conversion.ValueConverter;
-import org.eclipse.xtext.conversion.ValueConverterException;
-import org.eclipse.xtext.conversion.impl.AbstractToStringConverter;
-import org.eclipse.xtext.conversion.impl.AbstractValueConverter;
-import org.eclipse.xtext.crossref.impl.Linker;
-import org.eclipse.xtext.diagnostics.IDiagnosticProducer;
-import org.eclipse.xtext.parsetree.AbstractNode;
+import org.eclipse.xtext.crossref.ILinkingService;
+import org.eclipse.xtext.crossref.IScopeProvider;
+import org.eclipse.xtext.example.conversion.EcoreDslConverters;
+import org.eclipse.xtext.example.linker.EcoreDslLinker;
+import org.eclipse.xtext.example.linker.EcoreDslLinkingService;
+import org.eclipse.xtext.example.linker.EcoreDslScopeProvider;
import org.eclipse.xtext.parsetree.reconstr.ITransientValueService;
import org.eclipse.xtext.parsetree.reconstr.impl.DefaultTransientValueService;
@@ -42,111 +33,26 @@ public class EcoreDslRuntimeModule extends AbstractEcoreDslRuntimeModule {
@Override
public Class<? extends org.eclipse.xtext.crossref.ILinker> bindILinker() {
- return EcoreDslRuntimeModule.EcoreDslLinker.class;
+ return EcoreDslLinker.class;
}
@Override
public Class<? extends org.eclipse.xtext.conversion.IValueConverterService> bindIValueConverterService() {
- return EcoreDslRuntimeModule.EcoreDslConverters.class;
+ return EcoreDslConverters.class;
}
@Override
public Class<? extends ITransientValueService> bindITransientValueService() {
- return EcoreDslRuntimeModule.EcoreDslTransientValueService.class;
+ return EcoreDslTransientValueService.class;
}
- public static class EcoreDslConverters extends DefaultTerminalConverters {
-
- @ValueConverter(rule = "SINT")
- public IValueConverter<Integer> sint() {
- return new AbstractToStringConverter<Integer>() {
- @Override
- public Integer internalToValue(String string, AbstractNode node) {
- return Integer.valueOf(string);
- }
- };
- }
-
- @ValueConverter(rule = "STRING_OR_QID")
- public IValueConverter<String> stringOrQid() {
- return STRING();
- }
-
- @ValueConverter(rule = "Bag")
- public IValueConverter<Boolean> bag() {
- return negatedBooleanConverter("bag");
- }
-
- @ValueConverter(rule = "Random")
- public IValueConverter<Boolean> random() {
- return negatedBooleanConverter("random");
- }
-
- @ValueConverter(rule = "Readonly")
- public IValueConverter<Boolean> readonly() {
- return negatedBooleanConverter("readonly");
- }
-
- @ValueConverter(rule = "Local")
- public IValueConverter<Boolean> local() {
- return negatedBooleanConverter("local");
- }
-
- @ValueConverter(rule = "Serializable")
- public IValueConverter<Boolean> serializable() {
- return negatedBooleanConverter("!serializable");
- }
-
- private IValueConverter<Boolean> negatedBooleanConverter(final String keyword) {
- return new AbstractValueConverter<Boolean>(){
- public Boolean toValue(String string, AbstractNode node) throws ValueConverterException {
- return string == null;
- }
-
- public String toString(Boolean value) {
- return value ? "" : keyword;
- }
- };
- }
-
+ public Class<? extends IScopeProvider> bindIScopeProvider() {
+ return EcoreDslScopeProvider.class;
}
-
- public static class EcoreDslLinker extends Linker {
-
- // logger available to subclasses
- protected final Logger logger = Logger.getLogger(getClass());
-
- @Override
- protected void setDefaultValueImpl(EObject obj, EReference ref, IDiagnosticProducer producer) {
- //hack: ePackage always needs an eFactoryInstance (gets cleared in #clearReferences?)
- if (ref.getName().equalsIgnoreCase("eFactoryInstance")) {
- ((EPackage) obj).setEFactoryInstance(EcoreFactory.eINSTANCE.createEFactory());
- }
- super.setDefaultValueImpl(obj, ref, producer);
- }
-
- @Override
- protected void clearReferences(EObject obj) {
- EList<EReference> allReferences = obj instanceof EClass ? ((EClass) obj).getEAllReferences() : obj.eClass()
- .getEAllReferences();
- // hack: exceptions when eType, eExceptions are null
- for (EReference ref : allReferences) {
- try {
- if (ref.isContainment() ||
- ref.isContainer() ||
- ref.isDerived() || obj.eGet(ref) == null || ref.getName() == null
- || (obj instanceof ETypedElement && ref.getName().equalsIgnoreCase("eType"))
- || (obj instanceof ETypedElement && ref.getName().equalsIgnoreCase("eExceptions"))) {
- continue;
- }
-
- clearReference(obj, ref);
- }
- catch (Exception e) {
- logger.error(e);
- }
- }
- }
+
+ @Override
+ public Class<? extends ILinkingService> bindILinkingService() {
+ return EcoreDslLinkingService.class;
}
public static class EcoreDslTransientValueService extends DefaultTransientValueService {
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/conversion/EcoreDslConverters.java b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/conversion/EcoreDslConverters.java
new file mode 100644
index 0000000..86ddd8f
--- /dev/null
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/conversion/EcoreDslConverters.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Michael Clay and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *******************************************************************************/
+package org.eclipse.xtext.example.conversion;
+
+import org.eclipse.xtext.common.services.DefaultTerminalConverters;
+import org.eclipse.xtext.conversion.IValueConverter;
+import org.eclipse.xtext.conversion.ValueConverter;
+import org.eclipse.xtext.conversion.ValueConverterException;
+import org.eclipse.xtext.conversion.impl.AbstractToStringConverter;
+import org.eclipse.xtext.conversion.impl.AbstractValueConverter;
+import org.eclipse.xtext.parsetree.AbstractNode;
+
+/**
+ * @author Michael Clay - Initial contribution and API
+ */
+public class EcoreDslConverters extends DefaultTerminalConverters {
+
+ @ValueConverter(rule = "SINT")
+ public IValueConverter<Integer> sint() {
+ return new AbstractToStringConverter<Integer>() {
+ @Override
+ public Integer internalToValue(String string, AbstractNode node) {
+ return Integer.valueOf(string);
+ }
+ };
+ }
+
+ @ValueConverter(rule = "STRING_OR_QID")
+ public IValueConverter<String> stringOrQid() {
+ return STRING();
+ }
+
+ @ValueConverter(rule = "Bag")
+ public IValueConverter<Boolean> bag() {
+ return negatedBooleanConverter("bag");
+ }
+
+ @ValueConverter(rule = "Random")
+ public IValueConverter<Boolean> random() {
+ return negatedBooleanConverter("random");
+ }
+
+ @ValueConverter(rule = "Readonly")
+ public IValueConverter<Boolean> readonly() {
+ return negatedBooleanConverter("readonly");
+ }
+
+ @ValueConverter(rule = "Local")
+ public IValueConverter<Boolean> local() {
+ return negatedBooleanConverter("local");
+ }
+
+ @ValueConverter(rule = "Serializable")
+ public IValueConverter<Boolean> serializable() {
+ return negatedBooleanConverter("!serializable");
+ }
+
+ private IValueConverter<Boolean> negatedBooleanConverter(final String keyword) {
+ return new AbstractValueConverter<Boolean>(){
+ public Boolean toValue(String string, AbstractNode node) throws ValueConverterException {
+ return string == null;
+ }
+
+ public String toString(Boolean value) {
+ return value ? "" : keyword;
+ }
+ };
+ }
+
+}
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslLinker.java b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslLinker.java
new file mode 100644
index 0000000..a87d454
--- /dev/null
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslLinker.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Michael Clay and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *******************************************************************************/
+package org.eclipse.xtext.example.linker;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.ETypedElement;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.xtext.crossref.impl.Linker;
+import org.eclipse.xtext.diagnostics.IDiagnosticProducer;
+
+/**
+ * @author Michael Clay - Initial contribution and API
+ */
+public class EcoreDslLinker extends Linker {
+ // logger available to subclasses
+ protected final Logger logger = Logger.getLogger(getClass());
+
+ @Override
+ protected void setDefaultValueImpl(EObject obj, EReference ref, IDiagnosticProducer producer) {
+ //hack: ePackage always needs an eFactoryInstance (gets cleared in #clearReferences?)
+ if (ref.getName().equalsIgnoreCase("eFactoryInstance")) {
+ ((EPackage) obj).setEFactoryInstance(EcoreFactory.eINSTANCE.createEFactory());
+ }
+ super.setDefaultValueImpl(obj, ref, producer);
+ }
+
+ @Override
+ protected void clearReferences(EObject obj) {
+ EList<EReference> allReferences = obj instanceof EClass ? ((EClass) obj).getEAllReferences() : obj.eClass()
+ .getEAllReferences();
+ // hack: exceptions when eType, eExceptions are null
+ for (EReference ref : allReferences) {
+ try {
+ if (ref.isContainment() ||
+ ref.isContainer() ||
+ ref.isDerived() || obj.eGet(ref) == null || ref.getName() == null
+ || (obj instanceof ETypedElement && ref.getName().equalsIgnoreCase("eType"))
+ || (obj instanceof ETypedElement && ref.getName().equalsIgnoreCase("eExceptions"))) {
+ continue;
+ }
+
+ clearReference(obj, ref);
+ }
+ catch (Exception e) {
+ logger.error(e);
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslLinkingService.java b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslLinkingService.java
new file mode 100644
index 0000000..10d70c8
--- /dev/null
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslLinkingService.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Michael Clay and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *******************************************************************************/
+package org.eclipse.xtext.example.linker;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.xtext.conversion.IValueConverterService;
+import org.eclipse.xtext.conversion.ValueConverterException;
+import org.eclipse.xtext.crossref.impl.DefaultLinkingService;
+import org.eclipse.xtext.crossref.impl.IllegalNodeException;
+import org.eclipse.xtext.example.ecoredsl.EcoredslPackage;
+import org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel;
+import org.eclipse.xtext.parsetree.AbstractNode;
+import org.eclipse.xtext.parsetree.LeafNode;
+
+import com.google.inject.Inject;
+
+/**
+ * @author Michael Clay - Initial contribution and API
+ */
+public class EcoreDslLinkingService extends DefaultLinkingService {
+
+ private static Logger log = Logger.getLogger(EcoreDslLinkingService.class);
+
+ @Inject
+ private IValueConverterService valueConverterService;
+
+ @Override
+ public List<EObject> getLinkedObjects(EObject context, EReference ref,
+ AbstractNode node) throws IllegalNodeException {
+ if (ref == EcoredslPackage.eINSTANCE.getReferencedMetamodel_EPackage())
+ return getPackage((ReferencedMetamodel) context, (LeafNode) node);
+ return super.getLinkedObjects(context, ref, node);
+ }
+
+ private List<EObject> getPackage(ReferencedMetamodel context, LeafNode text) {
+ String nsUri = getMetamodelNsURI(text);
+ if (nsUri == null) {
+ return Collections.emptyList();
+ }
+ EPackage ePackage = loadEPackage(nsUri, context.eResource().getResourceSet());
+ if (ePackage != null) {
+ return Collections.<EObject> singletonList(ePackage);
+ }
+ return Collections.emptyList();
+ }
+
+ private String getMetamodelNsURI(LeafNode text) {
+ try {
+ return (String) valueConverterService.toValue(text.getText(),
+ getRuleNameFrom(text.getGrammarElement()), text);
+ } catch (ValueConverterException e) {
+ log.debug("Exception on leaf '" + text.getText() + "'", e);
+ return null;
+ }
+ }
+
+ private EPackage loadEPackage(String resourceOrNsURI,
+ ResourceSet resourceSet) {
+ if (EPackage.Registry.INSTANCE.containsKey(resourceOrNsURI))
+ return EPackage.Registry.INSTANCE.getEPackage(resourceOrNsURI);
+ try {
+ URI uri = URI.createURI(resourceOrNsURI);
+ if (uri.fragment() == null) {
+ Resource resource = resourceSet.getResource(uri, true);
+ EPackage result = (EPackage) resource.getContents().get(0);
+ return result;
+ }
+ return (EPackage) resourceSet.getEObject(uri, true);
+
+ } catch (RuntimeException ex) {
+ log.trace("Cannot load package with URI '" + resourceOrNsURI + "'",ex);
+ }
+ return null;
+ }
+
+} \ No newline at end of file
diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslScopeProvider.java b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslScopeProvider.java
new file mode 100644
index 0000000..7a9b0c0
--- /dev/null
+++ b/examples/org.eclipse.xtext.example.ecoredsl/src/org/eclipse/xtext/example/linker/EcoreDslScopeProvider.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Michael Clay and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ *******************************************************************************/
+package org.eclipse.xtext.example.linker;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.conversion.IValueConverterService;
+import org.eclipse.xtext.crossref.IScope;
+import org.eclipse.xtext.crossref.IScopedElement;
+import org.eclipse.xtext.crossref.impl.DefaultScopeProvider;
+import org.eclipse.xtext.crossref.impl.ScopedElement;
+import org.eclipse.xtext.crossref.impl.SimpleScope;
+import org.eclipse.xtext.example.ecoredsl.EcoreDsl;
+import org.eclipse.xtext.example.ecoredsl.ReferencedMetamodel;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+import com.google.inject.Inject;
+
+/**
+ * @author Michael Clay - Initial contribution and API
+ */
+public class EcoreDslScopeProvider extends DefaultScopeProvider {
+
+ @Inject
+ private IValueConverterService valueConverterService;
+
+ @Override
+ protected IScope createScope(Resource resource, EClass type) {
+ if (EcorePackage.Literals.EPACKAGE == type) {
+ EcoreDsl ecoreDsl = (EcoreDsl) resource.getResourceSet()
+ .getEObject(resource.getURI().appendFragment("/"), true);
+ return createEPackageScope(ecoreDsl);
+ }
+ return super.createScope(resource, type);
+ }
+
+ @Override
+ public IScope getScope(EObject context, EReference reference) {
+ if (reference.getEType()
+ .equals(EcorePackage.eINSTANCE.getEClassifier())) {
+ EcoreDsl ecoreDsl = (EcoreDsl) context.eResource().getResourceSet()
+ .getEObject(
+ context.eResource().getURI().appendFragment("/"),
+ true);
+ final Collection<EClassifier> allClassifiers = new ArrayList<EClassifier>();
+ for (ReferencedMetamodel referencedMetamodel : ecoreDsl
+ .getMetamodelDeclarations()) {
+ if (referencedMetamodel.getEPackage() != null) {
+ allClassifiers.addAll(referencedMetamodel.getEPackage()
+ .getEClassifiers());
+ }
+ }
+ allClassifiers.addAll(ecoreDsl.getPackage().getEClassifiers());
+ return createClassifierScope(allClassifiers);
+ }
+ return super.getScope(context, reference);
+ }
+
+ private IScope createEPackageScope(final EcoreDsl ecoreDsl) {
+ IScope current = new SimpleScope(IScope.NULLSCOPE, Iterables.transform(
+ EPackage.Registry.INSTANCE.values(),
+ new Function<Object, IScopedElement>() {
+ public IScopedElement apply(Object param) {
+ return ScopedElement.create(valueConverterService.toString(((EPackage) param)
+ .getNsURI(), "STRING"), (EObject) param);
+ }
+ }));
+ return current;
+ }
+
+ private SimpleScope createClassifierScope(Iterable<EClassifier> classifiers) {
+ return new SimpleScope(IScope.NULLSCOPE, Iterables.transform(
+ classifiers, new Function<EClassifier, IScopedElement>() {
+ public IScopedElement apply(EClassifier param) {
+ return ScopedElement.create(param.getName(), param);
+ }
+ }));
+ }
+
+} \ No newline at end of file
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslProposalProvider.java b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslProposalProvider.java
index 6f35d00..1693be7 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslProposalProvider.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslProposalProvider.java
@@ -23,14 +23,6 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenFowlerDslProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
public List<? extends ICompletionProposal> completeStatemachine_Events(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
@@ -150,7 +142,6 @@ public class GenFowlerDslProposalProvider extends AbstractJavaProposalProvider {
return lookupCrossReference(((CrossReference)assignment.getTerminal()), contentAssistContext);
}
-
public List<? extends ICompletionProposal> complete(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("complete '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality()
@@ -158,15 +149,4 @@ public class GenFowlerDslProposalProvider extends AbstractJavaProposalProvider {
}
return Collections.emptyList();
}
-
-
-
-
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
-
}
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractJavaProposalProvider.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractJavaProposalProvider.java
index 380c9ed..313a766 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractJavaProposalProvider.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/AbstractJavaProposalProvider.java
@@ -13,12 +13,17 @@ import java.util.Collections;
import java.util.List;
import org.apache.log4j.Logger;
+import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.templates.Template;
import org.eclipse.jface.text.templates.TemplateContextType;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.xtext.AbstractElement;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.Assignment;
@@ -44,19 +49,20 @@ import com.google.inject.Inject;
*/
public abstract class AbstractJavaProposalProvider implements IProposalProvider {
// constants
- // protected static final String LEXER_RULE_ID = "ID";
protected static final String LEXER_RULE_INT = "INT";
protected static final String LEXER_RULE_STRING = "STRING";
-
// logger available to subclasses
protected final static Logger logger = Logger.getLogger(IProposalProvider.class);
@Inject
protected IScopeProvider scopeProvider;
-
- protected JavaReflectiveMethodInvoker invoker;
-
+ @Inject(optional=true)
+ protected AdapterFactory adapterFactory;
+ // @Inject(optional=true) does not work due to some plugin visibility quirks
+ protected AdapterFactoryLabelProvider adapterFactoryLabelProvider;
+ protected JavaReflectiveMethodInvoker methodInvoker;
+
protected AbstractJavaProposalProvider() {
- invoker = new JavaReflectiveMethodInvoker(this);
+ this.methodInvoker = new JavaReflectiveMethodInvoker(this);
}
/**
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeKeyword(Keyword,
@@ -68,8 +74,7 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
logger.debug("completeKeyword '" + keyword.getValue()+ "' for model '" + contentAssistContext.getModel()
+ "' and prefix '"+ contentAssistContext.getMatchString().trim() + "'");
}
- return Collections.singletonList(createCompletionProposal(keyword,
- keyword.getValue(), contentAssistContext));
+ return Collections.singletonList(createCompletionProposal(keyword,keyword.getValue(), contentAssistContext));
}
/**
@@ -111,20 +116,31 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
IContentAssistContext.class), Arrays.asList(contentAssistContext.getModel(), assignment,contentAssistContext));
}
+
/**
- * @return a new <code>XtextCompletionProposal</code> for the given text and
- * offset.
+ * @see #createCompletionProposal(AbstractElement, String, IContentAssistContext, Image)
*/
- protected ICompletionProposal createCompletionProposal(
- AbstractElement abstractElement, String displayString,
+ protected ICompletionProposal createCompletionProposal(AbstractElement abstractElement, String displayString,
IContentAssistContext contentAssistContext) {
- return new XtextCompletionProposal(abstractElement, displayString,contentAssistContext);
+ return createCompletionProposal(abstractElement, displayString,contentAssistContext,getAdapterFactoryLabelProvider().getImage(abstractElement));
}
+ /**
+ * @param abstractElement the {@link AbstractElement} which is used to create the proposals
+ * @param displayString the string that is already entered by the user prior to requesting content assist
+ * @param contentAssistContext the commonly used set of attributes related to the current content assist request
+ * @param image the {@link Image} for the {@link ICompletionProposal}
+ * @return a new <code>XtextCompletionProposal</code> for the given text and offset.
+ */
+ protected ICompletionProposal createCompletionProposal(AbstractElement abstractElement, String displayString,
+ IContentAssistContext contentAssistContext, Image image) {
+ return new XtextCompletionProposal(abstractElement, displayString,contentAssistContext,image);
+ }
+
@SuppressWarnings("unchecked")
protected List<? extends ICompletionProposal> invokeMethod(String methodName, List<Class<?>> parameterTypes,
List<?> parameterValues) {
- return (List<? extends ICompletionProposal>) invoker.invoke(methodName, parameterTypes, parameterValues);
+ return (List<? extends ICompletionProposal>) methodInvoker.invoke(methodName, parameterTypes, parameterValues);
}
/**
@@ -159,13 +175,9 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
*
* This implementation returns an empty list by default.
*
- * @param lexerRule
- * the 'called' LexerRule instance
- * @param ruleCall
- * the ruleCall for the provided lexerRule
- * @param offset
- * an offset within the document for which completions should be
- * computed
+ * @param terminalRule the 'called' {@link TerminalRule} instance
+ * @param ruleCall the ruleCall for the provided lexerRule
+ * @param offset an offset within the document for which completions should be computed
* @return a computed list of <code>ICompletionProposal</code> for the given
* <code>LexerRule</code>
*/
@@ -175,24 +187,6 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
return Collections.emptyList();
}
- /**
- * @return the id of the plug-in containing the image files;
- * <code>null </code> is returned if the plug-in does not exist
- */
- protected abstract String getPluginId();
-
- /**
- * Returns the the relative path of the default image file, relative to the
- * root of the containing plug-in; the path must be legal The image would
- * typically be shown to the left of the <code>ICompletionProposal</code>
- * display string.
- *
- * @return the image file path of the default image to be shown or
- * <code>null</code> if no image is desired
- * @see #getPluginId()
- */
- protected abstract String getDefaultImageFilePath();
-
/*
* (non-Javadoc)
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#filter(java.util.List, org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext)
@@ -221,9 +215,8 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
protected List<? extends ICompletionProposal> lookupCrossReference(
CrossReference crossReference,IContentAssistContext contentAssistContext) {
List<ICompletionProposal> completionProposalList = new ArrayList<ICompletionProposal>();
- if (scopeProvider != null) {
- ParserRule containingParserRule = GrammarUtil
- .containingParserRule(crossReference);
+ if (null!= scopeProvider) {
+ ParserRule containingParserRule = GrammarUtil.containingParserRule(crossReference);
if (!GrammarUtil.isDatatypeRule(containingParserRule)) {
EClass eClass = (EClass) containingParserRule.getType().getClassifier();
EReference ref = GrammarUtil.getReference(crossReference,eClass);
@@ -231,10 +224,10 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
IScope scope = scopeProvider.getScope(contentAssistContext.getModel(), ref);
Iterable<IScopedElement> candidates = scope.getAllContents();
for (IScopedElement candidate : candidates) {
- if (candidate.name() != null && isCandidateMatchingPrefix(contentAssistContext
+ if (null != candidate.name() && isCandidateMatchingPrefix(contentAssistContext
.getModel(), ref, candidate, trimmedPrefix)) {
completionProposalList.add(createCompletionProposal(crossReference, candidate.name(),
- contentAssistContext));
+ contentAssistContext,getAdapterFactoryLabelProvider().getImage(candidate.element())));
}
}
}
@@ -243,6 +236,34 @@ public abstract class AbstractJavaProposalProvider implements IProposalProvider
return completionProposalList;
}
+ /**
+ * @return an adapter factory that yield adapters that implement the various item label provider interfaces.
+ * @see AdapterFactory
+ */
+ protected AdapterFactory getAdapterFactory() {
+ if (null == this.adapterFactory) {
+ ComposedAdapterFactory composedAdapterFactory = new ComposedAdapterFactory(
+ ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ composedAdapterFactory
+ .addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+ this.adapterFactory = composedAdapterFactory;
+ }
+ return this.adapterFactory;
+ }
+
+ /**
+ * @return an instance that wraps the given {@link #getAdapterFactory()} to delegates its JFace provider
+ * interfaces to corresponding adapter-implemented item provider interfaces
+ * @see AdapterFactoryLabelProvider
+ */
+ protected AdapterFactoryLabelProvider getAdapterFactoryLabelProvider() {
+ if (null == this.adapterFactoryLabelProvider) {
+ this.adapterFactoryLabelProvider = new AdapterFactoryLabelProvider(
+ getAdapterFactory());
+ }
+ return this.adapterFactoryLabelProvider;
+ }
+
protected boolean isCandidateMatchingPrefix(EObject model, EReference ref,
IScopedElement candidate, String prefix) {
if (candidate.name() == null)
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextCompletionProposal.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextCompletionProposal.java
index 93aa551..35323ea 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextCompletionProposal.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/contentassist/impl/XtextCompletionProposal.java
@@ -31,14 +31,16 @@ public class XtextCompletionProposal implements ICompletionProposal {
private int nodeTotalOffset;
private int nodeTotalLength;
private String matchString;
+ private Image image;
public XtextCompletionProposal(AbstractElement abstractElement, String displayString,
- IContentAssistContext contentAssistContext) {
+ IContentAssistContext contentAssistContext, Image image) {
this.text = displayString;
this.offset = contentAssistContext.getOffSet();
this.nodeTotalOffset = contentAssistContext.getNode().getTotalOffset();
this.nodeTotalLength = contentAssistContext.getNode().getTotalLength();
this.matchString = contentAssistContext.getMatchString();
+ this.image = image;
}
public void apply(IDocument document) {
@@ -69,7 +71,7 @@ public class XtextCompletionProposal implements ICompletionProposal {
}
public Image getImage() {
- return null;
+ return this.image;
}
public Point getSelection(IDocument document) {
diff --git a/plugins/org.eclipse.xtext.ui.generator/src/org/eclipse/xtext/ui/generator/contentAssist/JavaBasedContentAssistFragment.xpt b/plugins/org.eclipse.xtext.ui.generator/src/org/eclipse/xtext/ui/generator/contentAssist/JavaBasedContentAssistFragment.xpt
index a8869bb..8d01733 100755
--- a/plugins/org.eclipse.xtext.ui.generator/src/org/eclipse/xtext/ui/generator/contentAssist/JavaBasedContentAssistFragment.xpt
+++ b/plugins/org.eclipse.xtext.ui.generator/src/org/eclipse/xtext/ui/generator/contentAssist/JavaBasedContentAssistFragment.xpt
@@ -42,15 +42,8 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class «getGenProposalProvider().toSimpleName()» extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
- «LET {} AS processedFqnFeatureNames»
+ «LET {} AS processedFqnFeatureNames-»
«FOREACH containedAssignments() AS assignment-»
«LET getFqFeatureName(assignment) AS fqnFeatureName»
«IF !processedFqnFeatureNames.contains(fqnFeatureName)-»
@@ -78,7 +71,7 @@ public class «getGenProposalProvider().toSimpleName()» extends AbstractJavaPropo
«ENDFOREACH-»
«FOREACH getParserRulesWithType() AS parserRule-»
- «LET getFqFeatureName(parserRule) AS fqnFeatureName»
+ «LET getFqFeatureName(parserRule) AS fqnFeatureName-»
«IF !processedFqnFeatureNames.contains(fqnFeatureName)-»
«processedFqnFeatureNames.add(fqnFeatureName)->""-»
public List<? extends ICompletionProposal> complete«fqnFeatureName»(EObject model, RuleCall ruleCall, IContentAssistContext contentAssistContext) {
@@ -92,13 +85,6 @@ public class «getGenProposalProvider().toSimpleName()» extends AbstractJavaPropo
«ENDLET-»
«ENDFOREACH-»
«ENDLET-»
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
-
}
«ENDFILE»
diff --git a/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/contentassist/AbstractXtendProposalProvider.java b/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/contentassist/AbstractXtendProposalProvider.java
index a0bcc6c..a539343 100644
--- a/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/contentassist/AbstractXtendProposalProvider.java
+++ b/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/contentassist/AbstractXtendProposalProvider.java
@@ -70,7 +70,7 @@ public abstract class AbstractXtendProposalProvider extends AbstractXtendService
+ "' and prefix '" + contentAssistContext.getMatchString().trim() + "'");
}
return Collections
- .singletonList(new XtextCompletionProposal(keyword, keyword.getValue(), contentAssistContext));
+ .singletonList(new XtextCompletionProposal(keyword, keyword.getValue(), contentAssistContext,null));
}
/**
@@ -151,19 +151,6 @@ public abstract class AbstractXtendProposalProvider extends AbstractXtendService
return invokeExtension("complete" + lexerRule.getName(), Arrays.asList(ruleCall, contentAssistContext));
}
- /**
- * Returns the the relative path of the default image file, relative to the
- * root of the containing plug-in; the path must be legal The image would
- * typically be shown to the left of the <code>ICompletionProposal</code>
- * display string.
- *
- * @return the image file path of the default image to be shown or <code>null</code> if no image is desired
- * @see #getPluginId()
- */
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
/*
* (non-Javadoc)
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#filter(java.util.List, org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext)
diff --git a/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/contentassist/ContentAssistHelper.java b/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/contentassist/ContentAssistHelper.java
index c6e183a..6d76b85 100644
--- a/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/contentassist/ContentAssistHelper.java
+++ b/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/contentassist/ContentAssistHelper.java
@@ -18,12 +18,13 @@ import org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextCompletionProp
/**
* @author Jan Köhnlein - Initial contribution and API
+ * @author Michael Clay
*/
public class ContentAssistHelper {
public static ICompletionProposal newProposal(AbstractElement element, String text,
IContentAssistContext contentAssistContext) {
- return new XtextCompletionProposal(element, text, contentAssistContext);
+ return new XtextCompletionProposal(element, text, contentAssistContext,null);
}
public static IScope getScope(IScopeProvider scopeProvider, Object context, Object reference) {
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java
index ceff88c..fe31e53 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageProposalProvider.java
@@ -8,12 +8,9 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.CrossReference;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractJavaProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
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.impl.AbstractJavaProposalProvider;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
@@ -23,15 +20,6 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenXtextGrammarTestLanguageProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
-
public List<? extends ICompletionProposal> completeGrammar_Name(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
@@ -431,44 +419,4 @@ public class GenXtextGrammarTestLanguageProposalProvider extends AbstractJavaPro
return Collections.emptyList();
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
-
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/GenEnumRulesTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/GenEnumRulesTestLanguageProposalProvider.java
index 5a4e296..0a5a522 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/GenEnumRulesTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/enumrules/GenEnumRulesTestLanguageProposalProvider.java
@@ -9,11 +9,10 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractJavaProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
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.impl.AbstractJavaProposalProvider;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
@@ -23,15 +22,6 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenEnumRulesTestLanguageProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
-
public List<? extends ICompletionProposal> completeModel_Existing(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
@@ -61,10 +51,5 @@ public class GenEnumRulesTestLanguageProposalProvider extends AbstractJavaPropos
return Collections.emptyList();
}
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/GenKeywordsTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/GenKeywordsTestLanguageProposalProvider.java
index 6a03c6c..007d46d 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/GenKeywordsTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/parser/keywords/GenKeywordsTestLanguageProposalProvider.java
@@ -9,11 +9,10 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractJavaProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
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.impl.AbstractJavaProposalProvider;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
@@ -23,16 +22,7 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenKeywordsTestLanguageProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
-
-
+
public List<? extends ICompletionProposal> completeModel_First(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeModel_First feature '" + assignment.getFeature() + "' terminal '"
@@ -78,10 +68,4 @@ public class GenKeywordsTestLanguageProposalProvider extends AbstractJavaProposa
return Collections.emptyList();
}
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
-
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java
index c0eea9e..3dd672a 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageProposalProvider.java
@@ -23,16 +23,7 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenContentAssistTestLanguageProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
-
-
public List<? extends ICompletionProposal> completeStart_Rules(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
logger.debug("completeStart_Rules feature '" + assignment.getFeature() + "' terminal '"
@@ -96,14 +87,4 @@ public class GenContentAssistTestLanguageProposalProvider extends AbstractJavaPr
return Collections.emptyList();
}
-
-
-
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
-
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java
index bd3d0ee..2546dae 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageProposalProvider.java
@@ -11,9 +11,9 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.xtext.Assignment;
import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractJavaProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
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.impl.AbstractJavaProposalProvider;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
@@ -23,15 +23,6 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenReferenceGrammarTestLanguageProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
-
public List<? extends ICompletionProposal> completeSpielplatz_Groesse(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
@@ -187,16 +178,4 @@ public class GenReferenceGrammarTestLanguageProposalProvider extends AbstractJav
return Collections.emptyList();
}
-
-
-
-
-
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
-
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java
index bae0483..caef14f 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/testlanguages/GenTreeTestLanguageProposalProvider.java
@@ -9,11 +9,10 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractJavaProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
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.impl.AbstractJavaProposalProvider;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
@@ -23,15 +22,6 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenTreeTestLanguageProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
-
public List<? extends ICompletionProposal> completeModel_Children(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
@@ -77,12 +67,5 @@ public class GenTreeTestLanguageProposalProvider extends AbstractJavaProposalPro
}
return Collections.emptyList();
}
-
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
}
diff --git a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/GenTwoContextsTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/GenTwoContextsTestLanguageProposalProvider.java
index a20d3a1..29f467d 100644
--- a/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/GenTwoContextsTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.common.tests/src-gen/org/eclipse/xtext/ui/common/editor/contentassist/impl/GenTwoContextsTestLanguageProposalProvider.java
@@ -11,9 +11,8 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.xtext.Assignment;
import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractJavaProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
+import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
@@ -23,15 +22,6 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenTwoContextsTestLanguageProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
-
public List<? extends ICompletionProposal> completeMainModel_Elements(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
@@ -69,11 +59,4 @@ public class GenTwoContextsTestLanguageProposalProvider extends AbstractJavaProp
return Collections.emptyList();
}
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
-
}
diff --git a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/GenTestLanguageProposalProvider.java b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/GenTestLanguageProposalProvider.java
index 3d02d23..5250c26 100644
--- a/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/GenTestLanguageProposalProvider.java
+++ b/tests/org.eclipse.xtext.ui.integration.tests/src-gen/org/eclipse/xtext/ui/integration/GenTestLanguageProposalProvider.java
@@ -9,11 +9,10 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractJavaProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
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.impl.AbstractJavaProposalProvider;
/**
* Represents a generated, default implementation of interface {@link IProposalProvider}.
@@ -23,15 +22,6 @@ import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
* @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider
*/
public class GenTestLanguageProposalProvider extends AbstractJavaProposalProvider {
- //TODO remove this from template
- private static final String UI_PLUGIN_ID = "ERROR_REMOVE_ME_FROM_TEMPLATE";
-
- @Override
- protected String getPluginId() {
- return UI_PLUGIN_ID;
- }
-
-
public List<? extends ICompletionProposal> completeFile_Stuff(EObject model, Assignment assignment, IContentAssistContext contentAssistContext) {
if (logger.isDebugEnabled()) {
@@ -59,12 +49,6 @@ public class GenTestLanguageProposalProvider extends AbstractJavaProposalProvide
}
return Collections.emptyList();
}
-
-
- @Override
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
}