Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Vorburger2015-03-15 11:11:32 +0000
committerMichael Vorburger2015-04-21 14:03:05 +0000
commit4a526b6c6bfadc63f078efecd255edcebac79350 (patch)
tree7e5f7c03a1ee1db624f8f10846dfe4e5c941f5ee
parentd132d1929a80c0f78e8e694bcf519b2eb2295369 (diff)
downloadorg.eclipse.emf.eson-Xtext-v2.5.x.tar.gz
org.eclipse.emf.eson-Xtext-v2.5.x.tar.xz
org.eclipse.emf.eson-Xtext-v2.5.x.zip
[enhancement] Support EClass and EAttribute name with dots (DS-8480)Xtext-v2.5.x
incl. Anton's Wrap a computed scope for a reference to EClass into a scope that uses all combinations of QNs' segments to find a single element or elements incl. my changes on top of Anton's proposal: Un-uncommented EFactoryScopeProvider, we still need that for now (lots of test failures without this; more work, later) Re-gen src-gen for maintenance branch with Xtext 2.5.3 (he seems to have used more recent) JavaDoc & copyright header Change-Id: I298bd138544718baa936defea0bd1b3708767ea6
-rw-r--r--plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/AbstractEFactoryUiModule.java60
-rw-r--r--plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g12
-rw-r--r--plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactoryLexer.java84
-rw-r--r--plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactoryParser.java218
-rw-r--r--plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/AbstractEFactoryRuntimeModule.java35
-rw-r--r--plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/EFactory.xtextbinbin4823 -> 4823 bytes
-rw-r--r--plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g30
-rw-r--r--plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.tokens4
-rw-r--r--plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactoryLexer.java192
-rw-r--r--plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactoryParser.java1547
-rw-r--r--plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/serializer/EFactorySemanticSequencer.java10
-rw-r--r--plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/services/EFactoryGrammarAccess.java54
-rw-r--r--plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/EFactory.xtext9
-rw-r--r--plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/GenerateEFactory.mwe26
-rw-r--r--plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/resource/EFactoryDerivedStateComputer.java2
-rw-r--r--plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/DottedQualifiedNameAwareScope.java74
-rw-r--r--plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/DottedQualifiedNameFixer.java67
-rw-r--r--plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EFactoryScopeProvider.java11
-rw-r--r--plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EFactoryScopeProviderNG.java25
-rw-r--r--plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EPackageScopeProvider.java22
-rw-r--r--plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/util/EcoreUtil3.java6
-rw-r--r--tests/org.eclipse.emf.eson.tests/launch/EFactory all tests.launch2
-rw-r--r--tests/org.eclipse.emf.eson.tests/model/TestModelWithDotInNames.ecore19
-rw-r--r--tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots1.eson5
-rw-r--r--tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots2.eson5
-rw-r--r--tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots3enumA.eson5
-rw-r--r--tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots3enumB.eson5
-rw-r--r--tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots4contained.eson7
-rw-r--r--tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots5omg.eson6
-rw-r--r--tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/builder/tests/SimplestTest.java1
-rw-r--r--tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/builder/tests/SimplestWeiredNameTest.java105
-rw-r--r--tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/tests/util/DumpIndexUtil.java6
-rw-r--r--tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/util/tests/DottedQualifiedNameFixerTest.java53
33 files changed, 1562 insertions, 1125 deletions
diff --git a/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/AbstractEFactoryUiModule.java b/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/AbstractEFactoryUiModule.java
index 241a0bb..16d84a9 100644
--- a/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/AbstractEFactoryUiModule.java
+++ b/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/AbstractEFactoryUiModule.java
@@ -39,6 +39,11 @@ public abstract class AbstractEFactoryUiModule extends DefaultUiModule {
}
// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
+ public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
+ return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class;
}
@@ -138,61 +143,6 @@ public abstract class AbstractEFactoryUiModule extends DefaultUiModule {
return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class;
}
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public java.lang.ClassLoader bindClassLoaderToInstance() {
- return getClass().getClassLoader();
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
- return org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
- return org.eclipse.xtext.common.types.xtext.ui.JdtBasedSimpleTypeScopeProvider.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.common.types.xtext.ui.ITypesProposalProvider> bindITypesProposalProvider() {
- return org.eclipse.xtext.common.types.xtext.ui.JdtTypesProposalProvider.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.common.types.access.jdt.IJavaProjectProvider> bindIJavaProjectProvider() {
- return org.eclipse.xtext.common.types.xtext.ui.XtextResourceSetBasedProjectProvider.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkHelper> bindIHyperlinkHelper() {
- return org.eclipse.xtext.common.types.xtext.ui.TypeAwareHyperlinkHelper.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
- return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider.ReferenceProposalCreator> bindAbstractJavaBasedContentProposalProvider$ReferenceProposalCreator() {
- return org.eclipse.xtext.common.types.xtext.ui.TypeAwareReferenceProposalCreator.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.ui.editor.IValidationJobScheduler> bindIValidationJobScheduler() {
- return org.eclipse.xtext.common.types.xtext.ui.JdtValidationJobScheduler.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.ui.refactoring.impl.RefactoringResourceSetProvider> bindRefactoringResourceSetProvider() {
- return org.eclipse.xtext.common.types.ui.refactoring.JvmRefactoringResourceSetProvider.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation> bindIJavaSearchParticipation() {
- return org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation.Yes.class;
- }
-
// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
diff --git a/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g b/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g
index 80d5b78..bf93e81 100644
--- a/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g
+++ b/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g
@@ -2727,8 +2727,8 @@ rule__CustomNameMapping__NameFeatureAssignment_4
(
{ before(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeCrossReference_4_0()); }
(
-{ before(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeIDTerminalRuleCall_4_0_1()); }
- RULE_ID{ after(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeIDTerminalRuleCall_4_0_1()); }
+{ before(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeQualifiedNameParserRuleCall_4_0_1()); }
+ ruleQualifiedName{ after(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeQualifiedNameParserRuleCall_4_0_1()); }
)
{ after(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeCrossReference_4_0()); }
)
@@ -2746,8 +2746,8 @@ rule__Feature__EFeatureAssignment_0
(
{ before(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureCrossReference_0_0()); }
(
-{ before(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureIDTerminalRuleCall_0_0_1()); }
- RULE_ID{ after(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureIDTerminalRuleCall_0_0_1()); }
+{ before(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureQualifiedNameParserRuleCall_0_0_1()); }
+ ruleQualifiedName{ after(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureQualifiedNameParserRuleCall_0_0_1()); }
)
{ after(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureCrossReference_0_0()); }
)
@@ -2912,8 +2912,8 @@ rule__EnumAttribute__ValueAssignment_1
(
{ before(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralCrossReference_1_0()); }
(
-{ before(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralIDTerminalRuleCall_1_0_1()); }
- RULE_ID{ after(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralIDTerminalRuleCall_1_0_1()); }
+{ before(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralQualifiedNameParserRuleCall_1_0_1()); }
+ ruleQualifiedName{ after(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralQualifiedNameParserRuleCall_1_0_1()); }
)
{ after(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralCrossReference_1_0()); }
)
diff --git a/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactoryLexer.java b/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactoryLexer.java
index 4fe007a..24ac245 100644
--- a/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactoryLexer.java
+++ b/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactoryLexer.java
@@ -600,27 +600,27 @@ public class InternalEFactoryLexer extends Lexer {
switch (alt5) {
- case 1 :
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:3033:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
- {
- 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' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
-
- }
- break;
- case 2 :
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:3033:66: ~ ( ( '\\\\' | '\"' ) )
- {
- if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
- input.consume();
+ case 1 :
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:3033:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ {
+ 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' && input.LA(1)<='u') ) {
+ input.consume();
+
+ }
+ else {
+ MismatchedSetException mse = new MismatchedSetException(null,input);
+ recover(mse);
+ throw mse;}
+
+
+ }
+ break;
+ case 2 :
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:3033:66: ~ ( ( '\\\\' | '\"' ) )
+ {
+ if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
+ input.consume();
}
else {
@@ -660,27 +660,27 @@ public class InternalEFactoryLexer extends Lexer {
switch (alt6) {
- case 1 :
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:3033:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
- {
- 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' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
-
- }
- break;
- case 2 :
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:3033:137: ~ ( ( '\\\\' | '\\'' ) )
- {
- if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
- input.consume();
+ case 1 :
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:3033:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ {
+ 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' && input.LA(1)<='u') ) {
+ input.consume();
+
+ }
+ else {
+ MismatchedSetException mse = new MismatchedSetException(null,input);
+ recover(mse);
+ throw mse;}
+
+
+ }
+ break;
+ case 2 :
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:3033:137: ~ ( ( '\\\\' | '\\'' ) )
+ {
+ if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
+ input.consume();
}
else {
diff --git a/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactoryParser.java b/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactoryParser.java
index 2bd0173..f8a1a7e 100644
--- a/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactoryParser.java
+++ b/plugins/org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactoryParser.java
@@ -4234,18 +4234,7 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
}
// ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:1456:1: ( rule__Feature__ValueAssignment_2 )?
int alt8=2;
- int LA8_0 = input.LA(1);
-
- if ( ((LA8_0>=RULE_LONG_ID && LA8_0<=RULE_STRING)||(LA8_0>=13 && LA8_0<=14)||(LA8_0>=22 && LA8_0<=23)||(LA8_0>=26 && LA8_0<=27)) ) {
- alt8=1;
- }
- else if ( (LA8_0==RULE_ID) ) {
- int LA8_2 = input.LA(2);
-
- if ( (LA8_2==EOF||(LA8_2>=RULE_ID && LA8_2<=RULE_LONG_UNSIGNED)||LA8_2==19||LA8_2==21||LA8_2==25) ) {
- alt8=1;
- }
- }
+ alt8 = dfa8.predict(input);
switch (alt8) {
case 1 :
// ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:1456:2: rule__Feature__ValueAssignment_2
@@ -4613,7 +4602,7 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
int alt10=2;
int LA10_0 = input.LA(1);
- if ( (LA10_0==RULE_ID) ) {
+ if ( ((LA10_0>=RULE_ID && LA10_0<=RULE_LONG_UNSIGNED)) ) {
alt10=1;
}
@@ -4883,7 +4872,7 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
int alt11=2;
int LA11_0 = input.LA(1);
- if ( (LA11_0==RULE_ID) ) {
+ if ( ((LA11_0>=RULE_ID && LA11_0<=RULE_LONG_UNSIGNED)) ) {
alt11=1;
}
@@ -7669,30 +7658,34 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__CustomNameMapping__NameFeatureAssignment_4"
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2722:1: rule__CustomNameMapping__NameFeatureAssignment_4 : ( ( RULE_ID ) ) ;
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2722:1: rule__CustomNameMapping__NameFeatureAssignment_4 : ( ( ruleQualifiedName ) ) ;
public final void rule__CustomNameMapping__NameFeatureAssignment_4() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2726:1: ( ( ( RULE_ID ) ) )
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2727:1: ( ( RULE_ID ) )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2726:1: ( ( ( ruleQualifiedName ) ) )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2727:1: ( ( ruleQualifiedName ) )
{
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2727:1: ( ( RULE_ID ) )
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2728:1: ( RULE_ID )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2727:1: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2728:1: ( ruleQualifiedName )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeCrossReference_4_0());
}
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2729:1: ( RULE_ID )
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2730:1: RULE_ID
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2729:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2730:1: ruleQualifiedName
{
if ( state.backtracking==0 ) {
- before(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeIDTerminalRuleCall_4_0_1());
+ before(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeQualifiedNameParserRuleCall_4_0_1());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__CustomNameMapping__NameFeatureAssignment_45507); if (state.failed) return ;
+ pushFollow(FOLLOW_ruleQualifiedName_in_rule__CustomNameMapping__NameFeatureAssignment_45507);
+ ruleQualifiedName();
+
+ state._fsp--;
+ if (state.failed) return ;
if ( state.backtracking==0 ) {
- after(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeIDTerminalRuleCall_4_0_1());
+ after(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeQualifiedNameParserRuleCall_4_0_1());
}
}
@@ -7722,30 +7715,34 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__Feature__EFeatureAssignment_0"
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2741:1: rule__Feature__EFeatureAssignment_0 : ( ( RULE_ID ) ) ;
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2741:1: rule__Feature__EFeatureAssignment_0 : ( ( ruleQualifiedName ) ) ;
public final void rule__Feature__EFeatureAssignment_0() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2745:1: ( ( ( RULE_ID ) ) )
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2746:1: ( ( RULE_ID ) )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2745:1: ( ( ( ruleQualifiedName ) ) )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2746:1: ( ( ruleQualifiedName ) )
{
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2746:1: ( ( RULE_ID ) )
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2747:1: ( RULE_ID )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2746:1: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2747:1: ( ruleQualifiedName )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureCrossReference_0_0());
}
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2748:1: ( RULE_ID )
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2749:1: RULE_ID
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2748:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2749:1: ruleQualifiedName
{
if ( state.backtracking==0 ) {
- before(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureIDTerminalRuleCall_0_0_1());
+ before(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureQualifiedNameParserRuleCall_0_0_1());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Feature__EFeatureAssignment_05546); if (state.failed) return ;
+ pushFollow(FOLLOW_ruleQualifiedName_in_rule__Feature__EFeatureAssignment_05546);
+ ruleQualifiedName();
+
+ state._fsp--;
+ if (state.failed) return ;
if ( state.backtracking==0 ) {
- after(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureIDTerminalRuleCall_0_0_1());
+ after(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureQualifiedNameParserRuleCall_0_0_1());
}
}
@@ -8216,30 +8213,34 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
// $ANTLR start "rule__EnumAttribute__ValueAssignment_1"
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2907:1: rule__EnumAttribute__ValueAssignment_1 : ( ( RULE_ID ) ) ;
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2907:1: rule__EnumAttribute__ValueAssignment_1 : ( ( ruleQualifiedName ) ) ;
public final void rule__EnumAttribute__ValueAssignment_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2911:1: ( ( ( RULE_ID ) ) )
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2912:1: ( ( RULE_ID ) )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2911:1: ( ( ( ruleQualifiedName ) ) )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2912:1: ( ( ruleQualifiedName ) )
{
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2912:1: ( ( RULE_ID ) )
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2913:1: ( RULE_ID )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2912:1: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2913:1: ( ruleQualifiedName )
{
if ( state.backtracking==0 ) {
before(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralCrossReference_1_0());
}
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2914:1: ( RULE_ID )
- // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2915:1: RULE_ID
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2914:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson.ui/src-gen/org/eclipse/emf/eson/ui/contentassist/antlr/internal/InternalEFactory.g:2915:1: ruleQualifiedName
{
if ( state.backtracking==0 ) {
- before(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralIDTerminalRuleCall_1_0_1());
+ before(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralQualifiedNameParserRuleCall_1_0_1());
}
- match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__EnumAttribute__ValueAssignment_15888); if (state.failed) return ;
+ pushFollow(FOLLOW_ruleQualifiedName_in_rule__EnumAttribute__ValueAssignment_15888);
+ ruleQualifiedName();
+
+ state._fsp--;
+ if (state.failed) return ;
if ( state.backtracking==0 ) {
- after(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralIDTerminalRuleCall_1_0_1());
+ after(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralQualifiedNameParserRuleCall_1_0_1());
}
}
@@ -8629,6 +8630,7 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
protected DFA1 dfa1 = new DFA1(this);
protected DFA2 dfa2 = new DFA2(this);
+ protected DFA8 dfa8 = new DFA8(this);
static final String DFA1_eotS =
"\17\uffff";
static final String DFA1_eofS =
@@ -8640,15 +8642,15 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
static final String DFA1_acceptS =
"\1\uffff\1\1\1\2\3\uffff\1\3\1\4\7\uffff";
static final String DFA1_specialS =
- "\3\uffff\1\2\5\uffff\1\1\1\0\1\3\3\uffff}>";
+ "\3\uffff\1\0\5\uffff\1\2\1\3\1\1\3\uffff}>";
static final String[] DFA1_transitionS = {
"\1\4\1\5\1\3\1\2\5\uffff\2\2\7\uffff\1\2\1\1\2\uffff\2\2",
"",
"",
"\3\6\14\uffff\1\6\5\uffff\1\6",
- "\1\11\1\13\1\12\1\7\5\uffff\2\7\4\uffff\1\6\1\uffff\4\7\1\10"+
+ "\1\11\1\12\1\13\1\7\5\uffff\2\7\4\uffff\1\6\1\uffff\4\7\1\10"+
"\2\7",
- "\1\11\1\13\1\12\1\7\5\uffff\2\7\4\uffff\1\6\1\uffff\4\7\1\10"+
+ "\1\11\1\12\1\13\1\7\5\uffff\2\7\4\uffff\1\6\1\uffff\4\7\1\10"+
"\2\7",
"",
"",
@@ -8656,11 +8658,11 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
"\1\uffff",
"\1\uffff",
"\1\uffff",
- "\1\11\1\13\1\12\1\7\5\uffff\2\7\4\uffff\1\6\1\uffff\4\7\1\10"+
+ "\1\11\1\12\1\13\1\7\5\uffff\2\7\4\uffff\1\6\1\uffff\4\7\1\10"+
"\2\7",
- "\1\11\1\13\1\12\1\7\5\uffff\2\7\4\uffff\1\6\1\uffff\4\7\1\10"+
+ "\1\11\1\12\1\13\1\7\5\uffff\2\7\4\uffff\1\6\1\uffff\4\7\1\10"+
"\2\7",
- "\1\11\1\13\1\12\1\7\5\uffff\2\7\4\uffff\1\6\1\uffff\4\7\1\10"+
+ "\1\11\1\12\1\13\1\7\5\uffff\2\7\4\uffff\1\6\1\uffff\4\7\1\10"+
"\2\7"
};
@@ -8701,25 +8703,27 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
int _s = s;
switch ( s ) {
case 0 :
- int LA1_10 = input.LA(1);
+ int LA1_3 = input.LA(1);
- int index1_10 = input.index();
+ int index1_3 = input.index();
input.rewind();
s = -1;
- if ( (synpred3_InternalEFactory()) ) {s = 6;}
+ if ( ((LA1_3>=RULE_ID && LA1_3<=RULE_LONG_UNSIGNED)||LA1_3==19||LA1_3==25) ) {s = 6;}
+
+ else if ( (synpred2_InternalEFactory()) ) {s = 2;}
else if ( (true) ) {s = 7;}
- input.seek(index1_10);
+ input.seek(index1_3);
if ( s>=0 ) return s;
break;
case 1 :
- int LA1_9 = input.LA(1);
+ int LA1_11 = input.LA(1);
- int index1_9 = input.index();
+ int index1_11 = input.index();
input.rewind();
s = -1;
if ( (synpred3_InternalEFactory()) ) {s = 6;}
@@ -8727,31 +8731,29 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
else if ( (true) ) {s = 7;}
- input.seek(index1_9);
+ input.seek(index1_11);
if ( s>=0 ) return s;
break;
case 2 :
- int LA1_3 = input.LA(1);
+ int LA1_9 = input.LA(1);
- int index1_3 = input.index();
+ int index1_9 = input.index();
input.rewind();
s = -1;
- if ( ((LA1_3>=RULE_ID && LA1_3<=RULE_LONG_UNSIGNED)||LA1_3==19||LA1_3==25) ) {s = 6;}
-
- else if ( (synpred2_InternalEFactory()) ) {s = 2;}
+ if ( (synpred3_InternalEFactory()) ) {s = 6;}
else if ( (true) ) {s = 7;}
- input.seek(index1_3);
+ input.seek(index1_9);
if ( s>=0 ) return s;
break;
case 3 :
- int LA1_11 = input.LA(1);
+ int LA1_10 = input.LA(1);
- int index1_11 = input.index();
+ int index1_10 = input.index();
input.rewind();
s = -1;
if ( (synpred3_InternalEFactory()) ) {s = 6;}
@@ -8759,7 +8761,7 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
else if ( (true) ) {s = 7;}
- input.seek(index1_11);
+ input.seek(index1_10);
if ( s>=0 ) return s;
break;
}
@@ -8831,6 +8833,68 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
return "795:1: rule__Attribute__Alternatives : ( ( ruleEnumAttribute ) | ( ruleStringAttribute ) | ( ruleIntegerAttribute ) | ( ruleBooleanAttribute ) | ( ruleDoubleAttribute ) | ( ruleDateAttribute ) | ( ruleNullAttribute ) );";
}
}
+ static final String DFA8_eotS =
+ "\16\uffff";
+ static final String DFA8_eofS =
+ "\1\5\1\uffff\3\1\3\uffff\4\1\1\uffff\1\1";
+ static final String DFA8_minS =
+ "\1\4\1\uffff\3\4\1\uffff\10\4";
+ static final String DFA8_maxS =
+ "\1\33\1\uffff\3\31\1\uffff\2\6\4\31\1\6\1\31";
+ static final String DFA8_acceptS =
+ "\1\uffff\1\1\3\uffff\1\2\10\uffff";
+ static final String DFA8_specialS =
+ "\16\uffff}>";
+ static final String[] DFA8_transitionS = {
+ "\1\3\1\4\1\2\1\1\5\uffff\2\1\6\uffff\1\5\2\1\2\uffff\2\1",
+ "",
+ "\3\1\14\uffff\1\1\1\uffff\1\1\1\5\2\uffff\1\6",
+ "\3\1\14\uffff\1\1\1\uffff\1\1\1\5\2\uffff\1\7",
+ "\3\1\14\uffff\1\1\1\uffff\1\1\1\5\2\uffff\1\7",
+ "",
+ "\1\10\1\11\1\12",
+ "\1\10\1\11\1\13",
+ "\3\1\14\uffff\1\1\1\uffff\1\1\1\5\2\uffff\1\7",
+ "\3\1\14\uffff\1\1\1\uffff\1\1\1\5\2\uffff\1\7",
+ "\3\1\14\uffff\1\1\1\uffff\1\1\1\5\2\uffff\1\14",
+ "\3\1\14\uffff\1\1\1\uffff\1\1\1\5\2\uffff\1\7",
+ "\1\10\1\11\1\15",
+ "\3\1\14\uffff\1\1\1\uffff\1\1\1\5\2\uffff\1\7"
+ };
+
+ static final short[] DFA8_eot = DFA.unpackEncodedString(DFA8_eotS);
+ static final short[] DFA8_eof = DFA.unpackEncodedString(DFA8_eofS);
+ static final char[] DFA8_min = DFA.unpackEncodedStringToUnsignedChars(DFA8_minS);
+ static final char[] DFA8_max = DFA.unpackEncodedStringToUnsignedChars(DFA8_maxS);
+ static final short[] DFA8_accept = DFA.unpackEncodedString(DFA8_acceptS);
+ static final short[] DFA8_special = DFA.unpackEncodedString(DFA8_specialS);
+ static final short[][] DFA8_transition;
+
+ static {
+ int numStates = DFA8_transitionS.length;
+ DFA8_transition = new short[numStates][];
+ for (int i=0; i<numStates; i++) {
+ DFA8_transition[i] = DFA.unpackEncodedString(DFA8_transitionS[i]);
+ }
+ }
+
+ class DFA8 extends DFA {
+
+ public DFA8(BaseRecognizer recognizer) {
+ this.recognizer = recognizer;
+ this.decisionNumber = 8;
+ this.eot = DFA8_eot;
+ this.eof = DFA8_eof;
+ this.min = DFA8_min;
+ this.max = DFA8_max;
+ this.accept = DFA8_accept;
+ this.special = DFA8_special;
+ this.transition = DFA8_transition;
+ }
+ public String getDescription() {
+ return "1456:1: ( rule__Feature__ValueAssignment_2 )?";
+ }
+ }
public static final BitSet FOLLOW_ruleFactory_in_entryRuleFactory67 = new BitSet(new long[]{0x0000000000000000L});
@@ -8957,7 +9021,7 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
public static final BitSet FOLLOW_rule__CustomNameMapping__Group__2__Impl_in_rule__CustomNameMapping__Group__22596 = new BitSet(new long[]{0x0000000000100000L});
public static final BitSet FOLLOW_rule__CustomNameMapping__Group__3_in_rule__CustomNameMapping__Group__22599 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__CustomNameMapping__EClassAssignment_2_in_rule__CustomNameMapping__Group__2__Impl2626 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__CustomNameMapping__Group__3__Impl_in_rule__CustomNameMapping__Group__32656 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_rule__CustomNameMapping__Group__3__Impl_in_rule__CustomNameMapping__Group__32656 = new BitSet(new long[]{0x0000000000048070L});
public static final BitSet FOLLOW_rule__CustomNameMapping__Group__4_in_rule__CustomNameMapping__Group__32659 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_20_in_rule__CustomNameMapping__Group__3__Impl2687 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__CustomNameMapping__Group__4__Impl_in_rule__CustomNameMapping__Group__42718 = new BitSet(new long[]{0x0000000000200000L});
@@ -8979,20 +9043,20 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
public static final BitSet FOLLOW_rule__NewObject__Group__1__Impl_in_rule__NewObject__Group__13095 = new BitSet(new long[]{0x00000000000C8070L});
public static final BitSet FOLLOW_rule__NewObject__Group__2_in_rule__NewObject__Group__13098 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__NewObject__NameAssignment_1_in_rule__NewObject__Group__1__Impl3125 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__NewObject__Group__2__Impl_in_rule__NewObject__Group__23156 = new BitSet(new long[]{0x0000000000200010L});
+ public static final BitSet FOLLOW_rule__NewObject__Group__2__Impl_in_rule__NewObject__Group__23156 = new BitSet(new long[]{0x0000000000248070L});
public static final BitSet FOLLOW_rule__NewObject__Group__3_in_rule__NewObject__Group__23159 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_19_in_rule__NewObject__Group__2__Impl3187 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__NewObject__Group__3__Impl_in_rule__NewObject__Group__33218 = new BitSet(new long[]{0x0000000000200010L});
+ public static final BitSet FOLLOW_rule__NewObject__Group__3__Impl_in_rule__NewObject__Group__33218 = new BitSet(new long[]{0x0000000000248070L});
public static final BitSet FOLLOW_rule__NewObject__Group__4_in_rule__NewObject__Group__33221 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__NewObject__FeaturesAssignment_3_in_rule__NewObject__Group__3__Impl3248 = new BitSet(new long[]{0x0000000000000012L});
+ public static final BitSet FOLLOW_rule__NewObject__FeaturesAssignment_3_in_rule__NewObject__Group__3__Impl3248 = new BitSet(new long[]{0x0000000000048072L});
public static final BitSet FOLLOW_rule__NewObject__Group__4__Impl_in_rule__NewObject__Group__43279 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_21_in_rule__NewObject__Group__4__Impl3307 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__Value__Group_2__0__Impl_in_rule__Value__Group_2__03348 = new BitSet(new long[]{0x0000000000200010L});
+ public static final BitSet FOLLOW_rule__Value__Group_2__0__Impl_in_rule__Value__Group_2__03348 = new BitSet(new long[]{0x0000000000248070L});
public static final BitSet FOLLOW_rule__Value__Group_2__1_in_rule__Value__Group_2__03351 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__Value__Group_2_0__0_in_rule__Value__Group_2__0__Impl3378 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__Value__Group_2__1__Impl_in_rule__Value__Group_2__13408 = new BitSet(new long[]{0x0000000000200010L});
+ public static final BitSet FOLLOW_rule__Value__Group_2__1__Impl_in_rule__Value__Group_2__13408 = new BitSet(new long[]{0x0000000000248070L});
public static final BitSet FOLLOW_rule__Value__Group_2__2_in_rule__Value__Group_2__13411 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__Value__FeaturesAssignment_2_1_in_rule__Value__Group_2__1__Impl3438 = new BitSet(new long[]{0x0000000000000012L});
+ public static final BitSet FOLLOW_rule__Value__FeaturesAssignment_2_1_in_rule__Value__Group_2__1__Impl3438 = new BitSet(new long[]{0x0000000000048072L});
public static final BitSet FOLLOW_rule__Value__Group_2__2__Impl_in_rule__Value__Group_2__23469 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_rule__Value__Group_2__3_in_rule__Value__Group_2__23472 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_21_in_rule__Value__Group_2__2__Impl3500 = new BitSet(new long[]{0x0000000000000002L});
@@ -9019,7 +9083,7 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
public static final BitSet FOLLOW_rule__MultiValue__ValuesAssignment_2_in_rule__MultiValue__Group__2__Impl4058 = new BitSet(new long[]{0x000000000CC4E0F2L});
public static final BitSet FOLLOW_rule__MultiValue__Group__3__Impl_in_rule__MultiValue__Group__34089 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_24_in_rule__MultiValue__Group__3__Impl4117 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__EnumAttribute__Group__0__Impl_in_rule__EnumAttribute__Group__04156 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_rule__EnumAttribute__Group__0__Impl_in_rule__EnumAttribute__Group__04156 = new BitSet(new long[]{0x0000000000048070L});
public static final BitSet FOLLOW_rule__EnumAttribute__Group__1_in_rule__EnumAttribute__Group__04159 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_22_in_rule__EnumAttribute__Group__0__Impl4187 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__EnumAttribute__Group__1__Impl_in_rule__EnumAttribute__Group__14218 = new BitSet(new long[]{0x0000000000000002L});
@@ -9073,8 +9137,8 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
public static final BitSet FOLLOW_ruleQualifiedName_in_rule__PackageImport__EPackageAssignment_15398 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_rule__NamespaceImport__ImportedNamespaceAssignment_15433 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleQualifiedName_in_rule__CustomNameMapping__EClassAssignment_25468 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_rule__CustomNameMapping__NameFeatureAssignment_45507 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_rule__Feature__EFeatureAssignment_05546 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_rule__CustomNameMapping__NameFeatureAssignment_45507 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_rule__Feature__EFeatureAssignment_05546 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleValue_in_rule__Feature__ValueAssignment_25581 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleQualifiedName_in_rule__NewObject__EClassAssignment_05616 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleValidID_in_rule__NewObject__NameAssignment_15651 = new BitSet(new long[]{0x0000000000000002L});
@@ -9084,7 +9148,7 @@ public class InternalEFactoryParser extends AbstractInternalContentAssistParser
public static final BitSet FOLLOW_ruleFeature_in_rule__Value__FeaturesAssignment_2_15783 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleValue_in_rule__MultiValue__ValuesAssignment_25814 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleQualifiedName_in_rule__Reference__ValueAssignment5849 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_rule__EnumAttribute__ValueAssignment_15888 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_rule__EnumAttribute__ValueAssignment_15888 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_STRING_in_rule__StringAttribute__ValueAssignment5923 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleLong_in_rule__IntegerAttribute__ValueAssignment5954 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleDouble_in_rule__DoubleAttribute__ValueAssignment5985 = new BitSet(new long[]{0x0000000000000002L});
diff --git a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/AbstractEFactoryRuntimeModule.java b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/AbstractEFactoryRuntimeModule.java
index d6ad79c..179fcb6 100644
--- a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/AbstractEFactoryRuntimeModule.java
+++ b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/AbstractEFactoryRuntimeModule.java
@@ -35,6 +35,11 @@ public abstract class AbstractEFactoryRuntimeModule extends DefaultRuntimeModule
}
// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
+ public java.lang.ClassLoader bindClassLoaderToInstance() {
+ return getClass().getClassLoader();
+ }
+
+ // contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
return org.eclipse.emf.eson.services.EFactoryGrammarAccess.class;
}
@@ -105,6 +110,11 @@ public abstract class AbstractEFactoryRuntimeModule extends DefaultRuntimeModule
}
// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
+ public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
+ return org.eclipse.xtext.scoping.impl.DefaultGlobalScopeProvider.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
}
@@ -139,29 +149,4 @@ public abstract class AbstractEFactoryRuntimeModule extends DefaultRuntimeModule
return org.eclipse.emf.eson.formatting.EFactoryFormatter.class;
}
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public java.lang.ClassLoader bindClassLoaderToInstance() {
- return getClass().getClassLoader();
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public org.eclipse.xtext.common.types.TypesFactory bindTypesFactoryToInstance() {
- return org.eclipse.xtext.common.types.TypesFactory.eINSTANCE;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
- return org.eclipse.xtext.common.types.access.ClasspathTypeProviderFactory.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
- return org.eclipse.xtext.common.types.xtext.ClasspathBasedTypeScopeProvider.class;
- }
-
- // contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
- public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
- return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;
- }
-
}
diff --git a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/EFactory.xtextbin b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/EFactory.xtextbin
index 14b448c..287ebf1 100644
--- a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/EFactory.xtextbin
+++ b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/EFactory.xtextbin
Binary files differ
diff --git a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g
index 669cc0f..43b2d1a 100644
--- a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g
+++ b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g
@@ -321,10 +321,12 @@ ruleCustomNameMapping returns [EObject current=null]
$current = createModelElement(grammarAccess.getCustomNameMappingRule());
}
}
- otherlv_4=RULE_ID
- {
- newLeafNode(otherlv_4, grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeCrossReference_4_0());
- }
+ {
+ newCompositeNode(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeCrossReference_4_0());
+ }
+ ruleQualifiedName {
+ afterParserOrEnumRuleCall();
+ }
)
) otherlv_5='}'
@@ -359,10 +361,12 @@ ruleFeature returns [EObject current=null]
$current = createModelElement(grammarAccess.getFeatureRule());
}
}
- otherlv_0=RULE_ID
- {
- newLeafNode(otherlv_0, grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureCrossReference_0_0());
- }
+ {
+ newCompositeNode(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureCrossReference_0_0());
+ }
+ ruleQualifiedName {
+ afterParserOrEnumRuleCall();
+ }
)
) otherlv_1=':'
@@ -810,10 +814,12 @@ ruleEnumAttribute returns [EObject current=null]
$current = createModelElement(grammarAccess.getEnumAttributeRule());
}
}
- otherlv_1=RULE_ID
- {
- newLeafNode(otherlv_1, grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralCrossReference_1_0());
- }
+ {
+ newCompositeNode(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralCrossReference_1_0());
+ }
+ ruleQualifiedName {
+ afterParserOrEnumRuleCall();
+ }
)
))
diff --git a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.tokens b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.tokens
index 20cda40..6f6eda8 100644
--- a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.tokens
+++ b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.tokens
@@ -1,4 +1,4 @@
-RULE_ID=4
+RULE_ID=5
T__27=27
T__26=26
T__25=25
@@ -12,7 +12,7 @@ RULE_SL_COMMENT=10
RULE_ML_COMMENT=9
RULE_LONG_UNSIGNED=7
T__19=19
-RULE_STRING=5
+RULE_STRING=4
T__16=16
T__15=15
T__18=18
diff --git a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactoryLexer.java b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactoryLexer.java
index ae686f3..d258cbb 100644
--- a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactoryLexer.java
+++ b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactoryLexer.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
@SuppressWarnings("all")
public class InternalEFactoryLexer extends Lexer {
- public static final int RULE_ID=4;
+ public static final int RULE_ID=5;
public static final int T__27=27;
public static final int T__26=26;
public static final int T__25=25;
@@ -27,7 +27,7 @@ public class InternalEFactoryLexer extends Lexer {
public static final int RULE_ML_COMMENT=9;
public static final int RULE_LONG_UNSIGNED=7;
public static final int T__19=19;
- public static final int RULE_STRING=5;
+ public static final int RULE_STRING=4;
public static final int T__16=16;
public static final int T__15=15;
public static final int T__18=18;
@@ -363,8 +363,8 @@ public class InternalEFactoryLexer extends Lexer {
try {
int _type = RULE_LONG_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1357:14: ( RULE_LONG_UNSIGNED RULE_ID )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1357:16: RULE_LONG_UNSIGNED RULE_ID
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1363:14: ( RULE_LONG_UNSIGNED RULE_ID )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1363:16: RULE_LONG_UNSIGNED RULE_ID
{
mRULE_LONG_UNSIGNED();
mRULE_ID();
@@ -384,10 +384,10 @@ public class InternalEFactoryLexer extends Lexer {
try {
int _type = RULE_LONG_UNSIGNED;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1359:20: ( ( '0' .. '9' )+ )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1359:22: ( '0' .. '9' )+
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:20: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:22: ( '0' .. '9' )+
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1359:22: ( '0' .. '9' )+
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:22: ( '0' .. '9' )+
int cnt1=0;
loop1:
do {
@@ -400,10 +400,10 @@ public class InternalEFactoryLexer extends Lexer {
switch (alt1) {
- case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1359:23: '0' .. '9'
- {
- matchRange('0','9');
+ case 1 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:23: '0' .. '9'
+ {
+ matchRange('0','9');
}
break;
@@ -433,10 +433,10 @@ public class InternalEFactoryLexer extends Lexer {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1361:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' | ',' | '-' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | ',' | '-' | '0' .. '9' )* )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1361:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' | ',' | '-' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | ',' | '-' | '0' .. '9' )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1367:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' | ',' | '-' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | ',' | '-' | '0' .. '9' )* )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1367:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' | ',' | '-' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | ',' | '-' | '0' .. '9' )*
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1361:11: ( '^' )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1367:11: ( '^' )?
int alt2=2;
int LA2_0 = input.LA(1);
@@ -445,7 +445,7 @@ public class InternalEFactoryLexer extends Lexer {
}
switch (alt2) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1361:11: '^'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1367:11: '^'
{
match('^');
@@ -463,7 +463,7 @@ public class InternalEFactoryLexer extends Lexer {
recover(mse);
throw mse;}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1361:48: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | ',' | '-' | '0' .. '9' )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1367:48: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | ',' | '-' | '0' .. '9' )*
loop3:
do {
int alt3=2;
@@ -512,10 +512,10 @@ public class InternalEFactoryLexer extends Lexer {
try {
int _type = RULE_INT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1363:10: ( ( '0' .. '9' )+ )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1363:12: ( '0' .. '9' )+
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:10: ( ( '0' .. '9' )+ )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:12: ( '0' .. '9' )+
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1363:12: ( '0' .. '9' )+
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:12: ( '0' .. '9' )+
int cnt4=0;
loop4:
do {
@@ -528,10 +528,10 @@ public class InternalEFactoryLexer extends Lexer {
switch (alt4) {
- case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1363:13: '0' .. '9'
- {
- matchRange('0','9');
+ case 1 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:13: '0' .. '9'
+ {
+ matchRange('0','9');
}
break;
@@ -561,10 +561,10 @@ public class InternalEFactoryLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt7=2;
int LA7_0 = input.LA(1);
@@ -582,10 +582,10 @@ public class InternalEFactoryLexer extends Lexer {
}
switch (alt7) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
loop5:
do {
int alt5=3;
@@ -600,27 +600,27 @@ public class InternalEFactoryLexer extends Lexer {
switch (alt5) {
- case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
- {
- 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' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
-
- }
- break;
- case 2 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:66: ~ ( ( '\\\\' | '\"' ) )
- {
- if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
- input.consume();
+ case 1 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ {
+ 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' && input.LA(1)<='u') ) {
+ input.consume();
+
+ }
+ else {
+ MismatchedSetException mse = new MismatchedSetException(null,input);
+ recover(mse);
+ throw mse;}
+
+
+ }
+ break;
+ case 2 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:66: ~ ( ( '\\\\' | '\"' ) )
+ {
+ if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
+ input.consume();
}
else {
@@ -642,10 +642,10 @@ public class InternalEFactoryLexer extends Lexer {
}
break;
case 2 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop6:
do {
int alt6=3;
@@ -660,27 +660,27 @@ public class InternalEFactoryLexer extends Lexer {
switch (alt6) {
- case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
- {
- 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' && input.LA(1)<='u') ) {
- input.consume();
-
- }
- else {
- MismatchedSetException mse = new MismatchedSetException(null,input);
- recover(mse);
- throw mse;}
-
-
- }
- break;
- case 2 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1365:137: ~ ( ( '\\\\' | '\\'' ) )
- {
- if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
- input.consume();
+ case 1 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+ {
+ 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' && input.LA(1)<='u') ) {
+ input.consume();
+
+ }
+ else {
+ MismatchedSetException mse = new MismatchedSetException(null,input);
+ recover(mse);
+ throw mse;}
+
+
+ }
+ break;
+ case 2 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:137: ~ ( ( '\\\\' | '\\'' ) )
+ {
+ if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
+ input.consume();
}
else {
@@ -720,12 +720,12 @@ public class InternalEFactoryLexer extends Lexer {
try {
int _type = RULE_ML_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1367:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1367:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1373:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1373:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1367:24: ( options {greedy=false; } : . )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1373:24: ( options {greedy=false; } : . )*
loop8:
do {
int alt8=2;
@@ -749,10 +749,10 @@ public class InternalEFactoryLexer extends Lexer {
switch (alt8) {
- case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1367:52: .
- {
- matchAny();
+ case 1 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1373:52: .
+ {
+ matchAny();
}
break;
@@ -780,12 +780,12 @@ public class InternalEFactoryLexer extends Lexer {
try {
int _type = RULE_SL_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1375:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1375:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1375:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop9:
do {
int alt9=2;
@@ -797,11 +797,11 @@ public class InternalEFactoryLexer extends Lexer {
switch (alt9) {
- case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369: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)<='\uFFFF') ) {
- input.consume();
+ case 1 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1375: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)<='\uFFFF') ) {
+ input.consume();
}
else {
@@ -818,7 +818,7 @@ public class InternalEFactoryLexer extends Lexer {
}
} while (true);
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:40: ( ( '\\r' )? '\\n' )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1375:40: ( ( '\\r' )? '\\n' )?
int alt11=2;
int LA11_0 = input.LA(1);
@@ -827,9 +827,9 @@ public class InternalEFactoryLexer extends Lexer {
}
switch (alt11) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:41: ( '\\r' )? '\\n'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1375:41: ( '\\r' )? '\\n'
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:41: ( '\\r' )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1375:41: ( '\\r' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -838,7 +838,7 @@ public class InternalEFactoryLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1369:41: '\\r'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1375:41: '\\r'
{
match('\r');
@@ -870,10 +870,10 @@ public class InternalEFactoryLexer extends Lexer {
try {
int _type = RULE_WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1377:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1377:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1371:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1377:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt12=0;
loop12:
do {
@@ -927,8 +927,8 @@ public class InternalEFactoryLexer extends Lexer {
try {
int _type = RULE_ANY_OTHER;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1373:16: ( . )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1373:18: .
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1379:16: ( . )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1379:18: .
{
matchAny();
diff --git a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactoryParser.java b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactoryParser.java
index 5c3b356..88d7560 100644
--- a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactoryParser.java
+++ b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactoryParser.java
@@ -22,9 +22,9 @@ import java.util.HashMap;
@SuppressWarnings("all")
public class InternalEFactoryParser extends AbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_LONG_ID", "RULE_LONG_UNSIGNED", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'use'", "'.*'", "'import'", "'@Name'", "'{'", "'='", "'}'", "':'", "'['", "']'", "'NULL'", "'.'", "'true'", "'false'", "'-'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_LONG_ID", "RULE_LONG_UNSIGNED", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'use'", "'.*'", "'import'", "'@Name'", "'{'", "'='", "'}'", "':'", "'['", "']'", "'NULL'", "'.'", "'true'", "'false'", "'-'"
};
- public static final int RULE_ID=4;
+ public static final int RULE_ID=5;
public static final int T__27=27;
public static final int T__26=26;
public static final int T__25=25;
@@ -39,7 +39,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
public static final int RULE_ML_COMMENT=9;
public static final int RULE_LONG_UNSIGNED=7;
public static final int T__19=19;
- public static final int RULE_STRING=5;
+ public static final int RULE_STRING=4;
public static final int T__16=16;
public static final int T__15=15;
public static final int T__18=18;
@@ -743,24 +743,23 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleCustomNameMapping"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:286:1: ruleCustomNameMapping returns [EObject current=null] : (otherlv_0= '@Name' otherlv_1= '{' ( ( ruleQualifiedName ) ) otherlv_3= '=' ( (otherlv_4= RULE_ID ) ) otherlv_5= '}' ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:286:1: ruleCustomNameMapping returns [EObject current=null] : (otherlv_0= '@Name' otherlv_1= '{' ( ( ruleQualifiedName ) ) otherlv_3= '=' ( ( ruleQualifiedName ) ) otherlv_5= '}' ) ;
public final EObject ruleCustomNameMapping() throws RecognitionException {
EObject current = null;
Token otherlv_0=null;
Token otherlv_1=null;
Token otherlv_3=null;
- Token otherlv_4=null;
Token otherlv_5=null;
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:289:28: ( (otherlv_0= '@Name' otherlv_1= '{' ( ( ruleQualifiedName ) ) otherlv_3= '=' ( (otherlv_4= RULE_ID ) ) otherlv_5= '}' ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:290:1: (otherlv_0= '@Name' otherlv_1= '{' ( ( ruleQualifiedName ) ) otherlv_3= '=' ( (otherlv_4= RULE_ID ) ) otherlv_5= '}' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:289:28: ( (otherlv_0= '@Name' otherlv_1= '{' ( ( ruleQualifiedName ) ) otherlv_3= '=' ( ( ruleQualifiedName ) ) otherlv_5= '}' ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:290:1: (otherlv_0= '@Name' otherlv_1= '{' ( ( ruleQualifiedName ) ) otherlv_3= '=' ( ( ruleQualifiedName ) ) otherlv_5= '}' )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:290:1: (otherlv_0= '@Name' otherlv_1= '{' ( ( ruleQualifiedName ) ) otherlv_3= '=' ( (otherlv_4= RULE_ID ) ) otherlv_5= '}' )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:290:3: otherlv_0= '@Name' otherlv_1= '{' ( ( ruleQualifiedName ) ) otherlv_3= '=' ( (otherlv_4= RULE_ID ) ) otherlv_5= '}'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:290:1: (otherlv_0= '@Name' otherlv_1= '{' ( ( ruleQualifiedName ) ) otherlv_3= '=' ( ( ruleQualifiedName ) ) otherlv_5= '}' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:290:3: otherlv_0= '@Name' otherlv_1= '{' ( ( ruleQualifiedName ) ) otherlv_3= '=' ( ( ruleQualifiedName ) ) otherlv_5= '}'
{
otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleCustomNameMapping592); if (state.failed) return current;
if ( state.backtracking==0 ) {
@@ -814,11 +813,11 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
newLeafNode(otherlv_3, grammarAccess.getCustomNameMappingAccess().getEqualsSignKeyword_3());
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:317:1: ( (otherlv_4= RULE_ID ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:318:1: (otherlv_4= RULE_ID )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:317:1: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:318:1: ( ruleQualifiedName )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:318:1: (otherlv_4= RULE_ID )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:319:3: otherlv_4= RULE_ID
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:318:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:319:3: ruleQualifiedName
{
if ( state.backtracking==0 ) {
@@ -827,11 +826,20 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
}
- otherlv_4=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCustomNameMapping659); if (state.failed) return current;
if ( state.backtracking==0 ) {
- newLeafNode(otherlv_4, grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeCrossReference_4_0());
-
+ newCompositeNode(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeCrossReference_4_0());
+
+ }
+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleCustomNameMapping662);
+ ruleQualifiedName();
+
+ state._fsp--;
+ if (state.failed) return current;
+ if ( state.backtracking==0 ) {
+
+ afterParserOrEnumRuleCall();
+
}
}
@@ -839,7 +847,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- otherlv_5=(Token)match(input,19,FOLLOW_19_in_ruleCustomNameMapping671); if (state.failed) return current;
+ otherlv_5=(Token)match(input,19,FOLLOW_19_in_ruleCustomNameMapping674); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_5, grammarAccess.getCustomNameMappingAccess().getRightCurlyBracketKeyword_5());
@@ -868,7 +876,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleFeature"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:342:1: entryRuleFeature returns [EObject current=null] : iv_ruleFeature= ruleFeature EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:344:1: entryRuleFeature returns [EObject current=null] : iv_ruleFeature= ruleFeature EOF ;
public final EObject entryRuleFeature() throws RecognitionException {
EObject current = null;
@@ -876,13 +884,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:343:2: (iv_ruleFeature= ruleFeature EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:344:2: iv_ruleFeature= ruleFeature EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:345:2: (iv_ruleFeature= ruleFeature EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:346:2: iv_ruleFeature= ruleFeature EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getFeatureRule());
}
- pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature707);
+ pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature710);
iv_ruleFeature=ruleFeature();
state._fsp--;
@@ -890,7 +898,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleFeature;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleFeature717); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleFeature720); if (state.failed) return current;
}
@@ -908,11 +916,10 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleFeature"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:351:1: ruleFeature returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (lv_value_2_0= ruleValue ) )? ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:353:1: ruleFeature returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) otherlv_1= ':' ( (lv_value_2_0= ruleValue ) )? ) ;
public final EObject ruleFeature() throws RecognitionException {
EObject current = null;
- Token otherlv_0=null;
Token otherlv_1=null;
EObject lv_value_2_0 = null;
@@ -920,17 +927,17 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:354:28: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (lv_value_2_0= ruleValue ) )? ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:355:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (lv_value_2_0= ruleValue ) )? )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:356:28: ( ( ( ( ruleQualifiedName ) ) otherlv_1= ':' ( (lv_value_2_0= ruleValue ) )? ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:357:1: ( ( ( ruleQualifiedName ) ) otherlv_1= ':' ( (lv_value_2_0= ruleValue ) )? )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:355:1: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (lv_value_2_0= ruleValue ) )? )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:355:2: ( (otherlv_0= RULE_ID ) ) otherlv_1= ':' ( (lv_value_2_0= ruleValue ) )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:357:1: ( ( ( ruleQualifiedName ) ) otherlv_1= ':' ( (lv_value_2_0= ruleValue ) )? )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:357:2: ( ( ruleQualifiedName ) ) otherlv_1= ':' ( (lv_value_2_0= ruleValue ) )?
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:355:2: ( (otherlv_0= RULE_ID ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:356:1: (otherlv_0= RULE_ID )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:357:2: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:358:1: ( ruleQualifiedName )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:356:1: (otherlv_0= RULE_ID )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:357:3: otherlv_0= RULE_ID
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:358:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:359:3: ruleQualifiedName
{
if ( state.backtracking==0 ) {
@@ -939,11 +946,20 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
}
- otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFeature762); if (state.failed) return current;
if ( state.backtracking==0 ) {
- newLeafNode(otherlv_0, grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureCrossReference_0_0());
-
+ newCompositeNode(grammarAccess.getFeatureAccess().getEFeatureEStructuralFeatureCrossReference_0_0());
+
+ }
+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleFeature768);
+ ruleQualifiedName();
+
+ state._fsp--;
+ if (state.failed) return current;
+ if ( state.backtracking==0 ) {
+
+ afterParserOrEnumRuleCall();
+
}
}
@@ -951,39 +967,28 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- otherlv_1=(Token)match(input,20,FOLLOW_20_in_ruleFeature774); if (state.failed) return current;
+ otherlv_1=(Token)match(input,20,FOLLOW_20_in_ruleFeature780); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_1, grammarAccess.getFeatureAccess().getColonKeyword_1());
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:372:1: ( (lv_value_2_0= ruleValue ) )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:376:1: ( (lv_value_2_0= ruleValue ) )?
int alt4=2;
- int LA4_0 = input.LA(1);
-
- if ( ((LA4_0>=RULE_STRING && LA4_0<=RULE_LONG_UNSIGNED)||(LA4_0>=20 && LA4_0<=21)||LA4_0==23||(LA4_0>=25 && LA4_0<=27)) ) {
- alt4=1;
- }
- else if ( (LA4_0==RULE_ID) ) {
- int LA4_2 = input.LA(2);
-
- if ( (LA4_2==EOF||LA4_2==RULE_ID||(LA4_2>=RULE_LONG_ID && LA4_2<=RULE_LONG_UNSIGNED)||LA4_2==17||LA4_2==19||LA4_2==24) ) {
- alt4=1;
- }
- }
+ alt4 = dfa4.predict(input);
switch (alt4) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:373:1: (lv_value_2_0= ruleValue )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:377:1: (lv_value_2_0= ruleValue )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:373:1: (lv_value_2_0= ruleValue )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:374:3: lv_value_2_0= ruleValue
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:377:1: (lv_value_2_0= ruleValue )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:378:3: lv_value_2_0= ruleValue
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getFeatureAccess().getValueValueParserRuleCall_2_0());
}
- pushFollow(FOLLOW_ruleValue_in_ruleFeature795);
+ pushFollow(FOLLOW_ruleValue_in_ruleFeature801);
lv_value_2_0=ruleValue();
state._fsp--;
@@ -1033,7 +1038,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleNewObject"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:398:1: entryRuleNewObject returns [EObject current=null] : iv_ruleNewObject= ruleNewObject EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:402:1: entryRuleNewObject returns [EObject current=null] : iv_ruleNewObject= ruleNewObject EOF ;
public final EObject entryRuleNewObject() throws RecognitionException {
EObject current = null;
@@ -1041,13 +1046,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:399:2: (iv_ruleNewObject= ruleNewObject EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:400:2: iv_ruleNewObject= ruleNewObject EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:403:2: (iv_ruleNewObject= ruleNewObject EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:404:2: iv_ruleNewObject= ruleNewObject EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getNewObjectRule());
}
- pushFollow(FOLLOW_ruleNewObject_in_entryRuleNewObject832);
+ pushFollow(FOLLOW_ruleNewObject_in_entryRuleNewObject838);
iv_ruleNewObject=ruleNewObject();
state._fsp--;
@@ -1055,7 +1060,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleNewObject;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleNewObject842); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleNewObject848); if (state.failed) return current;
}
@@ -1073,7 +1078,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleNewObject"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:407:1: ruleNewObject returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( (lv_name_1_0= ruleValidID ) )? otherlv_2= '{' ( (lv_features_3_0= ruleFeature ) )* otherlv_4= '}' ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:411:1: ruleNewObject returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( (lv_name_1_0= ruleValidID ) )? otherlv_2= '{' ( (lv_features_3_0= ruleFeature ) )* otherlv_4= '}' ) ;
public final EObject ruleNewObject() throws RecognitionException {
EObject current = null;
@@ -1087,17 +1092,17 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:410:28: ( ( ( ( ruleQualifiedName ) ) ( (lv_name_1_0= ruleValidID ) )? otherlv_2= '{' ( (lv_features_3_0= ruleFeature ) )* otherlv_4= '}' ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:411:1: ( ( ( ruleQualifiedName ) ) ( (lv_name_1_0= ruleValidID ) )? otherlv_2= '{' ( (lv_features_3_0= ruleFeature ) )* otherlv_4= '}' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:414:28: ( ( ( ( ruleQualifiedName ) ) ( (lv_name_1_0= ruleValidID ) )? otherlv_2= '{' ( (lv_features_3_0= ruleFeature ) )* otherlv_4= '}' ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:415:1: ( ( ( ruleQualifiedName ) ) ( (lv_name_1_0= ruleValidID ) )? otherlv_2= '{' ( (lv_features_3_0= ruleFeature ) )* otherlv_4= '}' )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:411:1: ( ( ( ruleQualifiedName ) ) ( (lv_name_1_0= ruleValidID ) )? otherlv_2= '{' ( (lv_features_3_0= ruleFeature ) )* otherlv_4= '}' )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:411:2: ( ( ruleQualifiedName ) ) ( (lv_name_1_0= ruleValidID ) )? otherlv_2= '{' ( (lv_features_3_0= ruleFeature ) )* otherlv_4= '}'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:415:1: ( ( ( ruleQualifiedName ) ) ( (lv_name_1_0= ruleValidID ) )? otherlv_2= '{' ( (lv_features_3_0= ruleFeature ) )* otherlv_4= '}' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:415:2: ( ( ruleQualifiedName ) ) ( (lv_name_1_0= ruleValidID ) )? otherlv_2= '{' ( (lv_features_3_0= ruleFeature ) )* otherlv_4= '}'
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:411:2: ( ( ruleQualifiedName ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:412:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:415:2: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:416:1: ( ruleQualifiedName )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:412:1: ( ruleQualifiedName )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:413:3: ruleQualifiedName
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:416:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:417:3: ruleQualifiedName
{
if ( state.backtracking==0 ) {
@@ -1111,7 +1116,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
newCompositeNode(grammarAccess.getNewObjectAccess().getEClassEClassCrossReference_0_0());
}
- pushFollow(FOLLOW_ruleQualifiedName_in_ruleNewObject890);
+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleNewObject896);
ruleQualifiedName();
state._fsp--;
@@ -1127,26 +1132,26 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:426:2: ( (lv_name_1_0= ruleValidID ) )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:430:2: ( (lv_name_1_0= ruleValidID ) )?
int alt5=2;
int LA5_0 = input.LA(1);
- if ( (LA5_0==RULE_ID||(LA5_0>=RULE_LONG_ID && LA5_0<=RULE_LONG_UNSIGNED)) ) {
+ if ( ((LA5_0>=RULE_ID && LA5_0<=RULE_LONG_UNSIGNED)) ) {
alt5=1;
}
switch (alt5) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:427:1: (lv_name_1_0= ruleValidID )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:431:1: (lv_name_1_0= ruleValidID )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:427:1: (lv_name_1_0= ruleValidID )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:428:3: lv_name_1_0= ruleValidID
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:431:1: (lv_name_1_0= ruleValidID )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:432:3: lv_name_1_0= ruleValidID
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getNewObjectAccess().getNameValidIDParserRuleCall_1_0());
}
- pushFollow(FOLLOW_ruleValidID_in_ruleNewObject911);
+ pushFollow(FOLLOW_ruleValidID_in_ruleNewObject917);
lv_name_1_0=ruleValidID();
state._fsp--;
@@ -1173,39 +1178,39 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- otherlv_2=(Token)match(input,17,FOLLOW_17_in_ruleNewObject924); if (state.failed) return current;
+ otherlv_2=(Token)match(input,17,FOLLOW_17_in_ruleNewObject930); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_2, grammarAccess.getNewObjectAccess().getLeftCurlyBracketKeyword_2());
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:448:1: ( (lv_features_3_0= ruleFeature ) )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:452:1: ( (lv_features_3_0= ruleFeature ) )*
loop6:
do {
int alt6=2;
int LA6_0 = input.LA(1);
- if ( (LA6_0==RULE_ID) ) {
+ if ( ((LA6_0>=RULE_ID && LA6_0<=RULE_LONG_UNSIGNED)) ) {
alt6=1;
}
switch (alt6) {
- case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:449:1: (lv_features_3_0= ruleFeature )
- {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:449:1: (lv_features_3_0= ruleFeature )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:450:3: lv_features_3_0= ruleFeature
- {
- if ( state.backtracking==0 ) {
-
- newCompositeNode(grammarAccess.getNewObjectAccess().getFeaturesFeatureParserRuleCall_3_0());
-
- }
- pushFollow(FOLLOW_ruleFeature_in_ruleNewObject945);
- lv_features_3_0=ruleFeature();
+ case 1 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:453:1: (lv_features_3_0= ruleFeature )
+ {
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:453:1: (lv_features_3_0= ruleFeature )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:454:3: lv_features_3_0= ruleFeature
+ {
+ if ( state.backtracking==0 ) {
- state._fsp--;
+ newCompositeNode(grammarAccess.getNewObjectAccess().getFeaturesFeatureParserRuleCall_3_0());
+
+ }
+ pushFollow(FOLLOW_ruleFeature_in_ruleNewObject951);
+ lv_features_3_0=ruleFeature();
+
+ state._fsp--;
if (state.failed) return current;
if ( state.backtracking==0 ) {
@@ -1232,7 +1237,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
} while (true);
- otherlv_4=(Token)match(input,19,FOLLOW_19_in_ruleNewObject958); if (state.failed) return current;
+ otherlv_4=(Token)match(input,19,FOLLOW_19_in_ruleNewObject964); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_4, grammarAccess.getNewObjectAccess().getRightCurlyBracketKeyword_4());
@@ -1261,7 +1266,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleValue"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:478:1: entryRuleValue returns [EObject current=null] : iv_ruleValue= ruleValue EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:482:1: entryRuleValue returns [EObject current=null] : iv_ruleValue= ruleValue EOF ;
public final EObject entryRuleValue() throws RecognitionException {
EObject current = null;
@@ -1269,13 +1274,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:479:2: (iv_ruleValue= ruleValue EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:480:2: iv_ruleValue= ruleValue EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:483:2: (iv_ruleValue= ruleValue EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:484:2: iv_ruleValue= ruleValue EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getValueRule());
}
- pushFollow(FOLLOW_ruleValue_in_entryRuleValue994);
+ pushFollow(FOLLOW_ruleValue_in_entryRuleValue1000);
iv_ruleValue=ruleValue();
state._fsp--;
@@ -1283,7 +1288,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleValue;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleValue1004); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleValue1010); if (state.failed) return current;
}
@@ -1301,7 +1306,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleValue"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:487:1: ruleValue returns [EObject current=null] : (this_MultiValue_0= ruleMultiValue | this_Attribute_1= ruleAttribute | ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () ) | ( ( ruleReference )=>this_Reference_9= ruleReference ) ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:491:1: ruleValue returns [EObject current=null] : (this_MultiValue_0= ruleMultiValue | this_Attribute_1= ruleAttribute | ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () ) | ( ( ruleReference )=>this_Reference_9= ruleReference ) ) ;
public final EObject ruleValue() throws RecognitionException {
EObject current = null;
@@ -1321,22 +1326,22 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:490:28: ( (this_MultiValue_0= ruleMultiValue | this_Attribute_1= ruleAttribute | ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () ) | ( ( ruleReference )=>this_Reference_9= ruleReference ) ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:491:1: (this_MultiValue_0= ruleMultiValue | this_Attribute_1= ruleAttribute | ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () ) | ( ( ruleReference )=>this_Reference_9= ruleReference ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:494:28: ( (this_MultiValue_0= ruleMultiValue | this_Attribute_1= ruleAttribute | ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () ) | ( ( ruleReference )=>this_Reference_9= ruleReference ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:495:1: (this_MultiValue_0= ruleMultiValue | this_Attribute_1= ruleAttribute | ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () ) | ( ( ruleReference )=>this_Reference_9= ruleReference ) )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:491:1: (this_MultiValue_0= ruleMultiValue | this_Attribute_1= ruleAttribute | ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () ) | ( ( ruleReference )=>this_Reference_9= ruleReference ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:495:1: (this_MultiValue_0= ruleMultiValue | this_Attribute_1= ruleAttribute | ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () ) | ( ( ruleReference )=>this_Reference_9= ruleReference ) )
int alt9=4;
alt9 = dfa9.predict(input);
switch (alt9) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:492:5: this_MultiValue_0= ruleMultiValue
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:496:5: this_MultiValue_0= ruleMultiValue
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getValueAccess().getMultiValueParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleMultiValue_in_ruleValue1051);
+ pushFollow(FOLLOW_ruleMultiValue_in_ruleValue1057);
this_MultiValue_0=ruleMultiValue();
state._fsp--;
@@ -1351,14 +1356,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:502:5: this_Attribute_1= ruleAttribute
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:506:5: this_Attribute_1= ruleAttribute
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getValueAccess().getAttributeParserRuleCall_1());
}
- pushFollow(FOLLOW_ruleAttribute_in_ruleValue1078);
+ pushFollow(FOLLOW_ruleAttribute_in_ruleValue1084);
this_Attribute_1=ruleAttribute();
state._fsp--;
@@ -1373,19 +1378,19 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:511:6: ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:515:6: ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:511:6: ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:511:7: ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' ()
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:515:6: ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:515:7: ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' ()
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:511:7: ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:511:8: ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:515:7: ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:515:8: ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:521:5: ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:521:6: () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:525:5: ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:525:6: () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{'
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:521:6: ()
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:522:5:
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:525:6: ()
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:526:5:
{
if ( state.backtracking==0 ) {
@@ -1397,11 +1402,11 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:527:2: ( ( ruleQualifiedName ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:528:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:531:2: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:532:1: ( ruleQualifiedName )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:528:1: ( ruleQualifiedName )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:529:3: ruleQualifiedName
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:532:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:533:3: ruleQualifiedName
{
if ( state.backtracking==0 ) {
@@ -1415,7 +1420,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
newCompositeNode(grammarAccess.getValueAccess().getEClassEClassCrossReference_2_0_0_1_0());
}
- pushFollow(FOLLOW_ruleQualifiedName_in_ruleValue1151);
+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleValue1157);
ruleQualifiedName();
state._fsp--;
@@ -1431,26 +1436,26 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:542:2: ( (lv_name_4_0= ruleValidID ) )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:546:2: ( (lv_name_4_0= ruleValidID ) )?
int alt7=2;
int LA7_0 = input.LA(1);
- if ( (LA7_0==RULE_ID||(LA7_0>=RULE_LONG_ID && LA7_0<=RULE_LONG_UNSIGNED)) ) {
+ if ( ((LA7_0>=RULE_ID && LA7_0<=RULE_LONG_UNSIGNED)) ) {
alt7=1;
}
switch (alt7) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:543:1: (lv_name_4_0= ruleValidID )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:547:1: (lv_name_4_0= ruleValidID )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:543:1: (lv_name_4_0= ruleValidID )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:544:3: lv_name_4_0= ruleValidID
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:547:1: (lv_name_4_0= ruleValidID )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:548:3: lv_name_4_0= ruleValidID
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getValueAccess().getNameValidIDParserRuleCall_2_0_0_2_0());
}
- pushFollow(FOLLOW_ruleValidID_in_ruleValue1172);
+ pushFollow(FOLLOW_ruleValidID_in_ruleValue1178);
lv_name_4_0=ruleValidID();
state._fsp--;
@@ -1477,7 +1482,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- otherlv_5=(Token)match(input,17,FOLLOW_17_in_ruleValue1185); if (state.failed) return current;
+ otherlv_5=(Token)match(input,17,FOLLOW_17_in_ruleValue1191); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_5, grammarAccess.getValueAccess().getLeftCurlyBracketKeyword_2_0_0_3());
@@ -1489,33 +1494,33 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:564:3: ( (lv_features_6_0= ruleFeature ) )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:568:3: ( (lv_features_6_0= ruleFeature ) )*
loop8:
do {
int alt8=2;
int LA8_0 = input.LA(1);
- if ( (LA8_0==RULE_ID) ) {
+ if ( ((LA8_0>=RULE_ID && LA8_0<=RULE_LONG_UNSIGNED)) ) {
alt8=1;
}
switch (alt8) {
- case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:565:1: (lv_features_6_0= ruleFeature )
- {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:565:1: (lv_features_6_0= ruleFeature )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:566:3: lv_features_6_0= ruleFeature
- {
- if ( state.backtracking==0 ) {
-
- newCompositeNode(grammarAccess.getValueAccess().getFeaturesFeatureParserRuleCall_2_1_0());
-
- }
- pushFollow(FOLLOW_ruleFeature_in_ruleValue1208);
- lv_features_6_0=ruleFeature();
+ case 1 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:569:1: (lv_features_6_0= ruleFeature )
+ {
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:569:1: (lv_features_6_0= ruleFeature )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:570:3: lv_features_6_0= ruleFeature
+ {
+ if ( state.backtracking==0 ) {
+
+ newCompositeNode(grammarAccess.getValueAccess().getFeaturesFeatureParserRuleCall_2_1_0());
- state._fsp--;
+ }
+ pushFollow(FOLLOW_ruleFeature_in_ruleValue1214);
+ lv_features_6_0=ruleFeature();
+
+ state._fsp--;
if (state.failed) return current;
if ( state.backtracking==0 ) {
@@ -1542,14 +1547,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
} while (true);
- otherlv_7=(Token)match(input,19,FOLLOW_19_in_ruleValue1221); if (state.failed) return current;
+ otherlv_7=(Token)match(input,19,FOLLOW_19_in_ruleValue1227); if (state.failed) return current;
if ( state.backtracking==0 ) {
- newLeafNode(otherlv_7, grammarAccess.getValueAccess().getRightCurlyBracketKeyword_2_2());
-
+ newLeafNode(otherlv_7, grammarAccess.getValueAccess().getRightCurlyBracketKeyword_2_2());
+
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:586:1: ()
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:587:5:
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:590:1: ()
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:591:5:
{
if ( state.backtracking==0 ) {
@@ -1568,17 +1573,17 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 4 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:593:6: ( ( ruleReference )=>this_Reference_9= ruleReference )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:597:6: ( ( ruleReference )=>this_Reference_9= ruleReference )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:593:6: ( ( ruleReference )=>this_Reference_9= ruleReference )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:593:7: ( ruleReference )=>this_Reference_9= ruleReference
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:597:6: ( ( ruleReference )=>this_Reference_9= ruleReference )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:597:7: ( ruleReference )=>this_Reference_9= ruleReference
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getValueAccess().getReferenceParserRuleCall_3());
}
- pushFollow(FOLLOW_ruleReference_in_ruleValue1265);
+ pushFollow(FOLLOW_ruleReference_in_ruleValue1271);
this_Reference_9=ruleReference();
state._fsp--;
@@ -1618,7 +1623,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleMultiValue"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:610:1: entryRuleMultiValue returns [EObject current=null] : iv_ruleMultiValue= ruleMultiValue EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:614:1: entryRuleMultiValue returns [EObject current=null] : iv_ruleMultiValue= ruleMultiValue EOF ;
public final EObject entryRuleMultiValue() throws RecognitionException {
EObject current = null;
@@ -1626,13 +1631,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:611:2: (iv_ruleMultiValue= ruleMultiValue EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:612:2: iv_ruleMultiValue= ruleMultiValue EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:615:2: (iv_ruleMultiValue= ruleMultiValue EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:616:2: iv_ruleMultiValue= ruleMultiValue EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getMultiValueRule());
}
- pushFollow(FOLLOW_ruleMultiValue_in_entryRuleMultiValue1301);
+ pushFollow(FOLLOW_ruleMultiValue_in_entryRuleMultiValue1307);
iv_ruleMultiValue=ruleMultiValue();
state._fsp--;
@@ -1640,7 +1645,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleMultiValue;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleMultiValue1311); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleMultiValue1317); if (state.failed) return current;
}
@@ -1658,7 +1663,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleMultiValue"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:619:1: ruleMultiValue returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_values_2_0= ruleValue ) )* otherlv_3= ']' ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:623:1: ruleMultiValue returns [EObject current=null] : ( () otherlv_1= '[' ( (lv_values_2_0= ruleValue ) )* otherlv_3= ']' ) ;
public final EObject ruleMultiValue() throws RecognitionException {
EObject current = null;
@@ -1667,17 +1672,17 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
EObject lv_values_2_0 = null;
- enterRule();
-
+ enterRule();
+
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:622:28: ( ( () otherlv_1= '[' ( (lv_values_2_0= ruleValue ) )* otherlv_3= ']' ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:623:1: ( () otherlv_1= '[' ( (lv_values_2_0= ruleValue ) )* otherlv_3= ']' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:626:28: ( ( () otherlv_1= '[' ( (lv_values_2_0= ruleValue ) )* otherlv_3= ']' ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:627:1: ( () otherlv_1= '[' ( (lv_values_2_0= ruleValue ) )* otherlv_3= ']' )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:623:1: ( () otherlv_1= '[' ( (lv_values_2_0= ruleValue ) )* otherlv_3= ']' )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:623:2: () otherlv_1= '[' ( (lv_values_2_0= ruleValue ) )* otherlv_3= ']'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:627:1: ( () otherlv_1= '[' ( (lv_values_2_0= ruleValue ) )* otherlv_3= ']' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:627:2: () otherlv_1= '[' ( (lv_values_2_0= ruleValue ) )* otherlv_3= ']'
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:623:2: ()
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:624:5:
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:627:2: ()
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:628:5:
{
if ( state.backtracking==0 ) {
@@ -1689,39 +1694,39 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- otherlv_1=(Token)match(input,21,FOLLOW_21_in_ruleMultiValue1357); if (state.failed) return current;
+ otherlv_1=(Token)match(input,21,FOLLOW_21_in_ruleMultiValue1363); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_1, grammarAccess.getMultiValueAccess().getLeftSquareBracketKeyword_1());
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:633:1: ( (lv_values_2_0= ruleValue ) )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:637:1: ( (lv_values_2_0= ruleValue ) )*
loop10:
do {
int alt10=2;
int LA10_0 = input.LA(1);
- if ( ((LA10_0>=RULE_ID && LA10_0<=RULE_LONG_UNSIGNED)||(LA10_0>=20 && LA10_0<=21)||LA10_0==23||(LA10_0>=25 && LA10_0<=27)) ) {
+ if ( ((LA10_0>=RULE_STRING && LA10_0<=RULE_LONG_UNSIGNED)||(LA10_0>=20 && LA10_0<=21)||LA10_0==23||(LA10_0>=25 && LA10_0<=27)) ) {
alt10=1;
}
switch (alt10) {
- case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:634:1: (lv_values_2_0= ruleValue )
- {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:634:1: (lv_values_2_0= ruleValue )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:635:3: lv_values_2_0= ruleValue
- {
- if ( state.backtracking==0 ) {
-
- newCompositeNode(grammarAccess.getMultiValueAccess().getValuesValueParserRuleCall_2_0());
-
- }
- pushFollow(FOLLOW_ruleValue_in_ruleMultiValue1378);
- lv_values_2_0=ruleValue();
+ case 1 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:638:1: (lv_values_2_0= ruleValue )
+ {
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:638:1: (lv_values_2_0= ruleValue )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:639:3: lv_values_2_0= ruleValue
+ {
+ if ( state.backtracking==0 ) {
- state._fsp--;
+ newCompositeNode(grammarAccess.getMultiValueAccess().getValuesValueParserRuleCall_2_0());
+
+ }
+ pushFollow(FOLLOW_ruleValue_in_ruleMultiValue1384);
+ lv_values_2_0=ruleValue();
+
+ state._fsp--;
if (state.failed) return current;
if ( state.backtracking==0 ) {
@@ -1748,7 +1753,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
} while (true);
- otherlv_3=(Token)match(input,22,FOLLOW_22_in_ruleMultiValue1391); if (state.failed) return current;
+ otherlv_3=(Token)match(input,22,FOLLOW_22_in_ruleMultiValue1397); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_3, grammarAccess.getMultiValueAccess().getRightSquareBracketKeyword_3());
@@ -1777,7 +1782,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleReference"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:663:1: entryRuleReference returns [EObject current=null] : iv_ruleReference= ruleReference EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:667:1: entryRuleReference returns [EObject current=null] : iv_ruleReference= ruleReference EOF ;
public final EObject entryRuleReference() throws RecognitionException {
EObject current = null;
@@ -1785,13 +1790,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:664:2: (iv_ruleReference= ruleReference EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:665:2: iv_ruleReference= ruleReference EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:668:2: (iv_ruleReference= ruleReference EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:669:2: iv_ruleReference= ruleReference EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getReferenceRule());
}
- pushFollow(FOLLOW_ruleReference_in_entryRuleReference1427);
+ pushFollow(FOLLOW_ruleReference_in_entryRuleReference1433);
iv_ruleReference=ruleReference();
state._fsp--;
@@ -1799,7 +1804,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleReference;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleReference1437); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleReference1443); if (state.failed) return current;
}
@@ -1817,21 +1822,21 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleReference"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:672:1: ruleReference returns [EObject current=null] : ( ( ruleQualifiedName ) ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:676:1: ruleReference returns [EObject current=null] : ( ( ruleQualifiedName ) ) ;
public final EObject ruleReference() throws RecognitionException {
EObject current = null;
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:675:28: ( ( ( ruleQualifiedName ) ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:676:1: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:679:28: ( ( ( ruleQualifiedName ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:680:1: ( ( ruleQualifiedName ) )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:676:1: ( ( ruleQualifiedName ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:677:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:680:1: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:681:1: ( ruleQualifiedName )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:677:1: ( ruleQualifiedName )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:678:3: ruleQualifiedName
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:681:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:682:3: ruleQualifiedName
{
if ( state.backtracking==0 ) {
@@ -1845,7 +1850,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
newCompositeNode(grammarAccess.getReferenceAccess().getValueEObjectCrossReference_0());
}
- pushFollow(FOLLOW_ruleQualifiedName_in_ruleReference1484);
+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleReference1490);
ruleQualifiedName();
state._fsp--;
@@ -1881,7 +1886,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:699:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:703:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ;
public final EObject entryRuleAttribute() throws RecognitionException {
EObject current = null;
@@ -1889,13 +1894,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:700:2: (iv_ruleAttribute= ruleAttribute EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:701:2: iv_ruleAttribute= ruleAttribute EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:704:2: (iv_ruleAttribute= ruleAttribute EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:705:2: iv_ruleAttribute= ruleAttribute EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getAttributeRule());
}
- pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1519);
+ pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1525);
iv_ruleAttribute=ruleAttribute();
state._fsp--;
@@ -1903,7 +1908,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleAttribute;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute1529); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute1535); if (state.failed) return current;
}
@@ -1921,7 +1926,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:708:1: ruleAttribute returns [EObject current=null] : (this_EnumAttribute_0= ruleEnumAttribute | this_StringAttribute_1= ruleStringAttribute | this_IntegerAttribute_2= ruleIntegerAttribute | this_BooleanAttribute_3= ruleBooleanAttribute | this_DoubleAttribute_4= ruleDoubleAttribute | this_DateAttribute_5= ruleDateAttribute | this_NullAttribute_6= ruleNullAttribute ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:712:1: ruleAttribute returns [EObject current=null] : (this_EnumAttribute_0= ruleEnumAttribute | this_StringAttribute_1= ruleStringAttribute | this_IntegerAttribute_2= ruleIntegerAttribute | this_BooleanAttribute_3= ruleBooleanAttribute | this_DoubleAttribute_4= ruleDoubleAttribute | this_DateAttribute_5= ruleDateAttribute | this_NullAttribute_6= ruleNullAttribute ) ;
public final EObject ruleAttribute() throws RecognitionException {
EObject current = null;
@@ -1943,22 +1948,22 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:711:28: ( (this_EnumAttribute_0= ruleEnumAttribute | this_StringAttribute_1= ruleStringAttribute | this_IntegerAttribute_2= ruleIntegerAttribute | this_BooleanAttribute_3= ruleBooleanAttribute | this_DoubleAttribute_4= ruleDoubleAttribute | this_DateAttribute_5= ruleDateAttribute | this_NullAttribute_6= ruleNullAttribute ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:712:1: (this_EnumAttribute_0= ruleEnumAttribute | this_StringAttribute_1= ruleStringAttribute | this_IntegerAttribute_2= ruleIntegerAttribute | this_BooleanAttribute_3= ruleBooleanAttribute | this_DoubleAttribute_4= ruleDoubleAttribute | this_DateAttribute_5= ruleDateAttribute | this_NullAttribute_6= ruleNullAttribute )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:715:28: ( (this_EnumAttribute_0= ruleEnumAttribute | this_StringAttribute_1= ruleStringAttribute | this_IntegerAttribute_2= ruleIntegerAttribute | this_BooleanAttribute_3= ruleBooleanAttribute | this_DoubleAttribute_4= ruleDoubleAttribute | this_DateAttribute_5= ruleDateAttribute | this_NullAttribute_6= ruleNullAttribute ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:716:1: (this_EnumAttribute_0= ruleEnumAttribute | this_StringAttribute_1= ruleStringAttribute | this_IntegerAttribute_2= ruleIntegerAttribute | this_BooleanAttribute_3= ruleBooleanAttribute | this_DoubleAttribute_4= ruleDoubleAttribute | this_DateAttribute_5= ruleDateAttribute | this_NullAttribute_6= ruleNullAttribute )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:712:1: (this_EnumAttribute_0= ruleEnumAttribute | this_StringAttribute_1= ruleStringAttribute | this_IntegerAttribute_2= ruleIntegerAttribute | this_BooleanAttribute_3= ruleBooleanAttribute | this_DoubleAttribute_4= ruleDoubleAttribute | this_DateAttribute_5= ruleDateAttribute | this_NullAttribute_6= ruleNullAttribute )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:716:1: (this_EnumAttribute_0= ruleEnumAttribute | this_StringAttribute_1= ruleStringAttribute | this_IntegerAttribute_2= ruleIntegerAttribute | this_BooleanAttribute_3= ruleBooleanAttribute | this_DoubleAttribute_4= ruleDoubleAttribute | this_DateAttribute_5= ruleDateAttribute | this_NullAttribute_6= ruleNullAttribute )
int alt11=7;
alt11 = dfa11.predict(input);
switch (alt11) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:713:5: this_EnumAttribute_0= ruleEnumAttribute
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:717:5: this_EnumAttribute_0= ruleEnumAttribute
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getAttributeAccess().getEnumAttributeParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleEnumAttribute_in_ruleAttribute1576);
+ pushFollow(FOLLOW_ruleEnumAttribute_in_ruleAttribute1582);
this_EnumAttribute_0=ruleEnumAttribute();
state._fsp--;
@@ -1973,14 +1978,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:723:5: this_StringAttribute_1= ruleStringAttribute
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:727:5: this_StringAttribute_1= ruleStringAttribute
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getAttributeAccess().getStringAttributeParserRuleCall_1());
}
- pushFollow(FOLLOW_ruleStringAttribute_in_ruleAttribute1603);
+ pushFollow(FOLLOW_ruleStringAttribute_in_ruleAttribute1609);
this_StringAttribute_1=ruleStringAttribute();
state._fsp--;
@@ -1995,14 +2000,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:733:5: this_IntegerAttribute_2= ruleIntegerAttribute
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:737:5: this_IntegerAttribute_2= ruleIntegerAttribute
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getAttributeAccess().getIntegerAttributeParserRuleCall_2());
}
- pushFollow(FOLLOW_ruleIntegerAttribute_in_ruleAttribute1630);
+ pushFollow(FOLLOW_ruleIntegerAttribute_in_ruleAttribute1636);
this_IntegerAttribute_2=ruleIntegerAttribute();
state._fsp--;
@@ -2017,14 +2022,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 4 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:743:5: this_BooleanAttribute_3= ruleBooleanAttribute
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:747:5: this_BooleanAttribute_3= ruleBooleanAttribute
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getAttributeAccess().getBooleanAttributeParserRuleCall_3());
}
- pushFollow(FOLLOW_ruleBooleanAttribute_in_ruleAttribute1657);
+ pushFollow(FOLLOW_ruleBooleanAttribute_in_ruleAttribute1663);
this_BooleanAttribute_3=ruleBooleanAttribute();
state._fsp--;
@@ -2039,14 +2044,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 5 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:753:5: this_DoubleAttribute_4= ruleDoubleAttribute
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:757:5: this_DoubleAttribute_4= ruleDoubleAttribute
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getAttributeAccess().getDoubleAttributeParserRuleCall_4());
}
- pushFollow(FOLLOW_ruleDoubleAttribute_in_ruleAttribute1684);
+ pushFollow(FOLLOW_ruleDoubleAttribute_in_ruleAttribute1690);
this_DoubleAttribute_4=ruleDoubleAttribute();
state._fsp--;
@@ -2061,14 +2066,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 6 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:763:5: this_DateAttribute_5= ruleDateAttribute
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:767:5: this_DateAttribute_5= ruleDateAttribute
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getAttributeAccess().getDateAttributeParserRuleCall_5());
}
- pushFollow(FOLLOW_ruleDateAttribute_in_ruleAttribute1711);
+ pushFollow(FOLLOW_ruleDateAttribute_in_ruleAttribute1717);
this_DateAttribute_5=ruleDateAttribute();
state._fsp--;
@@ -2083,14 +2088,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 7 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:773:5: this_NullAttribute_6= ruleNullAttribute
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:777:5: this_NullAttribute_6= ruleNullAttribute
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getAttributeAccess().getNullAttributeParserRuleCall_6());
}
- pushFollow(FOLLOW_ruleNullAttribute_in_ruleAttribute1738);
+ pushFollow(FOLLOW_ruleNullAttribute_in_ruleAttribute1744);
this_NullAttribute_6=ruleNullAttribute();
state._fsp--;
@@ -2127,7 +2132,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleEnumAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:789:1: entryRuleEnumAttribute returns [EObject current=null] : iv_ruleEnumAttribute= ruleEnumAttribute EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:793:1: entryRuleEnumAttribute returns [EObject current=null] : iv_ruleEnumAttribute= ruleEnumAttribute EOF ;
public final EObject entryRuleEnumAttribute() throws RecognitionException {
EObject current = null;
@@ -2135,13 +2140,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:790:2: (iv_ruleEnumAttribute= ruleEnumAttribute EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:791:2: iv_ruleEnumAttribute= ruleEnumAttribute EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:794:2: (iv_ruleEnumAttribute= ruleEnumAttribute EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:795:2: iv_ruleEnumAttribute= ruleEnumAttribute EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getEnumAttributeRule());
}
- pushFollow(FOLLOW_ruleEnumAttribute_in_entryRuleEnumAttribute1773);
+ pushFollow(FOLLOW_ruleEnumAttribute_in_entryRuleEnumAttribute1779);
iv_ruleEnumAttribute=ruleEnumAttribute();
state._fsp--;
@@ -2149,7 +2154,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleEnumAttribute;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAttribute1783); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleEnumAttribute1789); if (state.failed) return current;
}
@@ -2167,33 +2172,32 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleEnumAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:798:1: ruleEnumAttribute returns [EObject current=null] : (otherlv_0= ':' ( (otherlv_1= RULE_ID ) ) ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:802:1: ruleEnumAttribute returns [EObject current=null] : (otherlv_0= ':' ( ( ruleQualifiedName ) ) ) ;
public final EObject ruleEnumAttribute() throws RecognitionException {
EObject current = null;
Token otherlv_0=null;
- Token otherlv_1=null;
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:801:28: ( (otherlv_0= ':' ( (otherlv_1= RULE_ID ) ) ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:802:1: (otherlv_0= ':' ( (otherlv_1= RULE_ID ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:805:28: ( (otherlv_0= ':' ( ( ruleQualifiedName ) ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:806:1: (otherlv_0= ':' ( ( ruleQualifiedName ) ) )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:802:1: (otherlv_0= ':' ( (otherlv_1= RULE_ID ) ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:802:3: otherlv_0= ':' ( (otherlv_1= RULE_ID ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:806:1: (otherlv_0= ':' ( ( ruleQualifiedName ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:806:3: otherlv_0= ':' ( ( ruleQualifiedName ) )
{
- otherlv_0=(Token)match(input,20,FOLLOW_20_in_ruleEnumAttribute1820); if (state.failed) return current;
+ otherlv_0=(Token)match(input,20,FOLLOW_20_in_ruleEnumAttribute1826); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(otherlv_0, grammarAccess.getEnumAttributeAccess().getColonKeyword_0());
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:806:1: ( (otherlv_1= RULE_ID ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:807:1: (otherlv_1= RULE_ID )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:810:1: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:811:1: ( ruleQualifiedName )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:807:1: (otherlv_1= RULE_ID )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:808:3: otherlv_1= RULE_ID
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:811:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:812:3: ruleQualifiedName
{
if ( state.backtracking==0 ) {
@@ -2202,11 +2206,20 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
}
- otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEnumAttribute1840); if (state.failed) return current;
if ( state.backtracking==0 ) {
- newLeafNode(otherlv_1, grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralCrossReference_1_0());
-
+ newCompositeNode(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralCrossReference_1_0());
+
+ }
+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleEnumAttribute1849);
+ ruleQualifiedName();
+
+ state._fsp--;
+ if (state.failed) return current;
+ if ( state.backtracking==0 ) {
+
+ afterParserOrEnumRuleCall();
+
}
}
@@ -2237,7 +2250,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleStringAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:827:1: entryRuleStringAttribute returns [EObject current=null] : iv_ruleStringAttribute= ruleStringAttribute EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:833:1: entryRuleStringAttribute returns [EObject current=null] : iv_ruleStringAttribute= ruleStringAttribute EOF ;
public final EObject entryRuleStringAttribute() throws RecognitionException {
EObject current = null;
@@ -2245,13 +2258,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:828:2: (iv_ruleStringAttribute= ruleStringAttribute EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:829:2: iv_ruleStringAttribute= ruleStringAttribute EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:834:2: (iv_ruleStringAttribute= ruleStringAttribute EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:835:2: iv_ruleStringAttribute= ruleStringAttribute EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getStringAttributeRule());
}
- pushFollow(FOLLOW_ruleStringAttribute_in_entryRuleStringAttribute1876);
+ pushFollow(FOLLOW_ruleStringAttribute_in_entryRuleStringAttribute1885);
iv_ruleStringAttribute=ruleStringAttribute();
state._fsp--;
@@ -2259,7 +2272,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleStringAttribute;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleStringAttribute1886); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleStringAttribute1895); if (state.failed) return current;
}
@@ -2277,7 +2290,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleStringAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:836:1: ruleStringAttribute returns [EObject current=null] : ( (lv_value_0_0= RULE_STRING ) ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:842:1: ruleStringAttribute returns [EObject current=null] : ( (lv_value_0_0= RULE_STRING ) ) ;
public final EObject ruleStringAttribute() throws RecognitionException {
EObject current = null;
@@ -2286,16 +2299,16 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:839:28: ( ( (lv_value_0_0= RULE_STRING ) ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:840:1: ( (lv_value_0_0= RULE_STRING ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:845:28: ( ( (lv_value_0_0= RULE_STRING ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:846:1: ( (lv_value_0_0= RULE_STRING ) )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:840:1: ( (lv_value_0_0= RULE_STRING ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:841:1: (lv_value_0_0= RULE_STRING )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:846:1: ( (lv_value_0_0= RULE_STRING ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:847:1: (lv_value_0_0= RULE_STRING )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:841:1: (lv_value_0_0= RULE_STRING )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:842:3: lv_value_0_0= RULE_STRING
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:847:1: (lv_value_0_0= RULE_STRING )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:848:3: lv_value_0_0= RULE_STRING
{
- lv_value_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringAttribute1927); if (state.failed) return current;
+ lv_value_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleStringAttribute1936); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_value_0_0, grammarAccess.getStringAttributeAccess().getValueSTRINGTerminalRuleCall_0());
@@ -2339,7 +2352,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleIntegerAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:866:1: entryRuleIntegerAttribute returns [EObject current=null] : iv_ruleIntegerAttribute= ruleIntegerAttribute EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:872:1: entryRuleIntegerAttribute returns [EObject current=null] : iv_ruleIntegerAttribute= ruleIntegerAttribute EOF ;
public final EObject entryRuleIntegerAttribute() throws RecognitionException {
EObject current = null;
@@ -2347,13 +2360,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:867:2: (iv_ruleIntegerAttribute= ruleIntegerAttribute EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:868:2: iv_ruleIntegerAttribute= ruleIntegerAttribute EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:873:2: (iv_ruleIntegerAttribute= ruleIntegerAttribute EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:874:2: iv_ruleIntegerAttribute= ruleIntegerAttribute EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getIntegerAttributeRule());
}
- pushFollow(FOLLOW_ruleIntegerAttribute_in_entryRuleIntegerAttribute1967);
+ pushFollow(FOLLOW_ruleIntegerAttribute_in_entryRuleIntegerAttribute1976);
iv_ruleIntegerAttribute=ruleIntegerAttribute();
state._fsp--;
@@ -2361,7 +2374,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleIntegerAttribute;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleIntegerAttribute1977); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleIntegerAttribute1986); if (state.failed) return current;
}
@@ -2379,7 +2392,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleIntegerAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:875:1: ruleIntegerAttribute returns [EObject current=null] : ( (lv_value_0_0= ruleLong ) ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:881:1: ruleIntegerAttribute returns [EObject current=null] : ( (lv_value_0_0= ruleLong ) ) ;
public final EObject ruleIntegerAttribute() throws RecognitionException {
EObject current = null;
@@ -2389,21 +2402,21 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:878:28: ( ( (lv_value_0_0= ruleLong ) ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:879:1: ( (lv_value_0_0= ruleLong ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:884:28: ( ( (lv_value_0_0= ruleLong ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:885:1: ( (lv_value_0_0= ruleLong ) )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:879:1: ( (lv_value_0_0= ruleLong ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:880:1: (lv_value_0_0= ruleLong )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:885:1: ( (lv_value_0_0= ruleLong ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:886:1: (lv_value_0_0= ruleLong )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:880:1: (lv_value_0_0= ruleLong )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:881:3: lv_value_0_0= ruleLong
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:886:1: (lv_value_0_0= ruleLong )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:887:3: lv_value_0_0= ruleLong
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getIntegerAttributeAccess().getValueLongParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleLong_in_ruleIntegerAttribute2022);
+ pushFollow(FOLLOW_ruleLong_in_ruleIntegerAttribute2031);
lv_value_0_0=ruleLong();
state._fsp--;
@@ -2447,7 +2460,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleDoubleAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:905:1: entryRuleDoubleAttribute returns [EObject current=null] : iv_ruleDoubleAttribute= ruleDoubleAttribute EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:911:1: entryRuleDoubleAttribute returns [EObject current=null] : iv_ruleDoubleAttribute= ruleDoubleAttribute EOF ;
public final EObject entryRuleDoubleAttribute() throws RecognitionException {
EObject current = null;
@@ -2455,13 +2468,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:906:2: (iv_ruleDoubleAttribute= ruleDoubleAttribute EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:907:2: iv_ruleDoubleAttribute= ruleDoubleAttribute EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:912:2: (iv_ruleDoubleAttribute= ruleDoubleAttribute EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:913:2: iv_ruleDoubleAttribute= ruleDoubleAttribute EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getDoubleAttributeRule());
}
- pushFollow(FOLLOW_ruleDoubleAttribute_in_entryRuleDoubleAttribute2057);
+ pushFollow(FOLLOW_ruleDoubleAttribute_in_entryRuleDoubleAttribute2066);
iv_ruleDoubleAttribute=ruleDoubleAttribute();
state._fsp--;
@@ -2469,7 +2482,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleDoubleAttribute;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleDoubleAttribute2067); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleDoubleAttribute2076); if (state.failed) return current;
}
@@ -2487,7 +2500,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleDoubleAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:914:1: ruleDoubleAttribute returns [EObject current=null] : ( (lv_value_0_0= ruleDouble ) ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:920:1: ruleDoubleAttribute returns [EObject current=null] : ( (lv_value_0_0= ruleDouble ) ) ;
public final EObject ruleDoubleAttribute() throws RecognitionException {
EObject current = null;
@@ -2497,21 +2510,21 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:917:28: ( ( (lv_value_0_0= ruleDouble ) ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:918:1: ( (lv_value_0_0= ruleDouble ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:923:28: ( ( (lv_value_0_0= ruleDouble ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:924:1: ( (lv_value_0_0= ruleDouble ) )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:918:1: ( (lv_value_0_0= ruleDouble ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:919:1: (lv_value_0_0= ruleDouble )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:924:1: ( (lv_value_0_0= ruleDouble ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:925:1: (lv_value_0_0= ruleDouble )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:919:1: (lv_value_0_0= ruleDouble )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:920:3: lv_value_0_0= ruleDouble
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:925:1: (lv_value_0_0= ruleDouble )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:926:3: lv_value_0_0= ruleDouble
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getDoubleAttributeAccess().getValueDoubleParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleDouble_in_ruleDoubleAttribute2112);
+ pushFollow(FOLLOW_ruleDouble_in_ruleDoubleAttribute2121);
lv_value_0_0=ruleDouble();
state._fsp--;
@@ -2555,7 +2568,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleDateAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:944:1: entryRuleDateAttribute returns [EObject current=null] : iv_ruleDateAttribute= ruleDateAttribute EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:950:1: entryRuleDateAttribute returns [EObject current=null] : iv_ruleDateAttribute= ruleDateAttribute EOF ;
public final EObject entryRuleDateAttribute() throws RecognitionException {
EObject current = null;
@@ -2563,13 +2576,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:945:2: (iv_ruleDateAttribute= ruleDateAttribute EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:946:2: iv_ruleDateAttribute= ruleDateAttribute EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:951:2: (iv_ruleDateAttribute= ruleDateAttribute EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:952:2: iv_ruleDateAttribute= ruleDateAttribute EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getDateAttributeRule());
}
- pushFollow(FOLLOW_ruleDateAttribute_in_entryRuleDateAttribute2147);
+ pushFollow(FOLLOW_ruleDateAttribute_in_entryRuleDateAttribute2156);
iv_ruleDateAttribute=ruleDateAttribute();
state._fsp--;
@@ -2577,7 +2590,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleDateAttribute;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleDateAttribute2157); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleDateAttribute2166); if (state.failed) return current;
}
@@ -2595,7 +2608,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleDateAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:953:1: ruleDateAttribute returns [EObject current=null] : ( (lv_value_0_0= ruleDate ) ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:959:1: ruleDateAttribute returns [EObject current=null] : ( (lv_value_0_0= ruleDate ) ) ;
public final EObject ruleDateAttribute() throws RecognitionException {
EObject current = null;
@@ -2605,21 +2618,21 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:956:28: ( ( (lv_value_0_0= ruleDate ) ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:957:1: ( (lv_value_0_0= ruleDate ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:962:28: ( ( (lv_value_0_0= ruleDate ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:963:1: ( (lv_value_0_0= ruleDate ) )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:957:1: ( (lv_value_0_0= ruleDate ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:958:1: (lv_value_0_0= ruleDate )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:963:1: ( (lv_value_0_0= ruleDate ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:964:1: (lv_value_0_0= ruleDate )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:958:1: (lv_value_0_0= ruleDate )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:959:3: lv_value_0_0= ruleDate
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:964:1: (lv_value_0_0= ruleDate )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:965:3: lv_value_0_0= ruleDate
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getDateAttributeAccess().getValueDateParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleDate_in_ruleDateAttribute2202);
+ pushFollow(FOLLOW_ruleDate_in_ruleDateAttribute2211);
lv_value_0_0=ruleDate();
state._fsp--;
@@ -2663,7 +2676,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleNullAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:983:1: entryRuleNullAttribute returns [EObject current=null] : iv_ruleNullAttribute= ruleNullAttribute EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:989:1: entryRuleNullAttribute returns [EObject current=null] : iv_ruleNullAttribute= ruleNullAttribute EOF ;
public final EObject entryRuleNullAttribute() throws RecognitionException {
EObject current = null;
@@ -2671,13 +2684,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:984:2: (iv_ruleNullAttribute= ruleNullAttribute EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:985:2: iv_ruleNullAttribute= ruleNullAttribute EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:990:2: (iv_ruleNullAttribute= ruleNullAttribute EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:991:2: iv_ruleNullAttribute= ruleNullAttribute EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getNullAttributeRule());
}
- pushFollow(FOLLOW_ruleNullAttribute_in_entryRuleNullAttribute2237);
+ pushFollow(FOLLOW_ruleNullAttribute_in_entryRuleNullAttribute2246);
iv_ruleNullAttribute=ruleNullAttribute();
state._fsp--;
@@ -2685,7 +2698,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleNullAttribute;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleNullAttribute2247); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleNullAttribute2256); if (state.failed) return current;
}
@@ -2703,7 +2716,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleNullAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:992:1: ruleNullAttribute returns [EObject current=null] : ( (lv_value_0_0= 'NULL' ) ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:998:1: ruleNullAttribute returns [EObject current=null] : ( (lv_value_0_0= 'NULL' ) ) ;
public final EObject ruleNullAttribute() throws RecognitionException {
EObject current = null;
@@ -2712,16 +2725,16 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:995:28: ( ( (lv_value_0_0= 'NULL' ) ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:996:1: ( (lv_value_0_0= 'NULL' ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1001:28: ( ( (lv_value_0_0= 'NULL' ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1002:1: ( (lv_value_0_0= 'NULL' ) )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:996:1: ( (lv_value_0_0= 'NULL' ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:997:1: (lv_value_0_0= 'NULL' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1002:1: ( (lv_value_0_0= 'NULL' ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1003:1: (lv_value_0_0= 'NULL' )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:997:1: (lv_value_0_0= 'NULL' )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:998:3: lv_value_0_0= 'NULL'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1003:1: (lv_value_0_0= 'NULL' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1004:3: lv_value_0_0= 'NULL'
{
- lv_value_0_0=(Token)match(input,23,FOLLOW_23_in_ruleNullAttribute2289); if (state.failed) return current;
+ lv_value_0_0=(Token)match(input,23,FOLLOW_23_in_ruleNullAttribute2298); if (state.failed) return current;
if ( state.backtracking==0 ) {
newLeafNode(lv_value_0_0, grammarAccess.getNullAttributeAccess().getValueNULLKeyword_0());
@@ -2761,7 +2774,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleBooleanAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1019:1: entryRuleBooleanAttribute returns [EObject current=null] : iv_ruleBooleanAttribute= ruleBooleanAttribute EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1025:1: entryRuleBooleanAttribute returns [EObject current=null] : iv_ruleBooleanAttribute= ruleBooleanAttribute EOF ;
public final EObject entryRuleBooleanAttribute() throws RecognitionException {
EObject current = null;
@@ -2769,13 +2782,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1020:2: (iv_ruleBooleanAttribute= ruleBooleanAttribute EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1021:2: iv_ruleBooleanAttribute= ruleBooleanAttribute EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1026:2: (iv_ruleBooleanAttribute= ruleBooleanAttribute EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1027:2: iv_ruleBooleanAttribute= ruleBooleanAttribute EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getBooleanAttributeRule());
}
- pushFollow(FOLLOW_ruleBooleanAttribute_in_entryRuleBooleanAttribute2337);
+ pushFollow(FOLLOW_ruleBooleanAttribute_in_entryRuleBooleanAttribute2346);
iv_ruleBooleanAttribute=ruleBooleanAttribute();
state._fsp--;
@@ -2783,7 +2796,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleBooleanAttribute;
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanAttribute2347); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleBooleanAttribute2356); if (state.failed) return current;
}
@@ -2801,7 +2814,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleBooleanAttribute"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1028:1: ruleBooleanAttribute returns [EObject current=null] : ( (lv_value_0_0= ruleBoolean ) ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1034:1: ruleBooleanAttribute returns [EObject current=null] : ( (lv_value_0_0= ruleBoolean ) ) ;
public final EObject ruleBooleanAttribute() throws RecognitionException {
EObject current = null;
@@ -2811,21 +2824,21 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1031:28: ( ( (lv_value_0_0= ruleBoolean ) ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1032:1: ( (lv_value_0_0= ruleBoolean ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1037:28: ( ( (lv_value_0_0= ruleBoolean ) ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1038:1: ( (lv_value_0_0= ruleBoolean ) )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1032:1: ( (lv_value_0_0= ruleBoolean ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1033:1: (lv_value_0_0= ruleBoolean )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1038:1: ( (lv_value_0_0= ruleBoolean ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1039:1: (lv_value_0_0= ruleBoolean )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1033:1: (lv_value_0_0= ruleBoolean )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1034:3: lv_value_0_0= ruleBoolean
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1039:1: (lv_value_0_0= ruleBoolean )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1040:3: lv_value_0_0= ruleBoolean
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getBooleanAttributeAccess().getValueBooleanParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleBoolean_in_ruleBooleanAttribute2392);
+ pushFollow(FOLLOW_ruleBoolean_in_ruleBooleanAttribute2401);
lv_value_0_0=ruleBoolean();
state._fsp--;
@@ -2869,7 +2882,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleQualifiedNameWithWildcard"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1058:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1064:1: entryRuleQualifiedNameWithWildcard returns [String current=null] : iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF ;
public final String entryRuleQualifiedNameWithWildcard() throws RecognitionException {
String current = null;
@@ -2877,13 +2890,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1059:2: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1060:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1065:2: (iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1066:2: iv_ruleQualifiedNameWithWildcard= ruleQualifiedNameWithWildcard EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getQualifiedNameWithWildcardRule());
}
- pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard2428);
+ pushFollow(FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard2437);
iv_ruleQualifiedNameWithWildcard=ruleQualifiedNameWithWildcard();
state._fsp--;
@@ -2891,7 +2904,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleQualifiedNameWithWildcard.getText();
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard2439); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard2448); if (state.failed) return current;
}
@@ -2909,7 +2922,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleQualifiedNameWithWildcard"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1067:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName (kw= '.*' )? ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1073:1: ruleQualifiedNameWithWildcard returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QualifiedName_0= ruleQualifiedName (kw= '.*' )? ) ;
public final AntlrDatatypeRuleToken ruleQualifiedNameWithWildcard() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -2920,18 +2933,18 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1070:28: ( (this_QualifiedName_0= ruleQualifiedName (kw= '.*' )? ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1071:1: (this_QualifiedName_0= ruleQualifiedName (kw= '.*' )? )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1076:28: ( (this_QualifiedName_0= ruleQualifiedName (kw= '.*' )? ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1077:1: (this_QualifiedName_0= ruleQualifiedName (kw= '.*' )? )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1071:1: (this_QualifiedName_0= ruleQualifiedName (kw= '.*' )? )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1072:5: this_QualifiedName_0= ruleQualifiedName (kw= '.*' )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1077:1: (this_QualifiedName_0= ruleQualifiedName (kw= '.*' )? )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1078:5: this_QualifiedName_0= ruleQualifiedName (kw= '.*' )?
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getQualifiedNameWithWildcardAccess().getQualifiedNameParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard2486);
+ pushFollow(FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard2495);
this_QualifiedName_0=ruleQualifiedName();
state._fsp--;
@@ -2946,7 +2959,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
afterParserOrEnumRuleCall();
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1082:1: (kw= '.*' )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1088:1: (kw= '.*' )?
int alt12=2;
int LA12_0 = input.LA(1);
@@ -2955,9 +2968,9 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
switch (alt12) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1083:2: kw= '.*'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1089:2: kw= '.*'
{
- kw=(Token)match(input,14,FOLLOW_14_in_ruleQualifiedNameWithWildcard2505); if (state.failed) return current;
+ kw=(Token)match(input,14,FOLLOW_14_in_ruleQualifiedNameWithWildcard2514); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(kw);
@@ -2993,7 +3006,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleQualifiedName"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1096:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1102:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
public final String entryRuleQualifiedName() throws RecognitionException {
String current = null;
@@ -3001,13 +3014,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1097:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1098:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1103:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1104:2: iv_ruleQualifiedName= ruleQualifiedName EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getQualifiedNameRule());
}
- pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2548);
+ pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2557);
iv_ruleQualifiedName=ruleQualifiedName();
state._fsp--;
@@ -3015,7 +3028,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleQualifiedName.getText();
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2559); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2568); if (state.failed) return current;
}
@@ -3033,7 +3046,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleQualifiedName"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1105:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1111:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -3046,18 +3059,18 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1108:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1109:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1114:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1115:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1109:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1110:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1115:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1116:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName2606);
+ pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName2615);
this_ValidID_0=ruleValidID();
state._fsp--;
@@ -3072,7 +3085,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
afterParserOrEnumRuleCall();
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1120:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1126:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
loop13:
do {
int alt13=2;
@@ -3084,16 +3097,16 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
switch (alt13) {
- case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1120:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
- {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1120:2: ( ( '.' )=>kw= '.' )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1120:3: ( '.' )=>kw= '.'
- {
- kw=(Token)match(input,24,FOLLOW_24_in_ruleQualifiedName2634); if (state.failed) return current;
- if ( state.backtracking==0 ) {
-
- current.merge(kw);
+ case 1 :
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1126:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
+ {
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1126:2: ( ( '.' )=>kw= '.' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1126:3: ( '.' )=>kw= '.'
+ {
+ kw=(Token)match(input,24,FOLLOW_24_in_ruleQualifiedName2643); if (state.failed) return current;
+ if ( state.backtracking==0 ) {
+
+ current.merge(kw);
newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0());
}
@@ -3102,13 +3115,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
- newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1());
-
- }
- pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName2657);
- this_ValidID_2=ruleValidID();
+ newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1());
- state._fsp--;
+ }
+ pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName2666);
+ this_ValidID_2=ruleValidID();
+
+ state._fsp--;
if (state.failed) return current;
if ( state.backtracking==0 ) {
@@ -3152,7 +3165,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleValidID"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1147:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1153:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
public final String entryRuleValidID() throws RecognitionException {
String current = null;
@@ -3160,13 +3173,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1148:2: (iv_ruleValidID= ruleValidID EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1149:2: iv_ruleValidID= ruleValidID EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1154:2: (iv_ruleValidID= ruleValidID EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1155:2: iv_ruleValidID= ruleValidID EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getValidIDRule());
}
- pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID2705);
+ pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID2714);
iv_ruleValidID=ruleValidID();
state._fsp--;
@@ -3174,7 +3187,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleValidID.getText();
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleValidID2716); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleValidID2725); if (state.failed) return current;
}
@@ -3192,7 +3205,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleValidID"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1156:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | this_LONG_ID_1= RULE_LONG_ID | this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1162:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | this_LONG_ID_1= RULE_LONG_ID | this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED ) ;
public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -3203,10 +3216,10 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1159:28: ( (this_ID_0= RULE_ID | this_LONG_ID_1= RULE_LONG_ID | this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1160:1: (this_ID_0= RULE_ID | this_LONG_ID_1= RULE_LONG_ID | this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1165:28: ( (this_ID_0= RULE_ID | this_LONG_ID_1= RULE_LONG_ID | this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1166:1: (this_ID_0= RULE_ID | this_LONG_ID_1= RULE_LONG_ID | this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1160:1: (this_ID_0= RULE_ID | this_LONG_ID_1= RULE_LONG_ID | this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1166:1: (this_ID_0= RULE_ID | this_LONG_ID_1= RULE_LONG_ID | this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED )
int alt14=3;
switch ( input.LA(1) ) {
case RULE_ID:
@@ -3234,9 +3247,9 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
switch (alt14) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1160:6: this_ID_0= RULE_ID
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1166:6: this_ID_0= RULE_ID
{
- this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID2756); if (state.failed) return current;
+ this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID2765); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(this_ID_0);
@@ -3251,9 +3264,9 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1168:10: this_LONG_ID_1= RULE_LONG_ID
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1174:10: this_LONG_ID_1= RULE_LONG_ID
{
- this_LONG_ID_1=(Token)match(input,RULE_LONG_ID,FOLLOW_RULE_LONG_ID_in_ruleValidID2782); if (state.failed) return current;
+ this_LONG_ID_1=(Token)match(input,RULE_LONG_ID,FOLLOW_RULE_LONG_ID_in_ruleValidID2791); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(this_LONG_ID_1);
@@ -3268,9 +3281,9 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 3 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1176:10: this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1182:10: this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED
{
- this_LONG_UNSIGNED_2=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleValidID2808); if (state.failed) return current;
+ this_LONG_UNSIGNED_2=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleValidID2817); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(this_LONG_UNSIGNED_2);
@@ -3307,7 +3320,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleBoolean"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1191:1: entryRuleBoolean returns [String current=null] : iv_ruleBoolean= ruleBoolean EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1197:1: entryRuleBoolean returns [String current=null] : iv_ruleBoolean= ruleBoolean EOF ;
public final String entryRuleBoolean() throws RecognitionException {
String current = null;
@@ -3315,13 +3328,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1192:2: (iv_ruleBoolean= ruleBoolean EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1193:2: iv_ruleBoolean= ruleBoolean EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1198:2: (iv_ruleBoolean= ruleBoolean EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1199:2: iv_ruleBoolean= ruleBoolean EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getBooleanRule());
}
- pushFollow(FOLLOW_ruleBoolean_in_entryRuleBoolean2854);
+ pushFollow(FOLLOW_ruleBoolean_in_entryRuleBoolean2863);
iv_ruleBoolean=ruleBoolean();
state._fsp--;
@@ -3329,7 +3342,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleBoolean.getText();
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleBoolean2865); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleBoolean2874); if (state.failed) return current;
}
@@ -3347,7 +3360,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleBoolean"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1200:1: ruleBoolean returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'true' | kw= 'false' ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1206:1: ruleBoolean returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (kw= 'true' | kw= 'false' ) ;
public final AntlrDatatypeRuleToken ruleBoolean() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -3356,10 +3369,10 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1203:28: ( (kw= 'true' | kw= 'false' ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1204:1: (kw= 'true' | kw= 'false' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1209:28: ( (kw= 'true' | kw= 'false' ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1210:1: (kw= 'true' | kw= 'false' )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1204:1: (kw= 'true' | kw= 'false' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1210:1: (kw= 'true' | kw= 'false' )
int alt15=2;
int LA15_0 = input.LA(1);
@@ -3378,9 +3391,9 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
switch (alt15) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1205:2: kw= 'true'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1211:2: kw= 'true'
{
- kw=(Token)match(input,25,FOLLOW_25_in_ruleBoolean2903); if (state.failed) return current;
+ kw=(Token)match(input,25,FOLLOW_25_in_ruleBoolean2912); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(kw);
@@ -3391,9 +3404,9 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
break;
case 2 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1212:2: kw= 'false'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1218:2: kw= 'false'
{
- kw=(Token)match(input,26,FOLLOW_26_in_ruleBoolean2922); if (state.failed) return current;
+ kw=(Token)match(input,26,FOLLOW_26_in_ruleBoolean2931); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(kw);
@@ -3426,7 +3439,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleLong"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1225:1: entryRuleLong returns [String current=null] : iv_ruleLong= ruleLong EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1231:1: entryRuleLong returns [String current=null] : iv_ruleLong= ruleLong EOF ;
public final String entryRuleLong() throws RecognitionException {
String current = null;
@@ -3434,13 +3447,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1226:2: (iv_ruleLong= ruleLong EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1227:2: iv_ruleLong= ruleLong EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1232:2: (iv_ruleLong= ruleLong EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1233:2: iv_ruleLong= ruleLong EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getLongRule());
}
- pushFollow(FOLLOW_ruleLong_in_entryRuleLong2963);
+ pushFollow(FOLLOW_ruleLong_in_entryRuleLong2972);
iv_ruleLong=ruleLong();
state._fsp--;
@@ -3448,7 +3461,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleLong.getText();
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleLong2974); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleLong2983); if (state.failed) return current;
}
@@ -3466,7 +3479,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleLong"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1234:1: ruleLong returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_LONG_UNSIGNED_1= RULE_LONG_UNSIGNED ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1240:1: ruleLong returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_LONG_UNSIGNED_1= RULE_LONG_UNSIGNED ) ;
public final AntlrDatatypeRuleToken ruleLong() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -3476,13 +3489,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1237:28: ( ( (kw= '-' )? this_LONG_UNSIGNED_1= RULE_LONG_UNSIGNED ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1238:1: ( (kw= '-' )? this_LONG_UNSIGNED_1= RULE_LONG_UNSIGNED )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1243:28: ( ( (kw= '-' )? this_LONG_UNSIGNED_1= RULE_LONG_UNSIGNED ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1244:1: ( (kw= '-' )? this_LONG_UNSIGNED_1= RULE_LONG_UNSIGNED )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1238:1: ( (kw= '-' )? this_LONG_UNSIGNED_1= RULE_LONG_UNSIGNED )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1238:2: (kw= '-' )? this_LONG_UNSIGNED_1= RULE_LONG_UNSIGNED
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1244:1: ( (kw= '-' )? this_LONG_UNSIGNED_1= RULE_LONG_UNSIGNED )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1244:2: (kw= '-' )? this_LONG_UNSIGNED_1= RULE_LONG_UNSIGNED
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1238:2: (kw= '-' )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1244:2: (kw= '-' )?
int alt16=2;
int LA16_0 = input.LA(1);
@@ -3491,9 +3504,9 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
switch (alt16) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1239:2: kw= '-'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1245:2: kw= '-'
{
- kw=(Token)match(input,27,FOLLOW_27_in_ruleLong3013); if (state.failed) return current;
+ kw=(Token)match(input,27,FOLLOW_27_in_ruleLong3022); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(kw);
@@ -3506,7 +3519,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- this_LONG_UNSIGNED_1=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleLong3030); if (state.failed) return current;
+ this_LONG_UNSIGNED_1=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleLong3039); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(this_LONG_UNSIGNED_1);
@@ -3540,7 +3553,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleDouble"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1259:1: entryRuleDouble returns [String current=null] : iv_ruleDouble= ruleDouble EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1265:1: entryRuleDouble returns [String current=null] : iv_ruleDouble= ruleDouble EOF ;
public final String entryRuleDouble() throws RecognitionException {
String current = null;
@@ -3548,13 +3561,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1260:2: (iv_ruleDouble= ruleDouble EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1261:2: iv_ruleDouble= ruleDouble EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1266:2: (iv_ruleDouble= ruleDouble EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1267:2: iv_ruleDouble= ruleDouble EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getDoubleRule());
}
- pushFollow(FOLLOW_ruleDouble_in_entryRuleDouble3076);
+ pushFollow(FOLLOW_ruleDouble_in_entryRuleDouble3085);
iv_ruleDouble=ruleDouble();
state._fsp--;
@@ -3562,7 +3575,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleDouble.getText();
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleDouble3087); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleDouble3096); if (state.failed) return current;
}
@@ -3580,7 +3593,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleDouble"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1268:1: ruleDouble returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Long_0= ruleLong kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1274:1: ruleDouble returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_Long_0= ruleLong kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED ) ;
public final AntlrDatatypeRuleToken ruleDouble() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -3592,18 +3605,18 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1271:28: ( (this_Long_0= ruleLong kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1272:1: (this_Long_0= ruleLong kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1277:28: ( (this_Long_0= ruleLong kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1278:1: (this_Long_0= ruleLong kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1272:1: (this_Long_0= ruleLong kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1273:5: this_Long_0= ruleLong kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1278:1: (this_Long_0= ruleLong kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1279:5: this_Long_0= ruleLong kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getDoubleAccess().getLongParserRuleCall_0());
}
- pushFollow(FOLLOW_ruleLong_in_ruleDouble3134);
+ pushFollow(FOLLOW_ruleLong_in_ruleDouble3143);
this_Long_0=ruleLong();
state._fsp--;
@@ -3618,14 +3631,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
afterParserOrEnumRuleCall();
}
- kw=(Token)match(input,24,FOLLOW_24_in_ruleDouble3152); if (state.failed) return current;
+ kw=(Token)match(input,24,FOLLOW_24_in_ruleDouble3161); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(kw);
newLeafNode(kw, grammarAccess.getDoubleAccess().getFullStopKeyword_1());
}
- this_LONG_UNSIGNED_2=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleDouble3167); if (state.failed) return current;
+ this_LONG_UNSIGNED_2=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleDouble3176); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(this_LONG_UNSIGNED_2);
@@ -3659,7 +3672,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "entryRuleDate"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1304:1: entryRuleDate returns [String current=null] : iv_ruleDate= ruleDate EOF ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1310:1: entryRuleDate returns [String current=null] : iv_ruleDate= ruleDate EOF ;
public final String entryRuleDate() throws RecognitionException {
String current = null;
@@ -3667,13 +3680,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1305:2: (iv_ruleDate= ruleDate EOF )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1306:2: iv_ruleDate= ruleDate EOF
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1311:2: (iv_ruleDate= ruleDate EOF )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1312:2: iv_ruleDate= ruleDate EOF
{
if ( state.backtracking==0 ) {
newCompositeNode(grammarAccess.getDateRule());
}
- pushFollow(FOLLOW_ruleDate_in_entryRuleDate3213);
+ pushFollow(FOLLOW_ruleDate_in_entryRuleDate3222);
iv_ruleDate=ruleDate();
state._fsp--;
@@ -3681,7 +3694,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
if ( state.backtracking==0 ) {
current =iv_ruleDate.getText();
}
- match(input,EOF,FOLLOW_EOF_in_entryRuleDate3224); if (state.failed) return current;
+ match(input,EOF,FOLLOW_EOF_in_entryRuleDate3233); if (state.failed) return current;
}
@@ -3699,7 +3712,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleDate"
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1313:1: ruleDate returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_LONG_UNSIGNED_0= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_4= RULE_LONG_UNSIGNED ) ;
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1319:1: ruleDate returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_LONG_UNSIGNED_0= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_4= RULE_LONG_UNSIGNED ) ;
public final AntlrDatatypeRuleToken ruleDate() throws RecognitionException {
AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
@@ -3711,13 +3724,13 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1316:28: ( (this_LONG_UNSIGNED_0= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_4= RULE_LONG_UNSIGNED ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1317:1: (this_LONG_UNSIGNED_0= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_4= RULE_LONG_UNSIGNED )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1322:28: ( (this_LONG_UNSIGNED_0= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_4= RULE_LONG_UNSIGNED ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1323:1: (this_LONG_UNSIGNED_0= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_4= RULE_LONG_UNSIGNED )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1317:1: (this_LONG_UNSIGNED_0= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_4= RULE_LONG_UNSIGNED )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1317:6: this_LONG_UNSIGNED_0= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_4= RULE_LONG_UNSIGNED
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1323:1: (this_LONG_UNSIGNED_0= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_4= RULE_LONG_UNSIGNED )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1323:6: this_LONG_UNSIGNED_0= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_2= RULE_LONG_UNSIGNED kw= '.' this_LONG_UNSIGNED_4= RULE_LONG_UNSIGNED
{
- this_LONG_UNSIGNED_0=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3264); if (state.failed) return current;
+ this_LONG_UNSIGNED_0=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3273); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(this_LONG_UNSIGNED_0);
@@ -3728,14 +3741,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
newLeafNode(this_LONG_UNSIGNED_0, grammarAccess.getDateAccess().getLONG_UNSIGNEDTerminalRuleCall_0());
}
- kw=(Token)match(input,24,FOLLOW_24_in_ruleDate3282); if (state.failed) return current;
+ kw=(Token)match(input,24,FOLLOW_24_in_ruleDate3291); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(kw);
newLeafNode(kw, grammarAccess.getDateAccess().getFullStopKeyword_1());
}
- this_LONG_UNSIGNED_2=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3297); if (state.failed) return current;
+ this_LONG_UNSIGNED_2=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3306); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(this_LONG_UNSIGNED_2);
@@ -3746,14 +3759,14 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
newLeafNode(this_LONG_UNSIGNED_2, grammarAccess.getDateAccess().getLONG_UNSIGNEDTerminalRuleCall_2());
}
- kw=(Token)match(input,24,FOLLOW_24_in_ruleDate3315); if (state.failed) return current;
+ kw=(Token)match(input,24,FOLLOW_24_in_ruleDate3324); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(kw);
newLeafNode(kw, grammarAccess.getDateAccess().getFullStopKeyword_3());
}
- this_LONG_UNSIGNED_4=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3330); if (state.failed) return current;
+ this_LONG_UNSIGNED_4=(Token)match(input,RULE_LONG_UNSIGNED,FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3339); if (state.failed) return current;
if ( state.backtracking==0 ) {
current.merge(this_LONG_UNSIGNED_4);
@@ -3786,25 +3799,25 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR end "ruleDate"
// $ANTLR start synpred1_InternalEFactory
- public final void synpred1_InternalEFactory_fragment() throws RecognitionException {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:511:8: ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:511:9: ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' )
+ public final void synpred1_InternalEFactory_fragment() throws RecognitionException {
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:515:8: ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:515:9: ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:511:9: ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:511:10: () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:515:9: ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:515:10: () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{'
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:511:10: ()
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:512:1:
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:515:10: ()
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:516:1:
{
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:512:2: ( ( ruleQualifiedName ) )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:513:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:516:2: ( ( ruleQualifiedName ) )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:517:1: ( ruleQualifiedName )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:513:1: ( ruleQualifiedName )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:514:3: ruleQualifiedName
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:517:1: ( ruleQualifiedName )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:518:3: ruleQualifiedName
{
- pushFollow(FOLLOW_ruleQualifiedName_in_synpred1_InternalEFactory1105);
+ pushFollow(FOLLOW_ruleQualifiedName_in_synpred1_InternalEFactory1111);
ruleQualifiedName();
state._fsp--;
@@ -3815,21 +3828,21 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:516:2: ( ( ruleValidID ) )?
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:520:2: ( ( ruleValidID ) )?
int alt17=2;
int LA17_0 = input.LA(1);
- if ( (LA17_0==RULE_ID||(LA17_0>=RULE_LONG_ID && LA17_0<=RULE_LONG_UNSIGNED)) ) {
+ if ( ((LA17_0>=RULE_ID && LA17_0<=RULE_LONG_UNSIGNED)) ) {
alt17=1;
}
switch (alt17) {
case 1 :
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:517:1: ( ruleValidID )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:521:1: ( ruleValidID )
{
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:517:1: ( ruleValidID )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:518:1: ruleValidID
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:521:1: ( ruleValidID )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:522:1: ruleValidID
{
- pushFollow(FOLLOW_ruleValidID_in_synpred1_InternalEFactory1114);
+ pushFollow(FOLLOW_ruleValidID_in_synpred1_InternalEFactory1120);
ruleValidID();
state._fsp--;
@@ -3843,7 +3856,7 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
- match(input,17,FOLLOW_17_in_synpred1_InternalEFactory1121); if (state.failed) return ;
+ match(input,17,FOLLOW_17_in_synpred1_InternalEFactory1127); if (state.failed) return ;
}
@@ -3854,10 +3867,10 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start synpred2_InternalEFactory
public final void synpred2_InternalEFactory_fragment() throws RecognitionException {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:593:7: ( ruleReference )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:593:9: ruleReference
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:597:7: ( ruleReference )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:597:9: ruleReference
{
- pushFollow(FOLLOW_ruleReference_in_synpred2_InternalEFactory1249);
+ pushFollow(FOLLOW_ruleReference_in_synpred2_InternalEFactory1255);
ruleReference();
state._fsp--;
@@ -3869,10 +3882,10 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
// $ANTLR start synpred3_InternalEFactory
public final void synpred3_InternalEFactory_fragment() throws RecognitionException {
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1120:3: ( '.' )
- // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1121:2: '.'
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1126:3: ( '.' )
+ // ../org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/parser/antlr/internal/InternalEFactory.g:1127:2: '.'
{
- match(input,24,FOLLOW_24_in_synpred3_InternalEFactory2625); if (state.failed) return ;
+ match(input,24,FOLLOW_24_in_synpred3_InternalEFactory2634); if (state.failed) return ;
}
}
@@ -3924,59 +3937,118 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
}
+ protected DFA4 dfa4 = new DFA4(this);
protected DFA9 dfa9 = new DFA9(this);
protected DFA11 dfa11 = new DFA11(this);
+ static final String DFA4_eotS =
+ "\16\uffff";
+ static final String DFA4_eofS =
+ "\1\5\1\uffff\3\1\3\uffff\4\1\1\uffff\1\1";
+ static final String DFA4_minS =
+ "\1\4\1\uffff\3\5\1\uffff\10\5";
+ static final String DFA4_maxS =
+ "\1\33\1\uffff\3\30\1\uffff\2\7\4\30\1\7\1\30";
+ static final String DFA4_acceptS =
+ "\1\uffff\1\1\3\uffff\1\2\10\uffff";
+ static final String DFA4_specialS =
+ "\16\uffff}>";
+ static final String[] DFA4_transitionS = {
+ "\1\1\1\3\1\4\1\2\13\uffff\1\5\2\1\1\uffff\1\1\1\uffff\3\1",
+ "",
+ "\3\1\11\uffff\1\1\1\uffff\1\1\1\5\3\uffff\1\6",
+ "\3\1\11\uffff\1\1\1\uffff\1\1\1\5\3\uffff\1\7",
+ "\3\1\11\uffff\1\1\1\uffff\1\1\1\5\3\uffff\1\7",
+ "",
+ "\1\10\1\11\1\12",
+ "\1\10\1\11\1\13",
+ "\3\1\11\uffff\1\1\1\uffff\1\1\1\5\3\uffff\1\7",
+ "\3\1\11\uffff\1\1\1\uffff\1\1\1\5\3\uffff\1\7",
+ "\3\1\11\uffff\1\1\1\uffff\1\1\1\5\3\uffff\1\14",
+ "\3\1\11\uffff\1\1\1\uffff\1\1\1\5\3\uffff\1\7",
+ "\1\10\1\11\1\15",
+ "\3\1\11\uffff\1\1\1\uffff\1\1\1\5\3\uffff\1\7"
+ };
+
+ static final short[] DFA4_eot = DFA.unpackEncodedString(DFA4_eotS);
+ static final short[] DFA4_eof = DFA.unpackEncodedString(DFA4_eofS);
+ static final char[] DFA4_min = DFA.unpackEncodedStringToUnsignedChars(DFA4_minS);
+ static final char[] DFA4_max = DFA.unpackEncodedStringToUnsignedChars(DFA4_maxS);
+ static final short[] DFA4_accept = DFA.unpackEncodedString(DFA4_acceptS);
+ static final short[] DFA4_special = DFA.unpackEncodedString(DFA4_specialS);
+ static final short[][] DFA4_transition;
+
+ static {
+ int numStates = DFA4_transitionS.length;
+ DFA4_transition = new short[numStates][];
+ for (int i=0; i<numStates; i++) {
+ DFA4_transition[i] = DFA.unpackEncodedString(DFA4_transitionS[i]);
+ }
+ }
+
+ class DFA4 extends DFA {
+
+ public DFA4(BaseRecognizer recognizer) {
+ this.recognizer = recognizer;
+ this.decisionNumber = 4;
+ this.eot = DFA4_eot;
+ this.eof = DFA4_eof;
+ this.min = DFA4_min;
+ this.max = DFA4_max;
+ this.accept = DFA4_accept;
+ this.special = DFA4_special;
+ this.transition = DFA4_transition;
+ }
+ public String getDescription() {
+ return "376:1: ( (lv_value_2_0= ruleValue ) )?";
+ }
+ }
static final String DFA9_eotS =
"\35\uffff";
static final String DFA9_eofS =
"\4\uffff\2\15\24\uffff\3\15";
static final String DFA9_minS =
- "\1\4\2\uffff\3\4\6\uffff\1\4\2\uffff\1\0\5\uffff\1\0\3\uffff\1\0"+
- "\3\4";
+ "\1\4\2\uffff\1\5\2\4\6\uffff\1\5\2\uffff\3\0\10\uffff\3\4";
static final String DFA9_maxS =
- "\1\33\2\uffff\1\30\2\33\6\uffff\1\7\2\uffff\1\0\5\uffff\1\0\3\uffff"+
- "\1\0\3\33";
+ "\1\33\2\uffff\1\30\2\33\6\uffff\1\7\2\uffff\3\0\10\uffff\3\33";
static final String DFA9_acceptS =
- "\1\uffff\1\1\1\2\3\uffff\5\3\1\4\1\uffff\2\4\1\uffff\5\4\1\uffff"+
- "\3\4\4\uffff";
+ "\1\uffff\1\1\1\2\3\uffff\5\3\1\4\1\uffff\2\4\3\uffff\10\4\3\uffff";
static final String DFA9_specialS =
- "\3\uffff\1\3\1\1\1\6\11\uffff\1\5\5\uffff\1\7\3\uffff\1\2\1\10\1"+
- "\0\1\4}>";
+ "\3\uffff\1\2\1\10\1\3\11\uffff\1\5\1\0\1\7\10\uffff\1\4\1\6\1\1}>";
static final String[] DFA9_transitionS = {
- "\1\4\1\2\1\5\1\3\14\uffff\1\2\1\1\1\uffff\1\2\1\uffff\3\2",
+ "\1\2\1\4\1\5\1\3\14\uffff\1\2\1\1\1\uffff\1\2\1\uffff\3\2",
"",
"",
- "\1\7\1\uffff\1\10\1\11\11\uffff\1\12\6\uffff\1\6",
- "\1\17\1\23\1\31\1\25\11\uffff\1\12\1\uffff\1\16\1\22\1\21\1"+
- "\20\1\30\1\14\1\26\1\27\1\24",
- "\1\17\1\23\1\31\1\25\11\uffff\1\12\1\uffff\1\16\1\22\1\21\1"+
- "\20\1\30\1\14\1\26\1\27\1\24",
+ "\1\7\1\10\1\11\11\uffff\1\12\6\uffff\1\6",
+ "\1\25\1\17\1\20\1\21\11\uffff\1\12\1\uffff\1\16\1\24\1\23\1"+
+ "\22\1\31\1\14\1\27\1\30\1\26",
+ "\1\25\1\17\1\20\1\21\11\uffff\1\12\1\uffff\1\16\1\24\1\23\1"+
+ "\22\1\31\1\14\1\27\1\30\1\26",
"",
"",
"",
"",
"",
"",
- "\1\32\1\uffff\1\33\1\34",
+ "\1\32\1\33\1\34",
"",
"",
"\1\uffff",
+ "\1\uffff",
+ "\1\uffff",
"",
"",
"",
"",
"",
- "\1\uffff",
"",
"",
"",
- "\1\uffff",
- "\1\17\1\23\1\31\1\25\11\uffff\1\12\1\uffff\1\16\1\22\1\21\1"+
- "\20\1\30\1\14\1\26\1\27\1\24",
- "\1\17\1\23\1\31\1\25\11\uffff\1\12\1\uffff\1\16\1\22\1\21\1"+
- "\20\1\30\1\14\1\26\1\27\1\24",
- "\1\17\1\23\1\31\1\25\11\uffff\1\12\1\uffff\1\16\1\22\1\21\1"+
- "\20\1\30\1\14\1\26\1\27\1\24"
+ "\1\25\1\17\1\20\1\21\11\uffff\1\12\1\uffff\1\16\1\24\1\23\1"+
+ "\22\1\31\1\14\1\27\1\30\1\26",
+ "\1\25\1\17\1\20\1\21\11\uffff\1\12\1\uffff\1\16\1\24\1\23\1"+
+ "\22\1\31\1\14\1\27\1\30\1\26",
+ "\1\25\1\17\1\20\1\21\11\uffff\1\12\1\uffff\1\16\1\24\1\23\1"+
+ "\22\1\31\1\14\1\27\1\30\1\26"
};
static final short[] DFA9_eot = DFA.unpackEncodedString(DFA9_eotS);
@@ -4009,113 +4081,72 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
this.transition = DFA9_transition;
}
public String getDescription() {
- return "491:1: (this_MultiValue_0= ruleMultiValue | this_Attribute_1= ruleAttribute | ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () ) | ( ( ruleReference )=>this_Reference_9= ruleReference ) )";
+ return "495:1: (this_MultiValue_0= ruleMultiValue | this_Attribute_1= ruleAttribute | ( ( ( ( () ( ( ruleQualifiedName ) ) ( ( ruleValidID ) )? '{' ) )=> ( () ( ( ruleQualifiedName ) ) ( (lv_name_4_0= ruleValidID ) )? otherlv_5= '{' ) ) ( (lv_features_6_0= ruleFeature ) )* otherlv_7= '}' () ) | ( ( ruleReference )=>this_Reference_9= ruleReference ) )";
}
public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
TokenStream input = (TokenStream)_input;
int _s = s;
switch ( s ) {
case 0 :
- int LA9_27 = input.LA(1);
+ int LA9_16 = input.LA(1);
- int index9_27 = input.index();
+ int index9_16 = input.index();
input.rewind();
s = -1;
- if ( (LA9_27==RULE_ID) ) {s = 15;}
-
- else if ( (LA9_27==RULE_LONG_ID) ) {s = 25;}
-
- else if ( (LA9_27==RULE_LONG_UNSIGNED) ) {s = 21;}
-
- else if ( (LA9_27==17) && (synpred1_InternalEFactory())) {s = 10;}
-
- else if ( (LA9_27==24) ) {s = 12;}
-
- else if ( (LA9_27==EOF) && (synpred2_InternalEFactory())) {s = 13;}
-
- else if ( (LA9_27==19) && (synpred2_InternalEFactory())) {s = 14;}
-
- else if ( (LA9_27==22) && (synpred2_InternalEFactory())) {s = 16;}
-
- else if ( (LA9_27==21) && (synpred2_InternalEFactory())) {s = 17;}
-
- else if ( (LA9_27==20) && (synpred2_InternalEFactory())) {s = 18;}
-
- else if ( (LA9_27==RULE_STRING) && (synpred2_InternalEFactory())) {s = 19;}
-
- else if ( (LA9_27==27) && (synpred2_InternalEFactory())) {s = 20;}
-
- else if ( (LA9_27==25) && (synpred2_InternalEFactory())) {s = 22;}
+ if ( (synpred1_InternalEFactory()) ) {s = 10;}
- else if ( (LA9_27==26) && (synpred2_InternalEFactory())) {s = 23;}
+ else if ( (synpred2_InternalEFactory()) ) {s = 25;}
- else if ( (LA9_27==23) && (synpred2_InternalEFactory())) {s = 24;}
-
- input.seek(index9_27);
+ input.seek(index9_16);
if ( s>=0 ) return s;
break;
- case 1 :
- int LA9_4 = input.LA(1);
+ case 1 :
+ int LA9_28 = input.LA(1);
-
- int index9_4 = input.index();
+
+ int index9_28 = input.index();
input.rewind();
s = -1;
- if ( (LA9_4==24) ) {s = 12;}
-
- else if ( (LA9_4==EOF) && (synpred2_InternalEFactory())) {s = 13;}
+ if ( (LA9_28==EOF) && (synpred2_InternalEFactory())) {s = 13;}
- else if ( (LA9_4==19) && (synpred2_InternalEFactory())) {s = 14;}
-
- else if ( (LA9_4==RULE_ID) ) {s = 15;}
+ else if ( (LA9_28==19) && (synpred2_InternalEFactory())) {s = 14;}
- else if ( (LA9_4==22) && (synpred2_InternalEFactory())) {s = 16;}
+ else if ( (LA9_28==RULE_ID) ) {s = 15;}
- else if ( (LA9_4==21) && (synpred2_InternalEFactory())) {s = 17;}
+ else if ( (LA9_28==RULE_LONG_ID) ) {s = 16;}
- else if ( (LA9_4==20) && (synpred2_InternalEFactory())) {s = 18;}
+ else if ( (LA9_28==RULE_LONG_UNSIGNED) ) {s = 17;}
- else if ( (LA9_4==RULE_STRING) && (synpred2_InternalEFactory())) {s = 19;}
+ else if ( (LA9_28==22) && (synpred2_InternalEFactory())) {s = 18;}
- else if ( (LA9_4==27) && (synpred2_InternalEFactory())) {s = 20;}
+ else if ( (LA9_28==21) && (synpred2_InternalEFactory())) {s = 19;}
- else if ( (LA9_4==RULE_LONG_UNSIGNED) ) {s = 21;}
+ else if ( (LA9_28==20) && (synpred2_InternalEFactory())) {s = 20;}
- else if ( (LA9_4==25) && (synpred2_InternalEFactory())) {s = 22;}
+ else if ( (LA9_28==RULE_STRING) && (synpred2_InternalEFactory())) {s = 21;}
- else if ( (LA9_4==26) && (synpred2_InternalEFactory())) {s = 23;}
+ else if ( (LA9_28==27) && (synpred2_InternalEFactory())) {s = 22;}
- else if ( (LA9_4==23) && (synpred2_InternalEFactory())) {s = 24;}
+ else if ( (LA9_28==25) && (synpred2_InternalEFactory())) {s = 23;}
- else if ( (LA9_4==RULE_LONG_ID) ) {s = 25;}
+ else if ( (LA9_28==26) && (synpred2_InternalEFactory())) {s = 24;}
- else if ( (LA9_4==17) && (synpred1_InternalEFactory())) {s = 10;}
+ else if ( (LA9_28==23) && (synpred2_InternalEFactory())) {s = 25;}
-
- input.seek(index9_4);
- if ( s>=0 ) return s;
- break;
- case 2 :
- int LA9_25 = input.LA(1);
+ else if ( (LA9_28==24) ) {s = 12;}
-
- int index9_25 = input.index();
- input.rewind();
- s = -1;
- if ( (synpred1_InternalEFactory()) ) {s = 10;}
+ else if ( (LA9_28==17) && (synpred1_InternalEFactory())) {s = 10;}
- else if ( (synpred2_InternalEFactory()) ) {s = 24;}
-
- input.seek(index9_25);
+ input.seek(index9_28);
if ( s>=0 ) return s;
break;
- case 3 :
+ case 2 :
int LA9_3 = input.LA(1);
-
+
int index9_3 = input.index();
input.rewind();
s = -1;
@@ -4133,161 +4164,202 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
else if ( (synpred2_InternalEFactory()) ) {s = 11;}
-
+
input.seek(index9_3);
if ( s>=0 ) return s;
break;
- case 4 :
- int LA9_28 = input.LA(1);
+ case 3 :
+ int LA9_5 = input.LA(1);
-
- int index9_28 = input.index();
+
+ int index9_5 = input.index();
input.rewind();
s = -1;
- if ( (LA9_28==RULE_ID) ) {s = 15;}
+ if ( (LA9_5==24) ) {s = 12;}
- else if ( (LA9_28==RULE_LONG_ID) ) {s = 25;}
+ else if ( (LA9_5==EOF) && (synpred2_InternalEFactory())) {s = 13;}
- else if ( (LA9_28==RULE_LONG_UNSIGNED) ) {s = 21;}
+ else if ( (LA9_5==19) && (synpred2_InternalEFactory())) {s = 14;}
- else if ( (LA9_28==17) && (synpred1_InternalEFactory())) {s = 10;}
+ else if ( (LA9_5==RULE_ID) ) {s = 15;}
- else if ( (LA9_28==24) ) {s = 12;}
+ else if ( (LA9_5==RULE_LONG_ID) ) {s = 16;}
- else if ( (LA9_28==EOF) && (synpred2_InternalEFactory())) {s = 13;}
+ else if ( (LA9_5==RULE_LONG_UNSIGNED) ) {s = 17;}
- else if ( (LA9_28==19) && (synpred2_InternalEFactory())) {s = 14;}
+ else if ( (LA9_5==22) && (synpred2_InternalEFactory())) {s = 18;}
- else if ( (LA9_28==22) && (synpred2_InternalEFactory())) {s = 16;}
+ else if ( (LA9_5==21) && (synpred2_InternalEFactory())) {s = 19;}
- else if ( (LA9_28==21) && (synpred2_InternalEFactory())) {s = 17;}
+ else if ( (LA9_5==20) && (synpred2_InternalEFactory())) {s = 20;}
- else if ( (LA9_28==20) && (synpred2_InternalEFactory())) {s = 18;}
+ else if ( (LA9_5==RULE_STRING) && (synpred2_InternalEFactory())) {s = 21;}
- else if ( (LA9_28==RULE_STRING) && (synpred2_InternalEFactory())) {s = 19;}
+ else if ( (LA9_5==27) && (synpred2_InternalEFactory())) {s = 22;}
- else if ( (LA9_28==27) && (synpred2_InternalEFactory())) {s = 20;}
+ else if ( (LA9_5==25) && (synpred2_InternalEFactory())) {s = 23;}
- else if ( (LA9_28==25) && (synpred2_InternalEFactory())) {s = 22;}
+ else if ( (LA9_5==26) && (synpred2_InternalEFactory())) {s = 24;}
- else if ( (LA9_28==26) && (synpred2_InternalEFactory())) {s = 23;}
+ else if ( (LA9_5==23) && (synpred2_InternalEFactory())) {s = 25;}
- else if ( (LA9_28==23) && (synpred2_InternalEFactory())) {s = 24;}
+ else if ( (LA9_5==17) && (synpred1_InternalEFactory())) {s = 10;}
-
- input.seek(index9_28);
+
+ input.seek(index9_5);
if ( s>=0 ) return s;
break;
- case 5 :
+ case 4 :
+ int LA9_26 = input.LA(1);
+
+
+ int index9_26 = input.index();
+ input.rewind();
+ s = -1;
+ if ( (LA9_26==EOF) && (synpred2_InternalEFactory())) {s = 13;}
+
+ else if ( (LA9_26==19) && (synpred2_InternalEFactory())) {s = 14;}
+
+ else if ( (LA9_26==RULE_ID) ) {s = 15;}
+
+ else if ( (LA9_26==RULE_LONG_ID) ) {s = 16;}
+
+ else if ( (LA9_26==RULE_LONG_UNSIGNED) ) {s = 17;}
+
+ else if ( (LA9_26==22) && (synpred2_InternalEFactory())) {s = 18;}
+
+ else if ( (LA9_26==21) && (synpred2_InternalEFactory())) {s = 19;}
+
+ else if ( (LA9_26==20) && (synpred2_InternalEFactory())) {s = 20;}
+
+ else if ( (LA9_26==RULE_STRING) && (synpred2_InternalEFactory())) {s = 21;}
+
+ else if ( (LA9_26==27) && (synpred2_InternalEFactory())) {s = 22;}
+
+ else if ( (LA9_26==25) && (synpred2_InternalEFactory())) {s = 23;}
+
+ else if ( (LA9_26==26) && (synpred2_InternalEFactory())) {s = 24;}
+
+ else if ( (LA9_26==23) && (synpred2_InternalEFactory())) {s = 25;}
+
+ else if ( (LA9_26==24) ) {s = 12;}
+
+ else if ( (LA9_26==17) && (synpred1_InternalEFactory())) {s = 10;}
+
+
+ input.seek(index9_26);
+ if ( s>=0 ) return s;
+ break;
+ case 5 :
int LA9_15 = input.LA(1);
-
+
int index9_15 = input.index();
input.rewind();
s = -1;
if ( (synpred1_InternalEFactory()) ) {s = 10;}
- else if ( (synpred2_InternalEFactory()) ) {s = 24;}
+ else if ( (synpred2_InternalEFactory()) ) {s = 25;}
+
-
input.seek(index9_15);
if ( s>=0 ) return s;
break;
- case 6 :
- int LA9_5 = input.LA(1);
+ case 6 :
+ int LA9_27 = input.LA(1);
-
- int index9_5 = input.index();
+
+ int index9_27 = input.index();
input.rewind();
s = -1;
- if ( (LA9_5==24) ) {s = 12;}
+ if ( (LA9_27==RULE_ID) ) {s = 15;}
- else if ( (LA9_5==RULE_ID) ) {s = 15;}
+ else if ( (LA9_27==RULE_LONG_ID) ) {s = 16;}
- else if ( (LA9_5==RULE_LONG_ID) ) {s = 25;}
+ else if ( (LA9_27==RULE_LONG_UNSIGNED) ) {s = 17;}
- else if ( (LA9_5==RULE_LONG_UNSIGNED) ) {s = 21;}
+ else if ( (LA9_27==17) && (synpred1_InternalEFactory())) {s = 10;}
- else if ( (LA9_5==17) && (synpred1_InternalEFactory())) {s = 10;}
+ else if ( (LA9_27==24) ) {s = 12;}
- else if ( (LA9_5==EOF) && (synpred2_InternalEFactory())) {s = 13;}
+ else if ( (LA9_27==EOF) && (synpred2_InternalEFactory())) {s = 13;}
- else if ( (LA9_5==19) && (synpred2_InternalEFactory())) {s = 14;}
+ else if ( (LA9_27==19) && (synpred2_InternalEFactory())) {s = 14;}
- else if ( (LA9_5==22) && (synpred2_InternalEFactory())) {s = 16;}
+ else if ( (LA9_27==22) && (synpred2_InternalEFactory())) {s = 18;}
- else if ( (LA9_5==21) && (synpred2_InternalEFactory())) {s = 17;}
+ else if ( (LA9_27==21) && (synpred2_InternalEFactory())) {s = 19;}
- else if ( (LA9_5==20) && (synpred2_InternalEFactory())) {s = 18;}
+ else if ( (LA9_27==20) && (synpred2_InternalEFactory())) {s = 20;}
- else if ( (LA9_5==RULE_STRING) && (synpred2_InternalEFactory())) {s = 19;}
+ else if ( (LA9_27==RULE_STRING) && (synpred2_InternalEFactory())) {s = 21;}
- else if ( (LA9_5==27) && (synpred2_InternalEFactory())) {s = 20;}
+ else if ( (LA9_27==27) && (synpred2_InternalEFactory())) {s = 22;}
- else if ( (LA9_5==25) && (synpred2_InternalEFactory())) {s = 22;}
+ else if ( (LA9_27==25) && (synpred2_InternalEFactory())) {s = 23;}
- else if ( (LA9_5==26) && (synpred2_InternalEFactory())) {s = 23;}
+ else if ( (LA9_27==26) && (synpred2_InternalEFactory())) {s = 24;}
- else if ( (LA9_5==23) && (synpred2_InternalEFactory())) {s = 24;}
+ else if ( (LA9_27==23) && (synpred2_InternalEFactory())) {s = 25;}
-
- input.seek(index9_5);
+
+ input.seek(index9_27);
if ( s>=0 ) return s;
break;
- case 7 :
- int LA9_21 = input.LA(1);
+ case 7 :
+ int LA9_17 = input.LA(1);
-
- int index9_21 = input.index();
+
+ int index9_17 = input.index();
input.rewind();
s = -1;
if ( (synpred1_InternalEFactory()) ) {s = 10;}
- else if ( (synpred2_InternalEFactory()) ) {s = 24;}
+ else if ( (synpred2_InternalEFactory()) ) {s = 25;}
- input.seek(index9_21);
+ input.seek(index9_17);
if ( s>=0 ) return s;
break;
- case 8 :
- int LA9_26 = input.LA(1);
+ case 8 :
+ int LA9_4 = input.LA(1);
-
- int index9_26 = input.index();
+
+ int index9_4 = input.index();
input.rewind();
s = -1;
- if ( (LA9_26==EOF) && (synpred2_InternalEFactory())) {s = 13;}
+ if ( (LA9_4==24) ) {s = 12;}
- else if ( (LA9_26==19) && (synpred2_InternalEFactory())) {s = 14;}
+ else if ( (LA9_4==EOF) && (synpred2_InternalEFactory())) {s = 13;}
- else if ( (LA9_26==RULE_ID) ) {s = 15;}
+ else if ( (LA9_4==19) && (synpred2_InternalEFactory())) {s = 14;}
- else if ( (LA9_26==22) && (synpred2_InternalEFactory())) {s = 16;}
+ else if ( (LA9_4==RULE_ID) ) {s = 15;}
- else if ( (LA9_26==21) && (synpred2_InternalEFactory())) {s = 17;}
+ else if ( (LA9_4==RULE_LONG_ID) ) {s = 16;}
- else if ( (LA9_26==20) && (synpred2_InternalEFactory())) {s = 18;}
+ else if ( (LA9_4==RULE_LONG_UNSIGNED) ) {s = 17;}
- else if ( (LA9_26==RULE_STRING) && (synpred2_InternalEFactory())) {s = 19;}
+ else if ( (LA9_4==22) && (synpred2_InternalEFactory())) {s = 18;}
- else if ( (LA9_26==27) && (synpred2_InternalEFactory())) {s = 20;}
+ else if ( (LA9_4==21) && (synpred2_InternalEFactory())) {s = 19;}
- else if ( (LA9_26==RULE_LONG_UNSIGNED) ) {s = 21;}
+ else if ( (LA9_4==20) && (synpred2_InternalEFactory())) {s = 20;}
- else if ( (LA9_26==25) && (synpred2_InternalEFactory())) {s = 22;}
+ else if ( (LA9_4==RULE_STRING) && (synpred2_InternalEFactory())) {s = 21;}
- else if ( (LA9_26==26) && (synpred2_InternalEFactory())) {s = 23;}
+ else if ( (LA9_4==27) && (synpred2_InternalEFactory())) {s = 22;}
- else if ( (LA9_26==23) && (synpred2_InternalEFactory())) {s = 24;}
+ else if ( (LA9_4==25) && (synpred2_InternalEFactory())) {s = 23;}
- else if ( (LA9_26==RULE_LONG_ID) ) {s = 25;}
+ else if ( (LA9_4==26) && (synpred2_InternalEFactory())) {s = 24;}
- else if ( (LA9_26==24) ) {s = 12;}
+ else if ( (LA9_4==23) && (synpred2_InternalEFactory())) {s = 25;}
- else if ( (LA9_26==17) && (synpred1_InternalEFactory())) {s = 10;}
+ else if ( (LA9_4==17) && (synpred1_InternalEFactory())) {s = 10;}
-
- input.seek(index9_26);
+
+ input.seek(index9_4);
if ( s>=0 ) return s;
break;
}
@@ -4301,26 +4373,27 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
static final String DFA11_eotS =
"\15\uffff";
static final String DFA11_eofS =
- "\4\uffff\1\11\2\uffff\1\11\3\uffff\1\12\1\uffff";
+ "\4\uffff\1\10\2\uffff\1\10\3\uffff\1\12\1\uffff";
static final String DFA11_minS =
- "\1\5\2\uffff\1\7\1\4\2\uffff\1\4\1\7\2\uffff\1\4\1\uffff";
+ "\1\4\2\uffff\1\7\1\4\2\uffff\1\4\1\uffff\1\7\1\uffff\1\4\1\uffff";
static final String DFA11_maxS =
- "\1\33\2\uffff\1\7\1\33\2\uffff\1\33\1\7\2\uffff\1\33\1\uffff";
+ "\1\33\2\uffff\1\7\1\33\2\uffff\1\33\1\uffff\1\7\1\uffff\1\33\1\uffff";
static final String DFA11_acceptS =
- "\1\uffff\1\1\1\2\2\uffff\1\4\1\7\2\uffff\1\3\1\5\1\uffff\1\6";
+ "\1\uffff\1\1\1\2\2\uffff\1\4\1\7\1\uffff\1\3\1\uffff\1\5\1\uffff"+
+ "\1\6";
static final String DFA11_specialS =
"\15\uffff}>";
static final String[] DFA11_transitionS = {
- "\1\2\1\uffff\1\4\14\uffff\1\1\2\uffff\1\6\1\uffff\2\5\1\3",
+ "\1\2\2\uffff\1\4\14\uffff\1\1\2\uffff\1\6\1\uffff\2\5\1\3",
"",
"",
"\1\7",
- "\4\11\13\uffff\5\11\1\10\3\11",
+ "\4\10\13\uffff\5\10\1\11\3\10",
"",
"",
- "\4\11\13\uffff\5\11\1\12\3\11",
- "\1\13",
+ "\4\10\13\uffff\5\10\1\12\3\10",
"",
+ "\1\13",
"",
"\4\12\13\uffff\5\12\1\14\3\12",
""
@@ -4356,25 +4429,25 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
this.transition = DFA11_transition;
}
public String getDescription() {
- return "712:1: (this_EnumAttribute_0= ruleEnumAttribute | this_StringAttribute_1= ruleStringAttribute | this_IntegerAttribute_2= ruleIntegerAttribute | this_BooleanAttribute_3= ruleBooleanAttribute | this_DoubleAttribute_4= ruleDoubleAttribute | this_DateAttribute_5= ruleDateAttribute | this_NullAttribute_6= ruleNullAttribute )";
+ return "716:1: (this_EnumAttribute_0= ruleEnumAttribute | this_StringAttribute_1= ruleStringAttribute | this_IntegerAttribute_2= ruleIntegerAttribute | this_BooleanAttribute_3= ruleBooleanAttribute | this_DoubleAttribute_4= ruleDoubleAttribute | this_DateAttribute_5= ruleDateAttribute | this_NullAttribute_6= ruleNullAttribute )";
}
}
public static final BitSet FOLLOW_ruleFactory_in_entryRuleFactory75 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleFactory85 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleNamespaceImport_in_ruleFactory131 = new BitSet(new long[]{0x000000000001A0D0L});
- public static final BitSet FOLLOW_rulePackageImport_in_ruleFactory153 = new BitSet(new long[]{0x00000000000120D0L});
- public static final BitSet FOLLOW_ruleAnnotation_in_ruleFactory175 = new BitSet(new long[]{0x00000000000120D0L});
+ public static final BitSet FOLLOW_ruleNamespaceImport_in_ruleFactory131 = new BitSet(new long[]{0x000000000001A0E0L});
+ public static final BitSet FOLLOW_rulePackageImport_in_ruleFactory153 = new BitSet(new long[]{0x00000000000120E0L});
+ public static final BitSet FOLLOW_ruleAnnotation_in_ruleFactory175 = new BitSet(new long[]{0x00000000000120E0L});
public static final BitSet FOLLOW_ruleNewObject_in_ruleFactory197 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rulePackageImport_in_entryRulePackageImport233 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRulePackageImport243 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_13_in_rulePackageImport280 = new BitSet(new long[]{0x00000000000120D0L});
+ public static final BitSet FOLLOW_13_in_rulePackageImport280 = new BitSet(new long[]{0x00000000000120E0L});
public static final BitSet FOLLOW_ruleQualifiedName_in_rulePackageImport303 = new BitSet(new long[]{0x0000000000004000L});
public static final BitSet FOLLOW_14_in_rulePackageImport315 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleNamespaceImport_in_entryRuleNamespaceImport351 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleNamespaceImport361 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_15_in_ruleNamespaceImport398 = new BitSet(new long[]{0x00000000000120D0L});
+ public static final BitSet FOLLOW_15_in_ruleNamespaceImport398 = new BitSet(new long[]{0x00000000000120E0L});
public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_ruleNamespaceImport419 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleAnnotation_in_entryRuleAnnotation455 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleAnnotation465 = new BitSet(new long[]{0x0000000000000002L});
@@ -4382,110 +4455,110 @@ public class InternalEFactoryParser extends AbstractInternalAntlrParser {
public static final BitSet FOLLOW_ruleCustomNameMapping_in_entryRuleCustomNameMapping545 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleCustomNameMapping555 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_16_in_ruleCustomNameMapping592 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_17_in_ruleCustomNameMapping604 = new BitSet(new long[]{0x00000000000120D0L});
+ public static final BitSet FOLLOW_17_in_ruleCustomNameMapping604 = new BitSet(new long[]{0x00000000000120E0L});
public static final BitSet FOLLOW_ruleQualifiedName_in_ruleCustomNameMapping627 = new BitSet(new long[]{0x0000000000040000L});
- public static final BitSet FOLLOW_18_in_ruleCustomNameMapping639 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleCustomNameMapping659 = new BitSet(new long[]{0x0000000000080000L});
- public static final BitSet FOLLOW_19_in_ruleCustomNameMapping671 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleFeature_in_entryRuleFeature707 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleFeature717 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleFeature762 = new BitSet(new long[]{0x0000000000100000L});
- public static final BitSet FOLLOW_20_in_ruleFeature774 = new BitSet(new long[]{0x000000000EB120F2L});
- public static final BitSet FOLLOW_ruleValue_in_ruleFeature795 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleNewObject_in_entryRuleNewObject832 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleNewObject842 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_ruleNewObject890 = new BitSet(new long[]{0x00000000000320D0L});
- public static final BitSet FOLLOW_ruleValidID_in_ruleNewObject911 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_17_in_ruleNewObject924 = new BitSet(new long[]{0x0000000000080010L});
- public static final BitSet FOLLOW_ruleFeature_in_ruleNewObject945 = new BitSet(new long[]{0x0000000000080010L});
- public static final BitSet FOLLOW_19_in_ruleNewObject958 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleValue_in_entryRuleValue994 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleValue1004 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleMultiValue_in_ruleValue1051 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAttribute_in_ruleValue1078 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_ruleValue1151 = new BitSet(new long[]{0x00000000000320D0L});
- public static final BitSet FOLLOW_ruleValidID_in_ruleValue1172 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_17_in_ruleValue1185 = new BitSet(new long[]{0x0000000000080010L});
- public static final BitSet FOLLOW_ruleFeature_in_ruleValue1208 = new BitSet(new long[]{0x0000000000080010L});
- public static final BitSet FOLLOW_19_in_ruleValue1221 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleReference_in_ruleValue1265 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleMultiValue_in_entryRuleMultiValue1301 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleMultiValue1311 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_21_in_ruleMultiValue1357 = new BitSet(new long[]{0x000000000EF120F0L});
- public static final BitSet FOLLOW_ruleValue_in_ruleMultiValue1378 = new BitSet(new long[]{0x000000000EF120F0L});
- public static final BitSet FOLLOW_22_in_ruleMultiValue1391 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleReference_in_entryRuleReference1427 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleReference1437 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_ruleReference1484 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1519 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1529 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEnumAttribute_in_ruleAttribute1576 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStringAttribute_in_ruleAttribute1603 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleIntegerAttribute_in_ruleAttribute1630 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBooleanAttribute_in_ruleAttribute1657 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDoubleAttribute_in_ruleAttribute1684 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDateAttribute_in_ruleAttribute1711 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleNullAttribute_in_ruleAttribute1738 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleEnumAttribute_in_entryRuleEnumAttribute1773 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleEnumAttribute1783 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_20_in_ruleEnumAttribute1820 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleEnumAttribute1840 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStringAttribute_in_entryRuleStringAttribute1876 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleStringAttribute1886 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_STRING_in_ruleStringAttribute1927 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleIntegerAttribute_in_entryRuleIntegerAttribute1967 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleIntegerAttribute1977 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleLong_in_ruleIntegerAttribute2022 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDoubleAttribute_in_entryRuleDoubleAttribute2057 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleDoubleAttribute2067 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDouble_in_ruleDoubleAttribute2112 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDateAttribute_in_entryRuleDateAttribute2147 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleDateAttribute2157 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDate_in_ruleDateAttribute2202 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleNullAttribute_in_entryRuleNullAttribute2237 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleNullAttribute2247 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_23_in_ruleNullAttribute2289 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBooleanAttribute_in_entryRuleBooleanAttribute2337 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleBooleanAttribute2347 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBoolean_in_ruleBooleanAttribute2392 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard2428 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard2439 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard2486 = new BitSet(new long[]{0x0000000000004002L});
- public static final BitSet FOLLOW_14_in_ruleQualifiedNameWithWildcard2505 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2548 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2559 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName2606 = new BitSet(new long[]{0x0000000001000002L});
- public static final BitSet FOLLOW_24_in_ruleQualifiedName2634 = new BitSet(new long[]{0x00000000000120D0L});
- public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName2657 = new BitSet(new long[]{0x0000000001000002L});
- public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID2705 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleValidID2716 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_ID_in_ruleValidID2756 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_LONG_ID_in_ruleValidID2782 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleValidID2808 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleBoolean_in_entryRuleBoolean2854 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleBoolean2865 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_25_in_ruleBoolean2903 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_26_in_ruleBoolean2922 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleLong_in_entryRuleLong2963 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleLong2974 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_27_in_ruleLong3013 = new BitSet(new long[]{0x0000000000000080L});
- public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleLong3030 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDouble_in_entryRuleDouble3076 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleDouble3087 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleLong_in_ruleDouble3134 = new BitSet(new long[]{0x0000000001000000L});
- public static final BitSet FOLLOW_24_in_ruleDouble3152 = new BitSet(new long[]{0x0000000000000080L});
- public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleDouble3167 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleDate_in_entryRuleDate3213 = new BitSet(new long[]{0x0000000000000000L});
- public static final BitSet FOLLOW_EOF_in_entryRuleDate3224 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3264 = new BitSet(new long[]{0x0000000001000000L});
- public static final BitSet FOLLOW_24_in_ruleDate3282 = new BitSet(new long[]{0x0000000000000080L});
- public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3297 = new BitSet(new long[]{0x0000000001000000L});
- public static final BitSet FOLLOW_24_in_ruleDate3315 = new BitSet(new long[]{0x0000000000000080L});
- public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3330 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleQualifiedName_in_synpred1_InternalEFactory1105 = new BitSet(new long[]{0x00000000000320D0L});
- public static final BitSet FOLLOW_ruleValidID_in_synpred1_InternalEFactory1114 = new BitSet(new long[]{0x0000000000020000L});
- public static final BitSet FOLLOW_17_in_synpred1_InternalEFactory1121 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleReference_in_synpred2_InternalEFactory1249 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_24_in_synpred3_InternalEFactory2625 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_18_in_ruleCustomNameMapping639 = new BitSet(new long[]{0x00000000000120E0L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleCustomNameMapping662 = new BitSet(new long[]{0x0000000000080000L});
+ public static final BitSet FOLLOW_19_in_ruleCustomNameMapping674 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleFeature_in_entryRuleFeature710 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleFeature720 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleFeature768 = new BitSet(new long[]{0x0000000000100000L});
+ public static final BitSet FOLLOW_20_in_ruleFeature780 = new BitSet(new long[]{0x000000000EB120F2L});
+ public static final BitSet FOLLOW_ruleValue_in_ruleFeature801 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleNewObject_in_entryRuleNewObject838 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleNewObject848 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleNewObject896 = new BitSet(new long[]{0x00000000000320E0L});
+ public static final BitSet FOLLOW_ruleValidID_in_ruleNewObject917 = new BitSet(new long[]{0x0000000000020000L});
+ public static final BitSet FOLLOW_17_in_ruleNewObject930 = new BitSet(new long[]{0x00000000000920E0L});
+ public static final BitSet FOLLOW_ruleFeature_in_ruleNewObject951 = new BitSet(new long[]{0x00000000000920E0L});
+ public static final BitSet FOLLOW_19_in_ruleNewObject964 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleValue_in_entryRuleValue1000 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleValue1010 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleMultiValue_in_ruleValue1057 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAttribute_in_ruleValue1084 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleValue1157 = new BitSet(new long[]{0x00000000000320E0L});
+ public static final BitSet FOLLOW_ruleValidID_in_ruleValue1178 = new BitSet(new long[]{0x0000000000020000L});
+ public static final BitSet FOLLOW_17_in_ruleValue1191 = new BitSet(new long[]{0x00000000000920E0L});
+ public static final BitSet FOLLOW_ruleFeature_in_ruleValue1214 = new BitSet(new long[]{0x00000000000920E0L});
+ public static final BitSet FOLLOW_19_in_ruleValue1227 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleReference_in_ruleValue1271 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleMultiValue_in_entryRuleMultiValue1307 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleMultiValue1317 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_21_in_ruleMultiValue1363 = new BitSet(new long[]{0x000000000EF120F0L});
+ public static final BitSet FOLLOW_ruleValue_in_ruleMultiValue1384 = new BitSet(new long[]{0x000000000EF120F0L});
+ public static final BitSet FOLLOW_22_in_ruleMultiValue1397 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleReference_in_entryRuleReference1433 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleReference1443 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleReference1490 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1525 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1535 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEnumAttribute_in_ruleAttribute1582 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStringAttribute_in_ruleAttribute1609 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleIntegerAttribute_in_ruleAttribute1636 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBooleanAttribute_in_ruleAttribute1663 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDoubleAttribute_in_ruleAttribute1690 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDateAttribute_in_ruleAttribute1717 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleNullAttribute_in_ruleAttribute1744 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleEnumAttribute_in_entryRuleEnumAttribute1779 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleEnumAttribute1789 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_20_in_ruleEnumAttribute1826 = new BitSet(new long[]{0x00000000000120E0L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleEnumAttribute1849 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleStringAttribute_in_entryRuleStringAttribute1885 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleStringAttribute1895 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_STRING_in_ruleStringAttribute1936 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleIntegerAttribute_in_entryRuleIntegerAttribute1976 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleIntegerAttribute1986 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleLong_in_ruleIntegerAttribute2031 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDoubleAttribute_in_entryRuleDoubleAttribute2066 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleDoubleAttribute2076 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDouble_in_ruleDoubleAttribute2121 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDateAttribute_in_entryRuleDateAttribute2156 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleDateAttribute2166 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDate_in_ruleDateAttribute2211 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleNullAttribute_in_entryRuleNullAttribute2246 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleNullAttribute2256 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_23_in_ruleNullAttribute2298 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBooleanAttribute_in_entryRuleBooleanAttribute2346 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleBooleanAttribute2356 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBoolean_in_ruleBooleanAttribute2401 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedNameWithWildcard_in_entryRuleQualifiedNameWithWildcard2437 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedNameWithWildcard2448 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_ruleQualifiedNameWithWildcard2495 = new BitSet(new long[]{0x0000000000004002L});
+ public static final BitSet FOLLOW_14_in_ruleQualifiedNameWithWildcard2514 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2557 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2568 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName2615 = new BitSet(new long[]{0x0000000001000002L});
+ public static final BitSet FOLLOW_24_in_ruleQualifiedName2643 = new BitSet(new long[]{0x00000000000120E0L});
+ public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName2666 = new BitSet(new long[]{0x0000000001000002L});
+ public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID2714 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleValidID2725 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_ID_in_ruleValidID2765 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_LONG_ID_in_ruleValidID2791 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleValidID2817 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleBoolean_in_entryRuleBoolean2863 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleBoolean2874 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_25_in_ruleBoolean2912 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_26_in_ruleBoolean2931 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleLong_in_entryRuleLong2972 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleLong2983 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_27_in_ruleLong3022 = new BitSet(new long[]{0x0000000000000080L});
+ public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleLong3039 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDouble_in_entryRuleDouble3085 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleDouble3096 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleLong_in_ruleDouble3143 = new BitSet(new long[]{0x0000000001000000L});
+ public static final BitSet FOLLOW_24_in_ruleDouble3161 = new BitSet(new long[]{0x0000000000000080L});
+ public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleDouble3176 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleDate_in_entryRuleDate3222 = new BitSet(new long[]{0x0000000000000000L});
+ public static final BitSet FOLLOW_EOF_in_entryRuleDate3233 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3273 = new BitSet(new long[]{0x0000000001000000L});
+ public static final BitSet FOLLOW_24_in_ruleDate3291 = new BitSet(new long[]{0x0000000000000080L});
+ public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3306 = new BitSet(new long[]{0x0000000001000000L});
+ public static final BitSet FOLLOW_24_in_ruleDate3324 = new BitSet(new long[]{0x0000000000000080L});
+ public static final BitSet FOLLOW_RULE_LONG_UNSIGNED_in_ruleDate3339 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleQualifiedName_in_synpred1_InternalEFactory1111 = new BitSet(new long[]{0x00000000000320E0L});
+ public static final BitSet FOLLOW_ruleValidID_in_synpred1_InternalEFactory1120 = new BitSet(new long[]{0x0000000000020000L});
+ public static final BitSet FOLLOW_17_in_synpred1_InternalEFactory1127 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleReference_in_synpred2_InternalEFactory1255 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_24_in_synpred3_InternalEFactory2634 = new BitSet(new long[]{0x0000000000000002L});
} \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/serializer/EFactorySemanticSequencer.java b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/serializer/EFactorySemanticSequencer.java
index 30edecf..eb2407e 100644
--- a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/serializer/EFactorySemanticSequencer.java
+++ b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/serializer/EFactorySemanticSequencer.java
@@ -179,7 +179,7 @@ public class EFactorySemanticSequencer extends AbstractDelegatingSemanticSequenc
/**
* Constraint:
- * (eClass=[EClass|QualifiedName] nameFeature=[EAttribute|ID])
+ * (eClass=[EClass|QualifiedName] nameFeature=[EAttribute|QualifiedName])
*/
protected void sequence_CustomNameMapping(EObject context, CustomNameMapping semanticObject) {
if(errorAcceptor != null) {
@@ -191,7 +191,7 @@ public class EFactorySemanticSequencer extends AbstractDelegatingSemanticSequenc
INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
feeder.accept(grammarAccess.getCustomNameMappingAccess().getEClassEClassQualifiedNameParserRuleCall_2_0_1(), semanticObject.getEClass());
- feeder.accept(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeIDTerminalRuleCall_4_0_1(), semanticObject.getNameFeature());
+ feeder.accept(grammarAccess.getCustomNameMappingAccess().getNameFeatureEAttributeQualifiedNameParserRuleCall_4_0_1(), semanticObject.getNameFeature());
feeder.finish();
}
@@ -230,7 +230,7 @@ public class EFactorySemanticSequencer extends AbstractDelegatingSemanticSequenc
/**
* Constraint:
- * value=[EEnumLiteral|ID]
+ * value=[EEnumLiteral|QualifiedName]
*/
protected void sequence_EnumAttribute(EObject context, EnumAttribute semanticObject) {
if(errorAcceptor != null) {
@@ -239,7 +239,7 @@ public class EFactorySemanticSequencer extends AbstractDelegatingSemanticSequenc
}
INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
- feeder.accept(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralIDTerminalRuleCall_1_0_1(), semanticObject.getValue());
+ feeder.accept(grammarAccess.getEnumAttributeAccess().getValueEEnumLiteralQualifiedNameParserRuleCall_1_0_1(), semanticObject.getValue());
feeder.finish();
}
@@ -255,7 +255,7 @@ public class EFactorySemanticSequencer extends AbstractDelegatingSemanticSequenc
/**
* Constraint:
- * (eFeature=[EStructuralFeature|ID] value=Value?)
+ * (eFeature=[EStructuralFeature|QualifiedName] value=Value?)
*/
protected void sequence_Feature(EObject context, Feature semanticObject) {
genericSequencer.createSequence(context, semanticObject);
diff --git a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/services/EFactoryGrammarAccess.java b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/services/EFactoryGrammarAccess.java
index 0ba2e7c..994883a 100644
--- a/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/services/EFactoryGrammarAccess.java
+++ b/plugins/org.eclipse.emf.eson/src-gen/org/eclipse/emf/eson/services/EFactoryGrammarAccess.java
@@ -145,16 +145,16 @@ public class EFactoryGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cEqualsSignKeyword_3 = (Keyword)cGroup.eContents().get(3);
private final Assignment cNameFeatureAssignment_4 = (Assignment)cGroup.eContents().get(4);
private final CrossReference cNameFeatureEAttributeCrossReference_4_0 = (CrossReference)cNameFeatureAssignment_4.eContents().get(0);
- private final RuleCall cNameFeatureEAttributeIDTerminalRuleCall_4_0_1 = (RuleCall)cNameFeatureEAttributeCrossReference_4_0.eContents().get(1);
+ private final RuleCall cNameFeatureEAttributeQualifiedNameParserRuleCall_4_0_1 = (RuleCall)cNameFeatureEAttributeCrossReference_4_0.eContents().get(1);
private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
//// TODO further consider if name mapping is best put in-line into objects.. it would have to repeat in every file..
//// logically this rather belongs into an external mapping, like HUTN's Configuration (HutnConfig), or even better directly into an Xcore as annotations
//CustomNameMapping:
- // "@Name" "{" eClass=[ecore::EClass|QualifiedName] "=" nameFeature=[ecore::EAttribute] "}";
+ // "@Name" "{" eClass=[ecore::EClass|QualifiedName] "=" nameFeature=[ecore::EAttribute|QualifiedName] "}";
public ParserRule getRule() { return rule; }
- //"@Name" "{" eClass=[ecore::EClass|QualifiedName] "=" nameFeature=[ecore::EAttribute] "}"
+ //"@Name" "{" eClass=[ecore::EClass|QualifiedName] "=" nameFeature=[ecore::EAttribute|QualifiedName] "}"
public Group getGroup() { return cGroup; }
//"@Name"
@@ -175,14 +175,14 @@ public class EFactoryGrammarAccess extends AbstractGrammarElementFinder {
//"="
public Keyword getEqualsSignKeyword_3() { return cEqualsSignKeyword_3; }
- //nameFeature=[ecore::EAttribute]
+ //nameFeature=[ecore::EAttribute|QualifiedName]
public Assignment getNameFeatureAssignment_4() { return cNameFeatureAssignment_4; }
- //[ecore::EAttribute]
+ //[ecore::EAttribute|QualifiedName]
public CrossReference getNameFeatureEAttributeCrossReference_4_0() { return cNameFeatureEAttributeCrossReference_4_0; }
- //ID
- public RuleCall getNameFeatureEAttributeIDTerminalRuleCall_4_0_1() { return cNameFeatureEAttributeIDTerminalRuleCall_4_0_1; }
+ //QualifiedName
+ public RuleCall getNameFeatureEAttributeQualifiedNameParserRuleCall_4_0_1() { return cNameFeatureEAttributeQualifiedNameParserRuleCall_4_0_1; }
//"}"
public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
@@ -193,26 +193,26 @@ public class EFactoryGrammarAccess extends AbstractGrammarElementFinder {
private final Group cGroup = (Group)rule.eContents().get(1);
private final Assignment cEFeatureAssignment_0 = (Assignment)cGroup.eContents().get(0);
private final CrossReference cEFeatureEStructuralFeatureCrossReference_0_0 = (CrossReference)cEFeatureAssignment_0.eContents().get(0);
- private final RuleCall cEFeatureEStructuralFeatureIDTerminalRuleCall_0_0_1 = (RuleCall)cEFeatureEStructuralFeatureCrossReference_0_0.eContents().get(1);
+ private final RuleCall cEFeatureEStructuralFeatureQualifiedNameParserRuleCall_0_0_1 = (RuleCall)cEFeatureEStructuralFeatureCrossReference_0_0.eContents().get(1);
private final Keyword cColonKeyword_1 = (Keyword)cGroup.eContents().get(1);
private final Assignment cValueAssignment_2 = (Assignment)cGroup.eContents().get(2);
private final RuleCall cValueValueParserRuleCall_2_0 = (RuleCall)cValueAssignment_2.eContents().get(0);
//Feature:
- // eFeature=[ecore::EStructuralFeature] ":" value=Value?;
+ // eFeature=[ecore::EStructuralFeature|QualifiedName] ":" value=Value?;
public ParserRule getRule() { return rule; }
- //eFeature=[ecore::EStructuralFeature] ":" value=Value?
+ //eFeature=[ecore::EStructuralFeature|QualifiedName] ":" value=Value?
public Group getGroup() { return cGroup; }
- //eFeature=[ecore::EStructuralFeature]
+ //eFeature=[ecore::EStructuralFeature|QualifiedName]
public Assignment getEFeatureAssignment_0() { return cEFeatureAssignment_0; }
- //[ecore::EStructuralFeature]
+ //[ecore::EStructuralFeature|QualifiedName]
public CrossReference getEFeatureEStructuralFeatureCrossReference_0_0() { return cEFeatureEStructuralFeatureCrossReference_0_0; }
- //ID
- public RuleCall getEFeatureEStructuralFeatureIDTerminalRuleCall_0_0_1() { return cEFeatureEStructuralFeatureIDTerminalRuleCall_0_0_1; }
+ //QualifiedName
+ public RuleCall getEFeatureEStructuralFeatureQualifiedNameParserRuleCall_0_0_1() { return cEFeatureEStructuralFeatureQualifiedNameParserRuleCall_0_0_1; }
//":"
public Keyword getColonKeyword_1() { return cColonKeyword_1; }
@@ -237,7 +237,8 @@ public class EFactoryGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cFeaturesFeatureParserRuleCall_3_0 = (RuleCall)cFeaturesAssignment_3.eContents().get(0);
private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
- //// value isn't really optional semantically of course
+ //// Re. use of QualifiedName, see SimplestWeiredNameTest (we want to permit EAttribute name to have dots; strange yes, but due to a particular requirement in an in-house closed source product)
+ //// Also value isn't really optional semantically of course
//// but because it may be missing while typing, this works out much better in practice like this
//// the EFactoryJavaValidator flags it up if it's really missing
//// without this, there are confusing parsing errors, the proposal provider doesn't work as it should, etc.
@@ -470,26 +471,26 @@ public class EFactoryGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cColonKeyword_0 = (Keyword)cGroup.eContents().get(0);
private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1);
private final CrossReference cValueEEnumLiteralCrossReference_1_0 = (CrossReference)cValueAssignment_1.eContents().get(0);
- private final RuleCall cValueEEnumLiteralIDTerminalRuleCall_1_0_1 = (RuleCall)cValueEEnumLiteralCrossReference_1_0.eContents().get(1);
+ private final RuleCall cValueEEnumLiteralQualifiedNameParserRuleCall_1_0_1 = (RuleCall)cValueEEnumLiteralCrossReference_1_0.eContents().get(1);
//EnumAttribute:
- // ":" value=[ecore::EEnumLiteral];
+ // ":" value=[ecore::EEnumLiteral|QualifiedName];
public ParserRule getRule() { return rule; }
- //":" value=[ecore::EEnumLiteral]
+ //":" value=[ecore::EEnumLiteral|QualifiedName]
public Group getGroup() { return cGroup; }
//":"
public Keyword getColonKeyword_0() { return cColonKeyword_0; }
- //value=[ecore::EEnumLiteral]
+ //value=[ecore::EEnumLiteral|QualifiedName]
public Assignment getValueAssignment_1() { return cValueAssignment_1; }
- //[ecore::EEnumLiteral]
+ //[ecore::EEnumLiteral|QualifiedName]
public CrossReference getValueEEnumLiteralCrossReference_1_0() { return cValueEEnumLiteralCrossReference_1_0; }
- //ID
- public RuleCall getValueEEnumLiteralIDTerminalRuleCall_1_0_1() { return cValueEEnumLiteralIDTerminalRuleCall_1_0_1; }
+ //QualifiedName
+ public RuleCall getValueEEnumLiteralQualifiedNameParserRuleCall_1_0_1() { return cValueEEnumLiteralQualifiedNameParserRuleCall_1_0_1; }
}
public class StringAttributeElements extends AbstractParserRuleElementFinder {
@@ -872,7 +873,7 @@ public class EFactoryGrammarAccess extends AbstractGrammarElementFinder {
//// TODO further consider if name mapping is best put in-line into objects.. it would have to repeat in every file..
//// logically this rather belongs into an external mapping, like HUTN's Configuration (HutnConfig), or even better directly into an Xcore as annotations
//CustomNameMapping:
- // "@Name" "{" eClass=[ecore::EClass|QualifiedName] "=" nameFeature=[ecore::EAttribute] "}";
+ // "@Name" "{" eClass=[ecore::EClass|QualifiedName] "=" nameFeature=[ecore::EAttribute|QualifiedName] "}";
public CustomNameMappingElements getCustomNameMappingAccess() {
return (pCustomNameMapping != null) ? pCustomNameMapping : (pCustomNameMapping = new CustomNameMappingElements());
}
@@ -882,7 +883,7 @@ public class EFactoryGrammarAccess extends AbstractGrammarElementFinder {
}
//Feature:
- // eFeature=[ecore::EStructuralFeature] ":" value=Value?;
+ // eFeature=[ecore::EStructuralFeature|QualifiedName] ":" value=Value?;
public FeatureElements getFeatureAccess() {
return (pFeature != null) ? pFeature : (pFeature = new FeatureElements());
}
@@ -891,7 +892,8 @@ public class EFactoryGrammarAccess extends AbstractGrammarElementFinder {
return getFeatureAccess().getRule();
}
- //// value isn't really optional semantically of course
+ //// Re. use of QualifiedName, see SimplestWeiredNameTest (we want to permit EAttribute name to have dots; strange yes, but due to a particular requirement in an in-house closed source product)
+ //// Also value isn't really optional semantically of course
//// but because it may be missing while typing, this works out much better in practice like this
//// the EFactoryJavaValidator flags it up if it's really missing
//// without this, there are confusing parsing errors, the proposal provider doesn't work as it should, etc.
@@ -954,7 +956,7 @@ public class EFactoryGrammarAccess extends AbstractGrammarElementFinder {
}
//EnumAttribute:
- // ":" value=[ecore::EEnumLiteral];
+ // ":" value=[ecore::EEnumLiteral|QualifiedName];
public EnumAttributeElements getEnumAttributeAccess() {
return (pEnumAttribute != null) ? pEnumAttribute : (pEnumAttribute = new EnumAttributeElements());
}
diff --git a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/EFactory.xtext b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/EFactory.xtext
index e4d45d2..f8ff3bb 100644
--- a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/EFactory.xtext
+++ b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/EFactory.xtext
@@ -29,11 +29,12 @@ Annotation:
// logically this rather belongs into an external mapping, like HUTN's Configuration (HutnConfig), or even better directly into an Xcore as annotations
CustomNameMapping:
- "@Name" "{" eClass=[ecore::EClass|QualifiedName] "=" nameFeature=[ecore::EAttribute] "}" ;
+ "@Name" "{" eClass=[ecore::EClass|QualifiedName] "=" nameFeature=[ecore::EAttribute|QualifiedName] "}" ;
Feature:
- eFeature=[ecore::EStructuralFeature] ":" (value=Value)? ;
- // value isn't really optional semantically of course
+ eFeature=[ecore::EStructuralFeature|QualifiedName] ":" (value=Value)? ;
+ // Re. use of QualifiedName, see SimplestWeiredNameTest (we want to permit EAttribute name to have dots; strange yes, but due to a particular requirement in an in-house closed source product)
+ // Also value isn't really optional semantically of course
// but because it may be missing while typing, this works out much better in practice like this
// the EFactoryJavaValidator flags it up if it's really missing
// without this, there are confusing parsing errors, the proposal provider doesn't work as it should, etc.
@@ -66,7 +67,7 @@ Reference:
Attribute: (EnumAttribute | StringAttribute | IntegerAttribute | BooleanAttribute | DoubleAttribute | DateAttribute | NullAttribute);
-EnumAttribute: ":" value = [ecore::EEnumLiteral];
+EnumAttribute: ":" value = [ecore::EEnumLiteral|QualifiedName];
// TODO Attribute Types should later not be hard-coded here anymore.. Grammar should be more open & generic.
diff --git a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/GenerateEFactory.mwe2 b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/GenerateEFactory.mwe2
index 64be803..d18d681 100644
--- a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/GenerateEFactory.mwe2
+++ b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/GenerateEFactory.mwe2
@@ -129,12 +129,6 @@ Workflow {
// rename refactoring
fragment = refactoring.RefactorElementNameFragment {}
- // provides the necessary bindings for java types integration
- fragment = types.TypesGeneratorFragment {}
-
- // generates the required bindings only if the grammar inherits from Xbase
- fragment = xbase.XbaseGeneratorFragment {}
-
// provides a preference page for template proposals
fragment = templates.CodetemplatesGeneratorFragment {}
diff --git a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/resource/EFactoryDerivedStateComputer.java b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/resource/EFactoryDerivedStateComputer.java
index 233a8a1..cd60f76 100644
--- a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/resource/EFactoryDerivedStateComputer.java
+++ b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/resource/EFactoryDerivedStateComputer.java
@@ -69,6 +69,7 @@ public class EFactoryDerivedStateComputer implements IDerivedStateComputer {
* true -> create EObjects which should be exported, don't resolve any cross references
* false -> create all EObjects, also cross references can be resolved
*/
+ @Override
public void installDerivedState(DerivedStateAwareResource resource, boolean preLinkingPhase) {
// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=437848 (AKA DS-7543)
try {
@@ -134,6 +135,7 @@ public class EFactoryDerivedStateComputer implements IDerivedStateComputer {
return (Factory) resource.getContents().get(0);
}
+ @Override
public void discardDerivedState(DerivedStateAwareResource resource) {
EList<Adapter> eAdapters = resource.eAdapters();
Adapter adapter = EcoreUtil2.getAdapter(eAdapters, EFactoryAdapter.class);
diff --git a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/DottedQualifiedNameAwareScope.java b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/DottedQualifiedNameAwareScope.java
new file mode 100644
index 0000000..e481ca3
--- /dev/null
+++ b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/DottedQualifiedNameAwareScope.java
@@ -0,0 +1,74 @@
+/*
+ * #%L
+ * org.eclipse.emf.eson.tests
+ * %%
+ * Copyright (C) 2015 Michael Vorburger
+ * %%
+ * 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
+ * #L%
+ */
+package org.eclipse.emf.eson.scoping;
+
+import java.util.Collections;
+
+import org.eclipse.xtext.naming.QualifiedName;
+import org.eclipse.xtext.resource.IEObjectDescription;
+import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.scoping.impl.AbstractScope;
+
+/**
+ * IScope wrapper which "uses different combinations of QNs' segments to find a single element or elements".
+ *
+ * @see SimplestWeiredNameTest
+ *
+ * @author Anton Kosyakov
+ */
+public class DottedQualifiedNameAwareScope extends AbstractScope {
+
+ public DottedQualifiedNameAwareScope(IScope parent, boolean ignoreCase) {
+ super(parent, ignoreCase);
+ }
+
+ @Override
+ public IEObjectDescription getSingleElement(QualifiedName name) {
+ IEObjectDescription singleElement = super.getSingleElement(name);
+ if (singleElement != null) {
+ return singleElement;
+ }
+ QualifiedName mergedName = mergeTwoLastSegments(name);
+ if (mergedName == null) {
+ return null;
+ }
+ return getSingleElement(mergedName);
+ }
+
+ @Override
+ public Iterable<IEObjectDescription> getElements(QualifiedName name) {
+ Iterable<IEObjectDescription> elements = super.getElements(name);
+ if (elements.iterator().hasNext()) {
+ return elements;
+ }
+ QualifiedName mergedName = mergeTwoLastSegments(name);
+ if (mergedName == null) {
+ return elements;
+ }
+ return getElements(mergedName);
+ }
+
+ protected QualifiedName mergeTwoLastSegments(QualifiedName name) {
+ if (name.getSegmentCount() <= 1) {
+ return null;
+ }
+ String mergedSegments = name.getSegment(name.getSegmentCount() - 2) + '.' + name.getLastSegment();
+ return name.skipLast(2).append(mergedSegments);
+ }
+
+ @Override
+ protected Iterable<IEObjectDescription> getAllLocalElements() {
+ return Collections.emptyList();
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/DottedQualifiedNameFixer.java b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/DottedQualifiedNameFixer.java
new file mode 100644
index 0000000..924ffcb
--- /dev/null
+++ b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/DottedQualifiedNameFixer.java
@@ -0,0 +1,67 @@
+/*
+ * #%L
+ * org.eclipse.emf.eson.tests
+ * %%
+ * Copyright (C) 2015 Michael Vorburger
+ * %%
+ * 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
+ * #L%
+ */
+package org.eclipse.emf.eson.scoping;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.naming.QualifiedName;
+import org.eclipse.xtext.util.SimpleAttributeResolver;
+
+import com.google.common.base.Function;
+import com.google.common.base.Splitter;
+
+/**
+ * Utility which split QNs that have a dot in one their segments into a
+ * qualified name that has these segments split as well.
+ *
+ * See SimplestWeiredNameTest for why this is needed.
+ *
+ * @author Michael Vorburger, based on discussion with Jan Köhnlein
+ */
+public class DottedQualifiedNameFixer {
+
+ private static final Function<EObject, QualifiedName> originalFunction = QualifiedName.wrapper(SimpleAttributeResolver.NAME_RESOLVER);
+
+ public static final Function<EObject, QualifiedName> FUNCTION = new Function<EObject, QualifiedName>() {
+ @Override
+ public QualifiedName apply(EObject input) {
+ QualifiedName qn = originalFunction.apply(input);
+ QualifiedName splitQN = split(qn);
+ return splitQN;
+ }
+ };
+
+ private static Splitter dotSplitter = Splitter.on('.');
+
+ public static QualifiedName split(QualifiedName qn) {
+ List<String> newSegments = new ArrayList<String>(qn.getSegments().size() + 1);
+ List<String> segments = qn.getSegments();
+ for (String segment : segments) {
+ if (segment.contains(".")) {
+ Iterable<String> split = dotSplitter.split(segment);
+ for (String subSegment : split) {
+ newSegments.add(subSegment);
+ }
+ } else {
+ newSegments.add(segment);
+ }
+ }
+ if (newSegments.size() == segments.size())
+ return qn;
+ else
+ return QualifiedName.create(newSegments);
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EFactoryScopeProvider.java b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EFactoryScopeProvider.java
index 67a3616..a452e25 100644
--- a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EFactoryScopeProvider.java
+++ b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EFactoryScopeProvider.java
@@ -15,8 +15,8 @@ package org.eclipse.emf.eson.scoping;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.eson.eFactory.Factory;
import org.eclipse.emf.eson.eFactory.Feature;
+import org.eclipse.emf.eson.eFactory.NewObject;
import org.eclipse.emf.eson.eFactory.PackageImport;
import org.eclipse.xtext.scoping.IScope;
@@ -32,9 +32,10 @@ public class EFactoryScopeProvider extends EFactoryScopeProviderNG {
return ePackageScopeProvider.createEPackageScope(packageImport.eResource(), parent);
}
- public IScope scope_NewObject_eClass(Factory factory, EReference eReference) {
- final IScope parent = delegateGetScope(factory, eReference);
- return ePackageScopeProvider.createEClassScope(factory.eResource(), parent);
+ public IScope scope_NewObject_eClass(NewObject factory, EReference eReference) {
+ final IScope parent = super.scope_EClass(factory, eReference);
+ IScope scope = ePackageScopeProvider.createEClassScope(factory.eResource(), parent);
+ return scope;
}
// Feature == Containment here, always, is it?
@@ -44,7 +45,7 @@ public class EFactoryScopeProvider extends EFactoryScopeProviderNG {
return ePackageScopeProvider.createEClassScope(feature.eResource(), (EClass) feature.getEFeature().getEType(), parent);
} else
return IScope.NULLSCOPE;
-
+
}
public IScope scope_CustomNameMapping_eClass(EObject context, EReference eReference) {
diff --git a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EFactoryScopeProviderNG.java b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EFactoryScopeProviderNG.java
index c4b159b..8f792bc 100644
--- a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EFactoryScopeProviderNG.java
+++ b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EFactoryScopeProviderNG.java
@@ -24,9 +24,9 @@ import org.eclipse.emf.eson.eFactory.EnumAttribute;
import org.eclipse.emf.eson.eFactory.Feature;
import org.eclipse.emf.eson.eFactory.MultiValue;
import org.eclipse.emf.eson.eFactory.NewObject;
-import org.eclipse.emf.eson.eFactory.Reference;
import org.eclipse.emf.eson.util.EcoreUtil3;
import org.eclipse.xtext.resource.IEObjectDescription;
+import org.eclipse.xtext.scoping.ICaseInsensitivityHelper;
import org.eclipse.xtext.scoping.IScope;
import org.eclipse.xtext.scoping.Scopes;
import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
@@ -34,14 +34,18 @@ import org.eclipse.xtext.scoping.impl.FilteringScope;
import org.eclipse.xtext.scoping.impl.SimpleScope;
import com.google.common.base.Predicate;
+import com.google.inject.Inject;
public class EFactoryScopeProviderNG extends AbstractDeclarativeScopeProvider {
+ @Inject
+ private ICaseInsensitivityHelper caseInsensitivityHelper;
+
public IScope scope_EnumAttribute_value(EnumAttribute attribute, EReference reference) {
Feature feature = getFeature(attribute);
if (feature.getEFeature().getEType() instanceof EEnum) {
EEnum enumType = (EEnum) feature.getEFeature().getEType();
- Iterable<IEObjectDescription> elements = Scopes.scopedElementsFor(enumType.getELiterals());
+ Iterable<IEObjectDescription> elements = Scopes.scopedElementsFor(enumType.getELiterals(), DottedQualifiedNameFixer.FUNCTION);
return new SimpleScope(elements);
}
return IScope.NULLSCOPE;
@@ -52,8 +56,10 @@ public class EFactoryScopeProviderNG extends AbstractDeclarativeScopeProvider {
public IScope scope_Feature_eFeature(NewObject newObject, EReference reference) {
EClass eClass = newObject.getEClass();
Iterable<? extends EObject> assignableFeature = EcoreUtil3.getAssignableFeatures(eClass);
- return new SimpleScope(Scopes.scopedElementsFor(assignableFeature));
+ Iterable<IEObjectDescription> descs = Scopes.scopedElementsFor(assignableFeature, DottedQualifiedNameFixer.FUNCTION);
+ return new SimpleScope(descs);
}
+
public IScope scope_Feature_eFeature(Feature feature, EReference reference) {
NewObject newObject = (NewObject) feature.eContainer();
return scope_Feature_eFeature(newObject, reference);
@@ -63,11 +69,12 @@ public class EFactoryScopeProviderNG extends AbstractDeclarativeScopeProvider {
if (newObject.getEClass() == null) {
return IScope.NULLSCOPE;
}
- return new SimpleScope(Scopes.scopedElementsFor(newObject.getEClass().getEAllStructuralFeatures()));
+ return new SimpleScope(Scopes.scopedElementsFor(newObject.getEClass().getEAllStructuralFeatures(), DottedQualifiedNameFixer.FUNCTION));
}
- public IScope scope_NewObject_eClass(Reference reference, EReference eReference) {
- return IScope.NULLSCOPE;
+ public IScope scope_EClass(EObject context, EReference reference) {
+ IScope scope = delegateGetScope(context, reference);
+ return new DottedQualifiedNameAwareScope(scope, isIgnoreCase(reference));
}
public IScope scope_Reference_value(Feature feature, EReference eReference) {
@@ -87,7 +94,7 @@ public class EFactoryScopeProviderNG extends AbstractDeclarativeScopeProvider {
public IScope scope_CustomNameMapping_nameFeature(CustomNameMapping mapping, EReference reference) {
Iterable<EAttribute> attributes = EcoreUtil3.getAllAttributes(mapping.getEClass(), String.class);
- Iterable<IEObjectDescription> elements = Scopes.scopedElementsFor(attributes);
+ Iterable<IEObjectDescription> elements = Scopes.scopedElementsFor(attributes, DottedQualifiedNameFixer.FUNCTION);
return new SimpleScope(elements);
}
@@ -107,4 +114,8 @@ public class EFactoryScopeProviderNG extends AbstractDeclarativeScopeProvider {
return (Feature) container;
}
+ protected boolean isIgnoreCase(EReference reference) {
+ return caseInsensitivityHelper.isIgnoreCase(reference);
+ }
+
}
diff --git a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EPackageScopeProvider.java b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EPackageScopeProvider.java
index 7ddd61d..51c37bf 100644
--- a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EPackageScopeProvider.java
+++ b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/scoping/EPackageScopeProvider.java
@@ -44,13 +44,17 @@ public class EPackageScopeProvider implements IEPackageScopeProvider {
public IScope createEClassScope(Resource resource, EClass type, IScope parent) {
Iterable<EPackage> ePackages = resolvePackages(resource);
Iterable<EClass> eClasses = getAllEClasses(ePackages);
- Iterable<EClass> filteredEClasses = filterAssignableEClasses(eClasses, type);
- Iterable<IEObjectDescription> scopedElements = Scopes.scopedElementsFor(filteredEClasses);
+ if (type != null)
+ eClasses = filterAssignableEClasses(eClasses, type);
+ Iterable<IEObjectDescription> scopedElements = Scopes.scopedElementsFor(eClasses, DottedQualifiedNameFixer.FUNCTION);
return new SimpleScope(parent, scopedElements);
}
- private Iterable<EClass> filterAssignableEClasses(
- Iterable<EClass> eClasses, final EClass targetType) {
+ public IScope createEClassScope(Resource resource, IScope parent) {
+ return createEClassScope(resource, null, parent);
+ }
+
+ private Iterable<EClass> filterAssignableEClasses(Iterable<EClass> eClasses, final EClass targetType) {
return Iterables.filter(eClasses, new Predicate<EClass>() {
public boolean apply(EClass input) {
@@ -69,7 +73,6 @@ public class EPackageScopeProvider implements IEPackageScopeProvider {
return Collections.emptyList();
}
return eFactoryUtil.getEPackages(root);
-
}
public Iterable<EClass> getAllEClasses(Iterable<? extends EPackage> ePackages) {
@@ -85,16 +88,9 @@ public class EPackageScopeProvider implements IEPackageScopeProvider {
return result;
}
- public IScope createEClassScope(Resource resource, IScope parent) {
- Iterable<EPackage> ePackages = resolvePackages(resource);
- Iterable<EClass> eClasses = getAllEClasses(ePackages);
- Iterable<IEObjectDescription> scopedElements = Scopes.scopedElementsFor(eClasses);
- return new SimpleScope(parent, scopedElements);
- }
-
public IScope createEPackageScope(Resource eResource, IScope parent) {
Iterable<EPackage> ePackages = packageResolver.getAllRegisteredEPackages();
- Iterable<IEObjectDescription> scopedElements = Scopes.scopedElementsFor(ePackages);
+ Iterable<IEObjectDescription> scopedElements = Scopes.scopedElementsFor(ePackages /* no need for DottedQualifiedNameFixer.FUNCTION, as no EPackages with dots */ );
return new SimpleScope(parent, scopedElements);
}
diff --git a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/util/EcoreUtil3.java b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/util/EcoreUtil3.java
index 8843d7a..b7ab4fb 100644
--- a/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/util/EcoreUtil3.java
+++ b/plugins/org.eclipse.emf.eson/src/org/eclipse/emf/eson/util/EcoreUtil3.java
@@ -28,10 +28,10 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.eson.eFactory.Feature;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-import org.eclipse.emf.eson.eFactory.Feature;
public final class EcoreUtil3 {
@@ -154,11 +154,9 @@ public final class EcoreUtil3 {
return eType instanceof EEnum;
}
- public static Iterable<? extends EObject> getAssignableFeatures(
- EClass eClass) {
+ public static Iterable<? extends EStructuralFeature> getAssignableFeatures(EClass eClass) {
return Iterables.filter(eClass.getEAllStructuralFeatures(),
new Predicate<EStructuralFeature>() {
-
public boolean apply(EStructuralFeature input) {
return input.isChangeable();
}
diff --git a/tests/org.eclipse.emf.eson.tests/launch/EFactory all tests.launch b/tests/org.eclipse.emf.eson.tests/launch/EFactory all tests.launch
index ee6d966..06995ed 100644
--- a/tests/org.eclipse.emf.eson.tests/launch/EFactory all tests.launch
+++ b/tests/org.eclipse.emf.eson.tests/launch/EFactory all tests.launch
@@ -31,7 +31,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.eson.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -Dorg.eclipse.swt.browser.DefaultType=mozilla -XX:PermSize=64m -XX:MaxPermSize=384m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
diff --git a/tests/org.eclipse.emf.eson.tests/model/TestModelWithDotInNames.ecore b/tests/org.eclipse.emf.eson.tests/model/TestModelWithDotInNames.ecore
new file mode 100644
index 0000000..84bdda7
--- /dev/null
+++ b/tests/org.eclipse.emf.eson.tests/model/TestModelWithDotInNames.ecore
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="testmodelWithDotInNames" nsURI="http://testmodelWithDotInNames/1.0"
+ nsPrefix="testmodelWithDotInNames">
+ <eClassifiers xsi:type="ecore:EClass" name="NormallyNamed">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="STRANGE.NAME" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="STRANGE.ENUM" eType="#//WEIRD.ENUM"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="WEIRDO.CONTAINER" eType="#//WEIRDO.NAMED"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="WEIRDO.NAMED">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="STRANGE.NAME" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="WEIRD.ENUM">
+ <eLiterals name="DEFAULT" value="-1"/>
+ <eLiterals name="normal"/>
+ <eLiterals name="weird.literal" value="1"/>
+ </eClassifiers>
+</ecore:EPackage>
diff --git a/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots1.eson b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots1.eson
new file mode 100644
index 0000000..b3a8060
--- /dev/null
+++ b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots1.eson
@@ -0,0 +1,5 @@
+import testmodelWithDotInNames.*
+
+NormallyNamed { // OR: testmodelWithDotInNames.NormallyNamed {
+ STRANGE.NAME: "hello"
+}
diff --git a/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots2.eson b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots2.eson
new file mode 100644
index 0000000..ca287e1
--- /dev/null
+++ b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots2.eson
@@ -0,0 +1,5 @@
+import testmodelWithDotInNames.*
+
+WEIRDO.NAMED {
+ STRANGE.NAME: "hello"
+}
diff --git a/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots3enumA.eson b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots3enumA.eson
new file mode 100644
index 0000000..6a998bc
--- /dev/null
+++ b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots3enumA.eson
@@ -0,0 +1,5 @@
+import testmodelWithDotInNames.*
+
+NormallyNamed {
+ STRANGE.ENUM: :normal
+}
diff --git a/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots3enumB.eson b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots3enumB.eson
new file mode 100644
index 0000000..c106540
--- /dev/null
+++ b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots3enumB.eson
@@ -0,0 +1,5 @@
+import testmodelWithDotInNames.*
+
+NormallyNamed {
+ STRANGE.ENUM: :weird.literal
+}
diff --git a/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots4contained.eson b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots4contained.eson
new file mode 100644
index 0000000..5e12a06
--- /dev/null
+++ b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots4contained.eson
@@ -0,0 +1,7 @@
+import testmodelWithDotInNames.*
+
+NormallyNamed {
+ WEIRDO.CONTAINER: WEIRDO.NAMED {
+ STRANGE.NAME: "saluton"
+ }
+}
diff --git a/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots5omg.eson b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots5omg.eson
new file mode 100644
index 0000000..2feb753
--- /dev/null
+++ b/tests/org.eclipse.emf.eson.tests/res/BuilderTests/SimplestWithWeiredNamesWithDots5omg.eson
@@ -0,0 +1,6 @@
+// NO import testmodelWithDotInNames.*
+
+// OMG, "testmodelWithDotIn" is the EPackage, "WEIRDO.NAMED" is the EClass, the dot separation is confusing, yet it still works! ;-)
+testmodelWithDotInNames.WEIRDO.NAMED {
+ STRANGE.NAME: "hello"
+}
diff --git a/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/builder/tests/SimplestTest.java b/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/builder/tests/SimplestTest.java
index bce6a09..7485b7b 100644
--- a/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/builder/tests/SimplestTest.java
+++ b/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/builder/tests/SimplestTest.java
@@ -35,4 +35,5 @@ public class SimplestTest {
TestModel m = provider.loadModel("res/BuilderTests/Simplest.eson", TestModel.class);
assertEquals("abc", m.getName());
}
+
}
diff --git a/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/builder/tests/SimplestWeiredNameTest.java b/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/builder/tests/SimplestWeiredNameTest.java
new file mode 100644
index 0000000..984c145
--- /dev/null
+++ b/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/builder/tests/SimplestWeiredNameTest.java
@@ -0,0 +1,105 @@
+/*
+ * #%L
+ * org.eclipse.emf.eson.tests
+ * %%
+ * Copyright (C) 2013 - 2015 Michael Vorburger
+ * %%
+ * 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
+ * #L%
+ */
+package org.eclipse.emf.eson.builder.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.inject.Inject;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.eson.tests.util.DumpIndexUtil;
+import org.eclipse.emf.eson.tests.util.ESONWithTestmodelAndDynamicECoreInjectorProvider;
+import org.eclipse.emf.eson.tests.util.ResourceProvider;
+import org.eclipse.xtext.junit4.InjectWith;
+import org.eclipse.xtext.junit4.XtextRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(XtextRunner.class)
+@InjectWith(ESONWithTestmodelAndDynamicECoreInjectorProvider.class) // NOT just ESONWithTestmodelInjectorProvider
+public class SimplestWeiredNameTest {
+ // see also SimplestDynamicECoreTest - these tests here are written in the same style
+
+ @Inject ResourceProvider provider;
+
+ @Test public void testNormallyNamedEClassWithWeirdoAttributeName() throws Exception {
+ EObject em = check("model/TestModelWithDotInNames.ecore",
+ "res/BuilderTests/SimplestWithWeiredNamesWithDots1.eson",
+ "NormallyNamed");
+ String strangelyNamedAttributeValue = (String) em.eGet(em.eClass().getEAllAttributes().get(0));
+ assertEquals("hello", strangelyNamedAttributeValue);
+ }
+
+ @Test public void testWeirdoNamedEClassAndAttributeName() throws Exception {
+ EObject em = check("model/TestModelWithDotInNames.ecore",
+ "res/BuilderTests/SimplestWithWeiredNamesWithDots2.eson",
+ "WEIRDO.NAMED");
+ String strangelyNamedAttributeValue = (String) em.eGet(em.eClass().getEAllAttributes().get(0));
+ assertEquals("hello", strangelyNamedAttributeValue);
+ }
+
+ @Test public void testNormallyNamedEClassWithWeirdoEnumNameAndNormalLiteral() throws Exception {
+ EObject em = check("model/TestModelWithDotInNames.ecore",
+ "res/BuilderTests/SimplestWithWeiredNamesWithDots3enumA.eson",
+ "NormallyNamed");
+ EEnumLiteral strangelyNamedEnum = (EEnumLiteral) em.eGet(em.eClass().getEAllAttributes().get(1));
+ assertEquals("normal", strangelyNamedEnum.getName());
+ }
+
+ @Test public void testNormallyNamedEClassWithWeirdoEnumNameAndWeirdoLiteral() throws Exception {
+ EObject em = check("model/TestModelWithDotInNames.ecore",
+ "res/BuilderTests/SimplestWithWeiredNamesWithDots3enumB.eson",
+ "NormallyNamed");
+ EEnumLiteral strangelyNamedEnum = (EEnumLiteral) em.eGet(em.eClass().getEAllAttributes().get(1));
+ assertEquals("weird.literal", strangelyNamedEnum.getName());
+ }
+
+ @Test public void testNormallyNamedEClassWithWeirdoContained() throws Exception {
+ EObject em = check("model/TestModelWithDotInNames.ecore",
+ "res/BuilderTests/SimplestWithWeiredNamesWithDots4contained.eson",
+ "NormallyNamed");
+ EReference weirdoContainerERef = em.eClass().getEAllContainments().get(0);
+ assertNotNull(weirdoContainerERef);
+ EObject strangelyNamedContained = (EObject) em.eGet(weirdoContainerERef);
+ assertNotNull(strangelyNamedContained);
+ EAttribute strangeNameEAttribute = strangelyNamedContained.eClass().getEAllAttributes().get(0);
+ String strangelyNamedAttributeValue = (String) strangelyNamedContained.eGet(strangeNameEAttribute);
+ assertEquals("saluton", strangelyNamedAttributeValue);
+ }
+
+ @Test public void testWeirdoNamedEClassAndAttributeWithoutPackageImportOMG() throws Exception {
+ EObject em = check("model/TestModelWithDotInNames.ecore",
+ "res/BuilderTests/SimplestWithWeiredNamesWithDots5omg.eson",
+ "WEIRDO.NAMED");
+ String strangelyNamedAttributeValue = (String) em.eGet(em.eClass().getEAllAttributes().get(0));
+ assertEquals("hello", strangelyNamedAttributeValue);
+ }
+
+ protected EObject check(String ecorePath, String esonPath, String expectedEClassName) throws Exception {
+ provider.load(ecorePath, false /* do NOT validate, as the weird names with dot violate ECore validation */);
+ // Do NOT DumpIndexUtil.dumpXtextIndex(ePackage.eResource()); as that does not work yet for *.ecore as this stage (later below on an *.eson it works - and dumps the *.ecore as well)
+
+ // DEBUG:
+ EList<EObject> content = provider.load(esonPath, false);
+ DumpIndexUtil.dumpXtextIndex(content.get(0).eResource());
+
+ EObject em = provider.loadModel(esonPath, EObject.class);
+ assertEquals(expectedEClassName, em.eClass().getName());
+ return em;
+ }
+}
diff --git a/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/tests/util/DumpIndexUtil.java b/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/tests/util/DumpIndexUtil.java
index 15e464e..8cbb2f0 100644
--- a/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/tests/util/DumpIndexUtil.java
+++ b/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/tests/util/DumpIndexUtil.java
@@ -32,7 +32,7 @@ import org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions;
public class DumpIndexUtil {
private DumpIndexUtil() {}
- private IResourceServiceProvider.Registry registry = IResourceServiceProvider.Registry.INSTANCE;
+ private static final IResourceServiceProvider.Registry registry = IResourceServiceProvider.Registry.INSTANCE;
public static void dumpXtextIndex(Resource r) {
new DumpIndexUtil()._dumpXtextIndex(r);
@@ -47,7 +47,9 @@ public class DumpIndexUtil {
for (IEObjectDescription desc : descs) {
System.out.print(" ");
System.out.print(desc.getQualifiedName().toString("::"));
- System.out.print(" => ");
+ System.out.print(" (");
+ System.out.print(desc.getEClass().getName());
+ System.out.print(") => ");
System.out.println(desc.getEObjectURI());
}
}
diff --git a/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/util/tests/DottedQualifiedNameFixerTest.java b/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/util/tests/DottedQualifiedNameFixerTest.java
new file mode 100644
index 0000000..3b9ef79
--- /dev/null
+++ b/tests/org.eclipse.emf.eson.tests/src/org/eclipse/emf/eson/util/tests/DottedQualifiedNameFixerTest.java
@@ -0,0 +1,53 @@
+/*
+ * #%L
+ * org.eclipse.emf.eson.tests
+ * %%
+ * Copyright (C) 2015 Michael Vorburger
+ * %%
+ * 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
+ * #L%
+ */
+package org.eclipse.emf.eson.util.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.eclipse.emf.eson.scoping.DottedQualifiedNameFixer;
+import org.eclipse.xtext.naming.QualifiedName;
+import org.junit.Test;
+
+public class DottedQualifiedNameFixerTest {
+
+ @Test public void nameWithNoDots() {
+ QualifiedName qn = QualifiedName.create("someName");
+ assertEquals(1, qn.getSegmentCount());
+
+ qn = DottedQualifiedNameFixer.split(qn);
+ assertEquals(1, qn.getSegmentCount());
+ assertEquals("someName", qn.getSegment(0));
+ }
+
+ @Test public void nameWithOneDot() {
+ QualifiedName qn = QualifiedName.create("STRANGE.NAME");
+ assertEquals(1, qn.getSegmentCount());
+
+ qn = DottedQualifiedNameFixer.split(qn);
+ assertEquals(2, qn.getSegmentCount());
+ assertEquals("STRANGE", qn.getSegment(0));
+ assertEquals("NAME", qn.getSegment(1));
+ }
+
+ @Test public void nameWithTwoDots() {
+ QualifiedName qn = QualifiedName.create("STRANGE.NAME.MORE");
+ assertEquals(1, qn.getSegmentCount());
+
+ qn = DottedQualifiedNameFixer.split(qn);
+ assertEquals(3, qn.getSegmentCount());
+ assertEquals("STRANGE", qn.getSegment(0));
+ assertEquals("NAME", qn.getSegment(1));
+ assertEquals("MORE", qn.getSegment(2));
+ }
+
+}

Back to the top