diff options
| author | Ed Willink | 2017-05-18 17:37:46 +0000 |
|---|---|---|
| committer | Ed Willink | 2017-05-18 17:40:50 +0000 |
| commit | 7b2e0d1a2005f65acda418b5202ce4e99555fca1 (patch) | |
| tree | e5dd190c5b38ee242bb2fae35852bb92c90050a7 /plugins | |
| parent | e7da899790760f83ce147c9c1a1958ccf1f56d8b (diff) | |
| download | org.eclipse.qvtd-7b2e0d1a2005f65acda418b5202ce4e99555fca1.tar.gz org.eclipse.qvtd-7b2e0d1a2005f65acda418b5202ce4e99555fca1.tar.xz org.eclipse.qvtd-7b2e0d1a2005f65acda418b5202ce4e99555fca1.zip | |
[515327] Regenerate with rationalized overrides/overridden
Diffstat (limited to 'plugins')
67 files changed, 968 insertions, 1302 deletions
diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/QVTmModelsMerger.java b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/QVTmModelsMerger.java index c5efc863e..cb110db2c 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/QVTmModelsMerger.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/QVTmModelsMerger.java @@ -257,7 +257,7 @@ public class QVTmModelsMerger { predicate.setConditionExpression(createOclIsKindOfOperationCall(envF, inputVar, refiningType)); mappingToRefactor.getGuardPattern().getPredicate().add(predicate); // And set the refinement - refiningMapping.setOverrides(mappingToRefactor); + refiningMapping.setOverridden(mappingToRefactor); } private static Variable getInputVariable(Mapping mapping) { diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java index e69c6f63a..c0797f81a 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java @@ -1206,31 +1206,31 @@ public interface QVTbasePackage extends EPackage { int RULE__IS_ABSTRACT = PivotPackage.NAMED_ELEMENT_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Overrides</b></em>' reference. + * The feature id for the '<em><b>Overridden</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RULE__OVERRIDES = PivotPackage.NAMED_ELEMENT_FEATURE_COUNT + 2; + int RULE__OVERRIDDEN = PivotPackage.NAMED_ELEMENT_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Transformation</b></em>' container reference. + * The feature id for the '<em><b>Overrides</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RULE__TRANSFORMATION = PivotPackage.NAMED_ELEMENT_FEATURE_COUNT + 3; + int RULE__OVERRIDES = PivotPackage.NAMED_ELEMENT_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Overridden</b></em>' reference list. + * The feature id for the '<em><b>Transformation</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RULE__OVERRIDDEN = PivotPackage.NAMED_ELEMENT_FEATURE_COUNT + 4; + int RULE__TRANSFORMATION = PivotPackage.NAMED_ELEMENT_FEATURE_COUNT + 4; /** * The number of structural features of the '<em>Rule</em>' class. @@ -1278,22 +1278,13 @@ public interface QVTbasePackage extends EPackage { int RULE___VALIDATE_NO_OVERRIDES_CYCLE__DIAGNOSTICCHAIN_MAP = PivotPackage.NAMED_ELEMENT_OPERATION_COUNT + 1; /** - * The operation id for the '<em>Validate Overrides Rule Is Extended Rule</em>' operation. + * The operation id for the '<em>Validate Overriding Rule Overrides All Domains</em>' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RULE___VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE__DIAGNOSTICCHAIN_MAP = PivotPackage.NAMED_ELEMENT_OPERATION_COUNT + 2; - - /** - * The operation id for the '<em>Validate Overrides Rule Overrides All Domains</em>' operation. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int RULE___VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP = PivotPackage.NAMED_ELEMENT_OPERATION_COUNT + 3; + int RULE___VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP = PivotPackage.NAMED_ELEMENT_OPERATION_COUNT + 2; /** * The number of operations of the '<em>Rule</em>' class. @@ -1302,7 +1293,7 @@ public interface QVTbasePackage extends EPackage { * @generated * @ordered */ - int RULE_OPERATION_COUNT = PivotPackage.NAMED_ELEMENT_OPERATION_COUNT + 4; + int RULE_OPERATION_COUNT = PivotPackage.NAMED_ELEMENT_OPERATION_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtbase.impl.TransformationImpl <em>Transformation</em>}' class. @@ -2054,10 +2045,10 @@ public interface QVTbasePackage extends EPackage { EAttribute getRule_IsAbstract(); /** - * Returns the meta object for the reference '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverrides <em>Overrides</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverrides <em>Overrides</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Overrides</em>'. + * @return the meta object for the reference list '<em>Overrides</em>'. * @see org.eclipse.qvtd.pivot.qvtbase.Rule#getOverrides() * @see #getRule() * @generated @@ -2076,10 +2067,10 @@ public interface QVTbasePackage extends EPackage { EReference getRule_Transformation(); /** - * Returns the meta object for the reference list '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverridden <em>Overridden</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverridden <em>Overridden</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference list '<em>Overridden</em>'. + * @return the meta object for the reference '<em>Overridden</em>'. * @see org.eclipse.qvtd.pivot.qvtbase.Rule#getOverridden() * @see #getRule() * @generated @@ -2107,24 +2098,14 @@ public interface QVTbasePackage extends EPackage { EOperation getRule__ValidateNoOverridesCycle__DiagnosticChain_Map(); /** - * Returns the meta object for the '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#validateOverridesRuleIsExtendedRule(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Overrides Rule Is Extended Rule</em>}' operation. + * Returns the meta object for the '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#validateOverridingRuleOverridesAllDomains(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Overriding Rule Overrides All Domains</em>}' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the '<em>Validate Overrides Rule Is Extended Rule</em>' operation. - * @see org.eclipse.qvtd.pivot.qvtbase.Rule#validateOverridesRuleIsExtendedRule(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * @return the meta object for the '<em>Validate Overriding Rule Overrides All Domains</em>' operation. + * @see org.eclipse.qvtd.pivot.qvtbase.Rule#validateOverridingRuleOverridesAllDomains(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) * @generated */ - EOperation getRule__ValidateOverridesRuleIsExtendedRule__DiagnosticChain_Map(); - - /** - * Returns the meta object for the '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#validateOverridesRuleOverridesAllDomains(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Overrides Rule Overrides All Domains</em>}' operation. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the '<em>Validate Overrides Rule Overrides All Domains</em>' operation. - * @see org.eclipse.qvtd.pivot.qvtbase.Rule#validateOverridesRuleOverridesAllDomains(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) - * @generated - */ - EOperation getRule__ValidateOverridesRuleOverridesAllDomains__DiagnosticChain_Map(); + EOperation getRule__ValidateOverridingRuleOverridesAllDomains__DiagnosticChain_Map(); /** * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtbase.Transformation <em>Transformation</em>}'. @@ -2526,7 +2507,7 @@ public interface QVTbasePackage extends EPackage { EAttribute RULE__IS_ABSTRACT = eINSTANCE.getRule_IsAbstract(); /** - * The meta object literal for the '<em><b>Overrides</b></em>' reference feature. + * The meta object literal for the '<em><b>Overrides</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -2542,7 +2523,7 @@ public interface QVTbasePackage extends EPackage { EReference RULE__TRANSFORMATION = eINSTANCE.getRule_Transformation(); /** - * The meta object literal for the '<em><b>Overridden</b></em>' reference list feature. + * The meta object literal for the '<em><b>Overridden</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -2566,20 +2547,12 @@ public interface QVTbasePackage extends EPackage { EOperation RULE___VALIDATE_NO_OVERRIDES_CYCLE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRule__ValidateNoOverridesCycle__DiagnosticChain_Map(); /** - * The meta object literal for the '<em><b>Validate Overrides Rule Is Extended Rule</b></em>' operation. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EOperation RULE___VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRule__ValidateOverridesRuleIsExtendedRule__DiagnosticChain_Map(); - - /** - * The meta object literal for the '<em><b>Validate Overrides Rule Overrides All Domains</b></em>' operation. + * The meta object literal for the '<em><b>Validate Overriding Rule Overrides All Domains</b></em>' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EOperation RULE___VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRule__ValidateOverridesRuleOverridesAllDomains__DiagnosticChain_Map(); + EOperation RULE___VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRule__ValidateOverridingRuleOverridesAllDomains__DiagnosticChain_Map(); /** * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtbase.impl.TransformationImpl <em>Transformation</em>}' class. diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java index dc8408afb..4d85f39ab 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java @@ -94,16 +94,15 @@ public class QVTbaseTables public static final /*@NonInvalid*/ java.lang.@org.eclipse.jdt.annotation.NonNull String STR_Predicate_c_c_ConditionIsBoolean = "Predicate::ConditionIsBoolean"; public static final /*@NonInvalid*/ java.lang.@org.eclipse.jdt.annotation.NonNull String STR_Rule_c_c_DomainNameIsUnique = "Rule::DomainNameIsUnique"; public static final /*@NonInvalid*/ java.lang.@org.eclipse.jdt.annotation.NonNull String STR_Rule_c_c_NoOverridesCycle = "Rule::NoOverridesCycle"; - public static final /*@NonInvalid*/ java.lang.@org.eclipse.jdt.annotation.NonNull String STR_Rule_c_c_OverridesRuleIsExtendedRule = "Rule::OverridesRuleIsExtendedRule"; - public static final /*@NonInvalid*/ java.lang.@org.eclipse.jdt.annotation.NonNull String STR_Rule_c_c_OverridesRuleOverridesAllDomains = "Rule::OverridesRuleOverridesAllDomains"; + public static final /*@NonInvalid*/ java.lang.@org.eclipse.jdt.annotation.NonNull String STR_Rule_c_c_OverridingRuleOverridesAllDomains = "Rule::OverridingRuleOverridesAllDomains"; public static final /*@NonInvalid*/ java.lang.@org.eclipse.jdt.annotation.NonNull String STR_Transformation_c_c_ContextTypeIsTransformation = "Transformation::ContextTypeIsTransformation"; public static final /*@NonInvalid*/ java.lang.@org.eclipse.jdt.annotation.NonNull String STR_Transformation_c_c_ExtendedTypedModelIsExtended = "Transformation::ExtendedTypedModelIsExtended"; public static final /*@NonInvalid*/ java.lang.@org.eclipse.jdt.annotation.NonNull String STR_Transformation_c_c_ModelParameterIsUnique = "Transformation::ModelParameterIsUnique"; public static final /*@NonInvalid*/ java.lang.@org.eclipse.jdt.annotation.NonNull String STR_Transformation_c_c_NoExtendsCycle = "Transformation::NoExtendsCycle"; public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.@org.eclipse.jdt.annotation.NonNull CollectionTypeId BAG_CLSSid_Domain = org.eclipse.ocl.pivot.ids.TypeId.BAG.getSpecializedId(org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables.CLSSid_Domain); - public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.@org.eclipse.jdt.annotation.NonNull CollectionTypeId BAG_CLSSid_Rule = org.eclipse.ocl.pivot.ids.TypeId.BAG.getSpecializedId(org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables.CLSSid_Rule); public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.@org.eclipse.jdt.annotation.NonNull CollectionTypeId ORD_CLSSid_Domain = org.eclipse.ocl.pivot.ids.TypeId.ORDERED_SET.getSpecializedId(org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables.CLSSid_Domain); public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.@org.eclipse.jdt.annotation.NonNull CollectionTypeId ORD_CLSSid_Parameter = org.eclipse.ocl.pivot.ids.TypeId.ORDERED_SET.getSpecializedId(org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables.CLSSid_Parameter); + public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.@org.eclipse.jdt.annotation.NonNull CollectionTypeId ORD_CLSSid_Rule = org.eclipse.ocl.pivot.ids.TypeId.ORDERED_SET.getSpecializedId(org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables.CLSSid_Rule); public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.@org.eclipse.jdt.annotation.NonNull CollectionTypeId ORD_CLSSid_TypedModel = org.eclipse.ocl.pivot.ids.TypeId.ORDERED_SET.getSpecializedId(org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables.CLSSid_TypedModel); public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.@org.eclipse.jdt.annotation.NonNull CollectionTypeId SEQ_CLSSid_Package = org.eclipse.ocl.pivot.ids.TypeId.SEQUENCE.getSpecializedId(org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables.CLSSid_Package); public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.@org.eclipse.jdt.annotation.NonNull CollectionTypeId SET_CLSSid_Annotation = org.eclipse.ocl.pivot.ids.TypeId.SET.getSpecializedId(org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables.CLSSid_Annotation); diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/Rule.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/Rule.java index 9c3d20e44..4896611fe 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/Rule.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/Rule.java @@ -26,9 +26,9 @@ import org.eclipse.ocl.pivot.NamedElement; * <ul> * <li>{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getDomain <em>Domain</em>}</li> * <li>{@link org.eclipse.qvtd.pivot.qvtbase.Rule#isIsAbstract <em>Is Abstract</em>}</li> + * <li>{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverridden <em>Overridden</em>}</li> * <li>{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverrides <em>Overrides</em>}</li> * <li>{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getTransformation <em>Transformation</em>}</li> - * <li>{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverridden <em>Overridden</em>}</li> * </ul> * * @see org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage#getRule() @@ -84,7 +84,8 @@ public interface Rule extends NamedElement { void setIsAbstract(boolean value); /** - * Returns the value of the '<em><b>Overrides</b></em>' reference. + * Returns the value of the '<em><b>Overrides</b></em>' reference list. + * The list contents are of type {@link org.eclipse.qvtd.pivot.qvtbase.Rule}. * It is bidirectional and its opposite is '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverridden <em>Overridden</em>}'. * <!-- begin-user-doc --> * <p> @@ -92,25 +93,14 @@ public interface Rule extends NamedElement { * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Overrides</em>' reference. - * @see #setOverrides(Rule) + * @return the value of the '<em>Overrides</em>' reference list. * @see org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage#getRule_Overrides() * @see org.eclipse.qvtd.pivot.qvtbase.Rule#getOverridden * @model opposite="overridden" * annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException(); // FIXME Unimplemented http://www.eclipse.org/qvt/2015/QVTbase!Rule!overrides'" * @generated */ - Rule getOverrides(); - - /** - * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverrides <em>Overrides</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Overrides</em>' reference. - * @see #getOverrides() - * @generated - */ - void setOverrides(Rule value); + EList<Rule> getOverrides(); /** * Returns the value of the '<em><b>Transformation</b></em>' container reference. @@ -142,8 +132,7 @@ public interface Rule extends NamedElement { void setTransformation(Transformation value); /** - * Returns the value of the '<em><b>Overridden</b></em>' reference list. - * The list contents are of type {@link org.eclipse.qvtd.pivot.qvtbase.Rule}. + * Returns the value of the '<em><b>Overridden</b></em>' reference. * It is bidirectional and its opposite is '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverrides <em>Overrides</em>}'. * <!-- begin-user-doc --> * <p> @@ -151,49 +140,51 @@ public interface Rule extends NamedElement { * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Overridden</em>' reference list. + * @return the value of the '<em>Overridden</em>' reference. + * @see #setOverridden(Rule) * @see org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage#getRule_Overridden() * @see org.eclipse.qvtd.pivot.qvtbase.Rule#getOverrides - * @model opposite="overrides" ordered="false" + * @model opposite="overrides" * annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException(); // FIXME Unimplemented http://www.eclipse.org/qvt/2015/QVTbase!Rule!overridden'" * @generated */ - EList<Rule> getOverridden(); + Rule getOverridden(); /** + * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverridden <em>Overridden</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='DomainNameIsUnique'" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv DomainNameIsUnique:\n * let severity : Integer[1] = \'Rule::DomainNameIsUnique\'.getSeverity()\n * in\n * if severity <= 0\n * then true\n * else\n * let result : Boolean[1] = domain->isUnique(name)\n * in\n * \'Rule::DomainNameIsUnique\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n * endif\n \052/\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.evaluation.@<%org.eclipse.jdt.annotation.NonNull%> Executor executor = <%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%>.getExecutor(this);\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.ids.@<%org.eclipse.jdt.annotation.NonNull%> IdResolver idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> IntegerValue severity_0 = <%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_DomainNameIsUnique);\nfinal /*@NonInvalid\052/ boolean le = <%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%>.INSTANCE.evaluate(executor, severity_0, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_0;\nif (le) {\n\tsymbol_0 = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n}\nelse {\n\t/*@Caught\052/ @<%org.eclipse.jdt.annotation.NonNull%> <%java.lang.Object%> CAUGHT_result;\n\ttry {\n\t\t@SuppressWarnings(\"null\")\n\t\tfinal /*@NonInvalid\052/ java.util.@<%org.eclipse.jdt.annotation.NonNull%> List<<%org.eclipse.qvtd.pivot.qvtbase.Domain%>> domain = this.getDomain();\n\t\tfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> OrderedSetValue BOXED_domain = idResolver.createOrderedSetOfAll(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.ORD_CLSSid_Domain, domain);\n\t\t/*@Thrown\052/ <%org.eclipse.ocl.pivot.values.SetValue%>.@org.eclipse.jdt.annotation.NonNull Accumulator accumulator = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createSetAccumulatorValue(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.ORD_CLSSid_Domain);\n\t\t@<%org.eclipse.jdt.annotation.NonNull%> <%java.util.Iterator%><<%java.lang.Object%>> ITERATOR__1 = BOXED_domain.iterator();\n\t\t/*@Thrown\052/ boolean result;\n\t\twhile (true) {\n\t\t\tif (!ITERATOR__1.hasNext()) {\n\t\t\t\tresult = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\t@SuppressWarnings(\"null\")\n\t\t\t/*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.NonNull%> Domain _1 = (<%org.eclipse.qvtd.pivot.qvtbase.Domain%>)ITERATOR__1.next();\n\t\t\t/**\n\t\t\t * name\n\t\t\t \052/\n\t\t\tfinal /*@NonInvalid\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> String name = _1.getName();\n\t\t\t//\n\t\t\tif (accumulator.includes(name) == <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE) {\n\t\t\t\tresult = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.FALSE_VALUE;\t\t\t// Abort after second find\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\telse {\n\t\t\t\taccumulator.add(name);\n\t\t\t}\n\t\t}\n\t\tCAUGHT_result = result;\n\t}\n\tcatch (<%java.lang.Exception%> e) {\n\t\tCAUGHT_result = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createInvalidValue(e);\n\t}\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = <%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.ocl.pivot.ids.TypeId%>.BOOLEAN, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_DomainNameIsUnique, this, (Object)null, diagnostics, context, (Object)null, severity_0, CAUGHT_result, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n\tsymbol_0 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_0;'" + * @param value the new value of the '<em>Overridden</em>' reference. + * @see #getOverridden() * @generated */ - boolean validateDomainNameIsUnique(DiagnosticChain diagnostics, Map<Object, Object> context); + void setOverridden(Rule value); /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='NoOverridesCycle'" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv NoOverridesCycle:\n * let severity : Integer[1] = \'Rule::NoOverridesCycle\'.getSeverity()\n * in\n * if severity <= 0\n * then true\n * else\n * let\n * result : Boolean[1] = overrides->closure(overrides)\n * ->excludes(self)\n * in\n * \'Rule::NoOverridesCycle\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n * endif\n \052/\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.evaluation.@<%org.eclipse.jdt.annotation.NonNull%> Executor executor = <%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%>.getExecutor(this);\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.ids.@<%org.eclipse.jdt.annotation.NonNull%> IdResolver idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.@<%org.eclipse.jdt.annotation.NonNull%> StandardLibrary standardLibrary = idResolver.getStandardLibrary();\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> IntegerValue severity_0 = <%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_NoOverridesCycle);\nfinal /*@NonInvalid\052/ boolean le = <%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%>.INSTANCE.evaluate(executor, severity_0, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_1;\nif (le) {\n\tsymbol_1 = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n}\nelse {\n\t/*@Caught\052/ @<%org.eclipse.jdt.annotation.NonNull%> <%java.lang.Object%> CAUGHT_result;\n\ttry {\n\t\tfinal /*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Rule overrides = this.getOverrides();\n\t\tfinal /*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SetValue oclAsSet = <%org.eclipse.ocl.pivot.library.oclany.OclAnyOclAsSetOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SET_CLSSid_Rule, overrides);\n\t\tfinal org.eclipse.ocl.pivot.@<%org.eclipse.jdt.annotation.NonNull%> Class TYPE_closure_0 = executor.getStaticTypeOf(oclAsSet);\n\t\tfinal <%org.eclipse.ocl.pivot.library.LibraryIteration%>.@org.eclipse.jdt.annotation.NonNull LibraryIterationExtension IMPL_closure_0 = (<%org.eclipse.ocl.pivot.library.LibraryIteration%>.LibraryIterationExtension)TYPE_closure_0.lookupImplementation(standardLibrary, <%org.eclipse.ocl.pivot.oclstdlib.OCLstdlibTables%>.Operations._Set__closure);\n\t\tfinal @<%org.eclipse.jdt.annotation.NonNull%> Object ACC_closure_0 = IMPL_closure_0.createAccumulatorValue(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SET_CLSSid_Rule, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.CLSSid_Rule);\n\t\t/**\n\t\t * Implementation of the iterator body.\n\t\t \052/\n\t\tfinal @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.library.AbstractBinaryOperation%> BODY_closure_0 = new <%org.eclipse.ocl.pivot.library.AbstractBinaryOperation%>()\n\t\t{\n\t\t\t/**\n\t\t\t * overrides\n\t\t\t \052/\n\t\t\t@Override\n\t\t\tpublic @<%org.eclipse.jdt.annotation.Nullable%> Object evaluate(final @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.evaluation.Executor%> executor, final @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.ids.TypeId%> typeId, final @<%org.eclipse.jdt.annotation.Nullable%> Object oclAsSet, final /*@NonInvalid\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> Object _1) {\n\t\t\t\tfinal /*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Rule symbol_0 = (<%org.eclipse.qvtd.pivot.qvtbase.Rule%>)_1;\n\t\t\t\tif (symbol_0 == null) {\n\t\t\t\t\tthrow new <%org.eclipse.ocl.pivot.values.InvalidValueException%>(\"Null source for \\\'\\\'http://www.eclipse.org/qvt/2015/QVTbase\\\'::Rule::overrides\\\'\");\n\t\t\t\t}\n\t\t\t\tfinal /*@Thrown\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Rule overrides_0 = symbol_0.getOverrides();\n\t\t\t\treturn overrides_0;\n\t\t\t}\n\t\t};\n\t\tfinal @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.internal.library.executor.ExecutorSingleIterationManager%> MGR_closure_0 = new <%org.eclipse.ocl.pivot.internal.library.executor.ExecutorSingleIterationManager%>(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SET_CLSSid_Rule, BODY_closure_0, oclAsSet, ACC_closure_0);\n\t\tfinal /*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SetValue closure = <%org.eclipse.ocl.pivot.utilities.ClassUtil%>.nonNullState((<%org.eclipse.ocl.pivot.values.SetValue%>)IMPL_closure_0.evaluateIteration(MGR_closure_0));\n\t\tfinal /*@Thrown\052/ boolean result = <%org.eclipse.ocl.pivot.library.collection.CollectionExcludesOperation%>.INSTANCE.evaluate(closure, this).booleanValue();\n\t\tCAUGHT_result = result;\n\t}\n\tcatch (<%java.lang.Exception%> e) {\n\t\tCAUGHT_result = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createInvalidValue(e);\n\t}\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = <%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.ocl.pivot.ids.TypeId%>.BOOLEAN, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_NoOverridesCycle, this, (Object)null, diagnostics, context, (Object)null, severity_0, CAUGHT_result, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n\tsymbol_1 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_1;'" + * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='DomainNameIsUnique'" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv DomainNameIsUnique:\n * let severity : Integer[1] = \'Rule::DomainNameIsUnique\'.getSeverity()\n * in\n * if severity <= 0\n * then true\n * else\n * let result : Boolean[1] = domain->isUnique(name)\n * in\n * \'Rule::DomainNameIsUnique\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n * endif\n \052/\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.evaluation.@<%org.eclipse.jdt.annotation.NonNull%> Executor executor = <%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%>.getExecutor(this);\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.ids.@<%org.eclipse.jdt.annotation.NonNull%> IdResolver idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> IntegerValue severity_0 = <%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_DomainNameIsUnique);\nfinal /*@NonInvalid\052/ boolean le = <%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%>.INSTANCE.evaluate(executor, severity_0, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_0;\nif (le) {\n\tsymbol_0 = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n}\nelse {\n\t/*@Caught\052/ @<%org.eclipse.jdt.annotation.NonNull%> <%java.lang.Object%> CAUGHT_result;\n\ttry {\n\t\t@SuppressWarnings(\"null\")\n\t\tfinal /*@NonInvalid\052/ java.util.@<%org.eclipse.jdt.annotation.NonNull%> List<<%org.eclipse.qvtd.pivot.qvtbase.Domain%>> domain = this.getDomain();\n\t\tfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> OrderedSetValue BOXED_domain = idResolver.createOrderedSetOfAll(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.ORD_CLSSid_Domain, domain);\n\t\t/*@Thrown\052/ <%org.eclipse.ocl.pivot.values.SetValue%>.@org.eclipse.jdt.annotation.NonNull Accumulator accumulator = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createSetAccumulatorValue(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.ORD_CLSSid_Domain);\n\t\t@<%org.eclipse.jdt.annotation.NonNull%> <%java.util.Iterator%><<%java.lang.Object%>> ITERATOR__1 = BOXED_domain.iterator();\n\t\t/*@Thrown\052/ boolean result;\n\t\twhile (true) {\n\t\t\tif (!ITERATOR__1.hasNext()) {\n\t\t\t\tresult = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\t@SuppressWarnings(\"null\")\n\t\t\t/*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.NonNull%> Domain _1 = (<%org.eclipse.qvtd.pivot.qvtbase.Domain%>)ITERATOR__1.next();\n\t\t\t/**\n\t\t\t * name\n\t\t\t \052/\n\t\t\tfinal /*@NonInvalid\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> String name = _1.getName();\n\t\t\t//\n\t\t\tif (accumulator.includes(name) == <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE) {\n\t\t\t\tresult = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.FALSE_VALUE;\t\t\t// Abort after second find\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\telse {\n\t\t\t\taccumulator.add(name);\n\t\t\t}\n\t\t}\n\t\tCAUGHT_result = result;\n\t}\n\tcatch (<%java.lang.Exception%> e) {\n\t\tCAUGHT_result = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createInvalidValue(e);\n\t}\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = <%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.ocl.pivot.ids.TypeId%>.BOOLEAN, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_DomainNameIsUnique, this, (Object)null, diagnostics, context, (Object)null, severity_0, CAUGHT_result, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n\tsymbol_0 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_0;'" * @generated */ - boolean validateNoOverridesCycle(DiagnosticChain diagnostics, Map<Object, Object> context); + boolean validateDomainNameIsUnique(DiagnosticChain diagnostics, Map<Object, Object> context); /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='OverridesRuleIsExtendedRule'" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv OverridesRuleIsExtendedRule:\n * let\n * severity : Integer[1] = \'Rule::OverridesRuleIsExtendedRule\'.getSeverity()\n * in\n * if severity <= 0\n * then true\n * else\n * let result : Boolean[?] = overrides <> null and transformation <> null implies\n * let\n * extendedRules : Bag(qvtbase::Rule) = transformation->closure(extends)\n * ->excluding(transformation)\n * ?->collect(rule)\n * in extendedRules->includes(overrides)\n * in\n * \'Rule::OverridesRuleIsExtendedRule\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n * endif\n \052/\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.evaluation.@<%org.eclipse.jdt.annotation.NonNull%> Executor executor = <%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%>.getExecutor(this);\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.ids.@<%org.eclipse.jdt.annotation.NonNull%> IdResolver idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.@<%org.eclipse.jdt.annotation.NonNull%> StandardLibrary standardLibrary = idResolver.getStandardLibrary();\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> IntegerValue severity_0 = <%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_OverridesRuleIsExtendedRule);\nfinal /*@NonInvalid\052/ boolean le = <%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%>.INSTANCE.evaluate(executor, severity_0, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_2;\nif (le) {\n\tsymbol_2 = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n}\nelse {\n\t/*@Caught\052/ @<%org.eclipse.jdt.annotation.NonNull%> <%java.lang.Object%> CAUGHT_result;\n\ttry {\n\t\tfinal /*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Rule overrides_0 = this.getOverrides();\n\t\tfinal /*@NonInvalid\052/ boolean ne = overrides_0 != null;\n\t\t/*@NonInvalid\052/ boolean and;\n\t\tif (ne) {\n\t\t\tfinal /*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Transformation transformation = this.getTransformation();\n\t\t\tfinal /*@NonInvalid\052/ boolean ne_0 = transformation != null;\n\t\t\tand = ne_0;\n\t\t}\n\t\telse {\n\t\t\tand = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.FALSE_VALUE;\n\t\t}\n\t\t/*@Thrown\052/ boolean result;\n\t\tif (and) {\n\t\t\tfinal /*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Transformation transformation_1 = this.getTransformation();\n\t\t\tfinal /*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SetValue oclAsSet = <%org.eclipse.ocl.pivot.library.oclany.OclAnyOclAsSetOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SET_CLSSid_Transformation, transformation_1);\n\t\t\tfinal org.eclipse.ocl.pivot.@<%org.eclipse.jdt.annotation.NonNull%> Class TYPE_closure_0 = executor.getStaticTypeOf(oclAsSet);\n\t\t\tfinal <%org.eclipse.ocl.pivot.library.LibraryIteration%>.@org.eclipse.jdt.annotation.NonNull LibraryIterationExtension IMPL_closure_0 = (<%org.eclipse.ocl.pivot.library.LibraryIteration%>.LibraryIterationExtension)TYPE_closure_0.lookupImplementation(standardLibrary, <%org.eclipse.ocl.pivot.oclstdlib.OCLstdlibTables%>.Operations._Set__closure);\n\t\t\tfinal @<%org.eclipse.jdt.annotation.NonNull%> Object ACC_closure_0 = IMPL_closure_0.createAccumulatorValue(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SET_CLSSid_Transformation, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.CLSSid_Transformation);\n\t\t\t/**\n\t\t\t * Implementation of the iterator body.\n\t\t\t \052/\n\t\t\tfinal @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.library.AbstractBinaryOperation%> BODY_closure_0 = new <%org.eclipse.ocl.pivot.library.AbstractBinaryOperation%>()\n\t\t\t{\n\t\t\t\t/**\n\t\t\t\t * extends\n\t\t\t\t \052/\n\t\t\t\t@Override\n\t\t\t\tpublic @<%org.eclipse.jdt.annotation.Nullable%> Object evaluate(final @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.evaluation.Executor%> executor, final @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.ids.TypeId%> typeId, final @<%org.eclipse.jdt.annotation.Nullable%> Object oclAsSet, final /*@NonInvalid\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> Object _1) {\n\t\t\t\t\tfinal /*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Transformation symbol_0 = (<%org.eclipse.qvtd.pivot.qvtbase.Transformation%>)_1;\n\t\t\t\t\tif (symbol_0 == null) {\n\t\t\t\t\t\tthrow new <%org.eclipse.ocl.pivot.values.InvalidValueException%>(\"Null source for \\\'\\\'http://www.eclipse.org/qvt/2015/QVTbase\\\'::Transformation::extends\\\'\");\n\t\t\t\t\t}\n\t\t\t\t\tfinal /*@Thrown\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Transformation symbol_1 = symbol_0.getExtends();\n\t\t\t\t\treturn symbol_1;\n\t\t\t\t}\n\t\t\t};\n\t\t\tfinal @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.internal.library.executor.ExecutorSingleIterationManager%> MGR_closure_0 = new <%org.eclipse.ocl.pivot.internal.library.executor.ExecutorSingleIterationManager%>(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SET_CLSSid_Transformation, BODY_closure_0, oclAsSet, ACC_closure_0);\n\t\t\tfinal /*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SetValue closure = <%org.eclipse.ocl.pivot.utilities.ClassUtil%>.nonNullState((<%org.eclipse.ocl.pivot.values.SetValue%>)IMPL_closure_0.evaluateIteration(MGR_closure_0));\n\t\t\tfinal /*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SetValue excluding = (<%org.eclipse.ocl.pivot.values.SetValue%>)<%org.eclipse.ocl.pivot.library.collection.CollectionExcludingOperation%>.INSTANCE.evaluate(closure, transformation_1);\n\t\t\tfinal /*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SetValue safe_null_sources = (<%org.eclipse.ocl.pivot.values.SetValue%>)<%org.eclipse.ocl.pivot.library.collection.CollectionExcludingOperation%>.INSTANCE.evaluate(excluding, (Object)null);\n\t\t\t/*@Thrown\052/ <%org.eclipse.ocl.pivot.values.BagValue%>.@org.eclipse.jdt.annotation.NonNull Accumulator accumulator = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createBagAccumulatorValue(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.BAG_CLSSid_Rule);\n\t\t\t@<%org.eclipse.jdt.annotation.NonNull%> <%java.util.Iterator%><<%java.lang.Object%>> ITERATOR__1_0 = safe_null_sources.iterator();\n\t\t\t/*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> BagValue extendedRules;\n\t\t\twhile (true) {\n\t\t\t\tif (!ITERATOR__1_0.hasNext()) {\n\t\t\t\t\textendedRules = accumulator;\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\t@SuppressWarnings(\"null\")\n\t\t\t\t/*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.NonNull%> Transformation _1_0 = (<%org.eclipse.qvtd.pivot.qvtbase.Transformation%>)ITERATOR__1_0.next();\n\t\t\t\t/**\n\t\t\t\t * rule\n\t\t\t\t \052/\n\t\t\t\tfinal /*@NonInvalid\052/ java.util.@<%org.eclipse.jdt.annotation.NonNull%> List<<%org.eclipse.qvtd.pivot.qvtbase.Rule%>> rule = _1_0.getRule();\n\t\t\t\tfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SetValue BOXED_rule = idResolver.createSetOfAll(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SET_CLSSid_Rule, rule);\n\t\t\t\t//\n\t\t\t\tfor (Object value : BOXED_rule.flatten().getElements()) {\n\t\t\t\t\taccumulator.add(value);\n\t\t\t\t}\n\t\t\t}\n\t\t\tfinal /*@Thrown\052/ boolean includes = <%org.eclipse.ocl.pivot.library.collection.CollectionIncludesOperation%>.INSTANCE.evaluate(extendedRules, overrides_0).booleanValue();\n\t\t\tresult = includes;\n\t\t}\n\t\telse {\n\t\t\tresult = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n\t\t}\n\t\tCAUGHT_result = result;\n\t}\n\tcatch (<%java.lang.Exception%> e) {\n\t\tCAUGHT_result = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createInvalidValue(e);\n\t}\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = <%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.ocl.pivot.ids.TypeId%>.BOOLEAN, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_OverridesRuleIsExtendedRule, this, (Object)null, diagnostics, context, (Object)null, severity_0, CAUGHT_result, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n\tsymbol_2 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_2;'" + * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='NoOverridesCycle'" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv NoOverridesCycle:\n * let severity : Integer[1] = \'Rule::NoOverridesCycle\'.getSeverity()\n * in\n * if severity <= 0\n * then true\n * else\n * let\n * result : Boolean[1] = overridden->closure(overridden)\n * ->excludes(self)\n * in\n * \'Rule::NoOverridesCycle\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n * endif\n \052/\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.evaluation.@<%org.eclipse.jdt.annotation.NonNull%> Executor executor = <%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%>.getExecutor(this);\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.ids.@<%org.eclipse.jdt.annotation.NonNull%> IdResolver idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.@<%org.eclipse.jdt.annotation.NonNull%> StandardLibrary standardLibrary = idResolver.getStandardLibrary();\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> IntegerValue severity_0 = <%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_NoOverridesCycle);\nfinal /*@NonInvalid\052/ boolean le = <%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%>.INSTANCE.evaluate(executor, severity_0, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_1;\nif (le) {\n\tsymbol_1 = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n}\nelse {\n\t/*@Caught\052/ @<%org.eclipse.jdt.annotation.NonNull%> <%java.lang.Object%> CAUGHT_result;\n\ttry {\n\t\tfinal /*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Rule overridden = this.getOverridden();\n\t\tfinal /*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SetValue oclAsSet = <%org.eclipse.ocl.pivot.library.oclany.OclAnyOclAsSetOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SET_CLSSid_Rule, overridden);\n\t\tfinal org.eclipse.ocl.pivot.@<%org.eclipse.jdt.annotation.NonNull%> Class TYPE_closure_0 = executor.getStaticTypeOf(oclAsSet);\n\t\tfinal <%org.eclipse.ocl.pivot.library.LibraryIteration%>.@org.eclipse.jdt.annotation.NonNull LibraryIterationExtension IMPL_closure_0 = (<%org.eclipse.ocl.pivot.library.LibraryIteration%>.LibraryIterationExtension)TYPE_closure_0.lookupImplementation(standardLibrary, <%org.eclipse.ocl.pivot.oclstdlib.OCLstdlibTables%>.Operations._Set__closure);\n\t\tfinal @<%org.eclipse.jdt.annotation.NonNull%> Object ACC_closure_0 = IMPL_closure_0.createAccumulatorValue(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SET_CLSSid_Rule, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.CLSSid_Rule);\n\t\t/**\n\t\t * Implementation of the iterator body.\n\t\t \052/\n\t\tfinal @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.library.AbstractBinaryOperation%> BODY_closure_0 = new <%org.eclipse.ocl.pivot.library.AbstractBinaryOperation%>()\n\t\t{\n\t\t\t/**\n\t\t\t * overridden\n\t\t\t \052/\n\t\t\t@Override\n\t\t\tpublic @<%org.eclipse.jdt.annotation.Nullable%> Object evaluate(final @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.evaluation.Executor%> executor, final @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.ids.TypeId%> typeId, final @<%org.eclipse.jdt.annotation.Nullable%> Object oclAsSet, final /*@NonInvalid\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> Object _1) {\n\t\t\t\tfinal /*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Rule symbol_0 = (<%org.eclipse.qvtd.pivot.qvtbase.Rule%>)_1;\n\t\t\t\tif (symbol_0 == null) {\n\t\t\t\t\tthrow new <%org.eclipse.ocl.pivot.values.InvalidValueException%>(\"Null source for \\\'\\\'http://www.eclipse.org/qvt/2015/QVTbase\\\'::Rule::overridden\\\'\");\n\t\t\t\t}\n\t\t\t\tfinal /*@Thrown\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Rule overridden_0 = symbol_0.getOverridden();\n\t\t\t\treturn overridden_0;\n\t\t\t}\n\t\t};\n\t\tfinal @<%org.eclipse.jdt.annotation.NonNull%> <%org.eclipse.ocl.pivot.internal.library.executor.ExecutorSingleIterationManager%> MGR_closure_0 = new <%org.eclipse.ocl.pivot.internal.library.executor.ExecutorSingleIterationManager%>(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SET_CLSSid_Rule, BODY_closure_0, oclAsSet, ACC_closure_0);\n\t\tfinal /*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SetValue closure = <%org.eclipse.ocl.pivot.utilities.ClassUtil%>.nonNullState((<%org.eclipse.ocl.pivot.values.SetValue%>)IMPL_closure_0.evaluateIteration(MGR_closure_0));\n\t\tfinal /*@Thrown\052/ boolean result = <%org.eclipse.ocl.pivot.library.collection.CollectionExcludesOperation%>.INSTANCE.evaluate(closure, this).booleanValue();\n\t\tCAUGHT_result = result;\n\t}\n\tcatch (<%java.lang.Exception%> e) {\n\t\tCAUGHT_result = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createInvalidValue(e);\n\t}\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = <%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.ocl.pivot.ids.TypeId%>.BOOLEAN, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_NoOverridesCycle, this, (Object)null, diagnostics, context, (Object)null, severity_0, CAUGHT_result, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n\tsymbol_1 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_1;'" * @generated */ - boolean validateOverridesRuleIsExtendedRule(DiagnosticChain diagnostics, Map<Object, Object> context); + boolean validateNoOverridesCycle(DiagnosticChain diagnostics, Map<Object, Object> context); /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='OverridesRuleOverridesAllDomains'" - * annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv OverridesRuleOverridesAllDomains:\n * let\n * severity : Integer[1] = \'Rule::OverridesRuleOverridesAllDomains\'.getSeverity()\n * in\n * if severity <= 0\n * then true\n * else\n * let result : Boolean[?] = overrides <> null implies\n * overrides.domain->forAll(od |\n * self.domain.name->includes(od.name))\n * in\n * \'Rule::OverridesRuleOverridesAllDomains\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n * endif\n \052/\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.evaluation.@<%org.eclipse.jdt.annotation.NonNull%> Executor executor = <%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%>.getExecutor(this);\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.ids.@<%org.eclipse.jdt.annotation.NonNull%> IdResolver idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> IntegerValue severity_0 = <%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_OverridesRuleOverridesAllDomains);\nfinal /*@NonInvalid\052/ boolean le = <%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%>.INSTANCE.evaluate(executor, severity_0, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_0;\nif (le) {\n\tsymbol_0 = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n}\nelse {\n\t/*@Caught\052/ @<%org.eclipse.jdt.annotation.NonNull%> <%java.lang.Object%> CAUGHT_result;\n\ttry {\n\t\tfinal /*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Rule overrides = this.getOverrides();\n\t\tfinal /*@NonInvalid\052/ boolean ne = overrides != null;\n\t\t/*@Thrown\052/ boolean result;\n\t\tif (ne) {\n\t\t\tif (overrides == null) {\n\t\t\t\tthrow new <%org.eclipse.ocl.pivot.values.InvalidValueException%>(\"Null source for \\\'\\\'http://www.eclipse.org/qvt/2015/QVTbase\\\'::Rule::domain\\\'\");\n\t\t\t}\n\t\t\t@SuppressWarnings(\"null\")\n\t\t\tfinal /*@Thrown\052/ java.util.@<%org.eclipse.jdt.annotation.NonNull%> List<<%org.eclipse.qvtd.pivot.qvtbase.Domain%>> domain = overrides.getDomain();\n\t\t\tfinal /*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> OrderedSetValue BOXED_domain = idResolver.createOrderedSetOfAll(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.ORD_CLSSid_Domain, domain);\n\t\t\t/*@Thrown\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> Object accumulator = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n\t\t\t@<%org.eclipse.jdt.annotation.NonNull%> <%java.util.Iterator%><<%java.lang.Object%>> ITERATOR_od = BOXED_domain.iterator();\n\t\t\t/*@Thrown\052/ boolean forAll;\n\t\t\twhile (true) {\n\t\t\t\tif (!ITERATOR_od.hasNext()) {\n\t\t\t\t\tif (accumulator == <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE) {\n\t\t\t\t\t\tforAll = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n\t\t\t\t\t}\n\t\t\t\t\telse {\n\t\t\t\t\t\tthrow (<%org.eclipse.ocl.pivot.values.InvalidValueException%>)accumulator;\n\t\t\t\t\t}\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\t@SuppressWarnings(\"null\")\n\t\t\t\t/*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.NonNull%> Domain od = (<%org.eclipse.qvtd.pivot.qvtbase.Domain%>)ITERATOR_od.next();\n\t\t\t\t/**\n\t\t\t\t * self.domain.name->includes(od.name)\n\t\t\t\t \052/\n\t\t\t\t/*@Caught\052/ @<%org.eclipse.jdt.annotation.NonNull%> <%java.lang.Object%> CAUGHT_includes;\n\t\t\t\ttry {\n\t\t\t\t\t@SuppressWarnings(\"null\")\n\t\t\t\t\tfinal /*@NonInvalid\052/ java.util.@<%org.eclipse.jdt.annotation.NonNull%> List<<%org.eclipse.qvtd.pivot.qvtbase.Domain%>> domain_0 = this.getDomain();\n\t\t\t\t\tfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> OrderedSetValue BOXED_domain_0 = idResolver.createOrderedSetOfAll(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.ORD_CLSSid_Domain, domain_0);\n\t\t\t\t\t/*@Thrown\052/ <%org.eclipse.ocl.pivot.values.SequenceValue%>.@org.eclipse.jdt.annotation.NonNull Accumulator accumulator_0 = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createSequenceAccumulatorValue(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SEQ_PRIMid_String);\n\t\t\t\t\t@<%org.eclipse.jdt.annotation.NonNull%> <%java.util.Iterator%><<%java.lang.Object%>> ITERATOR__1 = BOXED_domain_0.iterator();\n\t\t\t\t\t/*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SequenceValue collect;\n\t\t\t\t\twhile (true) {\n\t\t\t\t\t\tif (!ITERATOR__1.hasNext()) {\n\t\t\t\t\t\t\tcollect = accumulator_0;\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t}\n\t\t\t\t\t\t@SuppressWarnings(\"null\")\n\t\t\t\t\t\t/*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.NonNull%> Domain _1 = (<%org.eclipse.qvtd.pivot.qvtbase.Domain%>)ITERATOR__1.next();\n\t\t\t\t\t\t/**\n\t\t\t\t\t\t * name\n\t\t\t\t\t\t \052/\n\t\t\t\t\t\tfinal /*@NonInvalid\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> String name = _1.getName();\n\t\t\t\t\t\t//\n\t\t\t\t\t\taccumulator_0.add(name);\n\t\t\t\t\t}\n\t\t\t\t\tfinal /*@NonInvalid\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> String name_0 = od.getName();\n\t\t\t\t\tfinal /*@Thrown\052/ boolean includes = <%org.eclipse.ocl.pivot.library.collection.CollectionIncludesOperation%>.INSTANCE.evaluate(collect, name_0).booleanValue();\n\t\t\t\t\tCAUGHT_includes = includes;\n\t\t\t\t}\n\t\t\t\tcatch (<%java.lang.Exception%> e) {\n\t\t\t\t\tCAUGHT_includes = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createInvalidValue(e);\n\t\t\t\t}\n\t\t\t\t//\n\t\t\t\tif (CAUGHT_includes == <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.FALSE_VALUE) {\t\t\t\t\t// Normal unsuccessful body evaluation result\n\t\t\t\t\tforAll = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.FALSE_VALUE;\n\t\t\t\t\tbreak;\t\t\t\t\t\t\t\t\t\t\t\t\t\t// Stop immediately\n\t\t\t\t}\n\t\t\t\telse if (CAUGHT_includes == <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE) {\t\t\t\t// Normal successful body evaluation result\n\t\t\t\t\t;\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t// Carry on\n\t\t\t\t}\n\t\t\t\telse if (CAUGHT_includes instanceof <%org.eclipse.ocl.pivot.values.InvalidValueException%>) {\t\t// Abnormal exception evaluation result\n\t\t\t\t\taccumulator = CAUGHT_includes;\t\t\t\t\t\t\t\t\t// Cache an exception failure\n\t\t\t\t}\n\t\t\t\telse {\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t// Impossible badly typed result\n\t\t\t\t\taccumulator = new <%org.eclipse.ocl.pivot.values.InvalidValueException%>(<%org.eclipse.ocl.pivot.messages.PivotMessages%>.NonBooleanBody, \"forAll\");\n\t\t\t\t}\n\t\t\t}\n\t\t\tresult = forAll;\n\t\t}\n\t\telse {\n\t\t\tresult = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n\t\t}\n\t\tCAUGHT_result = result;\n\t}\n\tcatch (<%java.lang.Exception%> e) {\n\t\tCAUGHT_result = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createInvalidValue(e);\n\t}\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = <%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.ocl.pivot.ids.TypeId%>.BOOLEAN, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_OverridesRuleOverridesAllDomains, this, (Object)null, diagnostics, context, (Object)null, severity_0, CAUGHT_result, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n\tsymbol_0 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_0;'" + * @model annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='OverridingRuleOverridesAllDomains'" + * annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv OverridingRuleOverridesAllDomains:\n * let\n * severity : Integer[1] = \'Rule::OverridingRuleOverridesAllDomains\'.getSeverity()\n * in\n * if severity <= 0\n * then true\n * else\n * let result : Boolean[?] = overridden <> null implies\n * overridden.domain->forAll(od |\n * self.domain.name->includes(od.name))\n * in\n * \'Rule::OverridingRuleOverridesAllDomains\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n * endif\n \052/\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.evaluation.@<%org.eclipse.jdt.annotation.NonNull%> Executor executor = <%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%>.getExecutor(this);\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.ids.@<%org.eclipse.jdt.annotation.NonNull%> IdResolver idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> IntegerValue severity_0 = <%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_OverridingRuleOverridesAllDomains);\nfinal /*@NonInvalid\052/ boolean le = <%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%>.INSTANCE.evaluate(executor, severity_0, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_0;\nif (le) {\n\tsymbol_0 = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n}\nelse {\n\t/*@Caught\052/ @<%org.eclipse.jdt.annotation.NonNull%> <%java.lang.Object%> CAUGHT_result;\n\ttry {\n\t\tfinal /*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.Nullable%> Rule overridden = this.getOverridden();\n\t\tfinal /*@NonInvalid\052/ boolean ne = overridden != null;\n\t\t/*@Thrown\052/ boolean result;\n\t\tif (ne) {\n\t\t\tif (overridden == null) {\n\t\t\t\tthrow new <%org.eclipse.ocl.pivot.values.InvalidValueException%>(\"Null source for \\\'\\\'http://www.eclipse.org/qvt/2015/QVTbase\\\'::Rule::domain\\\'\");\n\t\t\t}\n\t\t\t@SuppressWarnings(\"null\")\n\t\t\tfinal /*@Thrown\052/ java.util.@<%org.eclipse.jdt.annotation.NonNull%> List<<%org.eclipse.qvtd.pivot.qvtbase.Domain%>> domain = overridden.getDomain();\n\t\t\tfinal /*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> OrderedSetValue BOXED_domain = idResolver.createOrderedSetOfAll(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.ORD_CLSSid_Domain, domain);\n\t\t\t/*@Thrown\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> Object accumulator = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n\t\t\t@<%org.eclipse.jdt.annotation.NonNull%> <%java.util.Iterator%><<%java.lang.Object%>> ITERATOR_od = BOXED_domain.iterator();\n\t\t\t/*@Thrown\052/ boolean forAll;\n\t\t\twhile (true) {\n\t\t\t\tif (!ITERATOR_od.hasNext()) {\n\t\t\t\t\tif (accumulator == <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE) {\n\t\t\t\t\t\tforAll = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n\t\t\t\t\t}\n\t\t\t\t\telse {\n\t\t\t\t\t\tthrow (<%org.eclipse.ocl.pivot.values.InvalidValueException%>)accumulator;\n\t\t\t\t\t}\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\t@SuppressWarnings(\"null\")\n\t\t\t\t/*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.NonNull%> Domain od = (<%org.eclipse.qvtd.pivot.qvtbase.Domain%>)ITERATOR_od.next();\n\t\t\t\t/**\n\t\t\t\t * self.domain.name->includes(od.name)\n\t\t\t\t \052/\n\t\t\t\t/*@Caught\052/ @<%org.eclipse.jdt.annotation.NonNull%> <%java.lang.Object%> CAUGHT_includes;\n\t\t\t\ttry {\n\t\t\t\t\t@SuppressWarnings(\"null\")\n\t\t\t\t\tfinal /*@NonInvalid\052/ java.util.@<%org.eclipse.jdt.annotation.NonNull%> List<<%org.eclipse.qvtd.pivot.qvtbase.Domain%>> domain_0 = this.getDomain();\n\t\t\t\t\tfinal /*@NonInvalid\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> OrderedSetValue BOXED_domain_0 = idResolver.createOrderedSetOfAll(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.ORD_CLSSid_Domain, domain_0);\n\t\t\t\t\t/*@Thrown\052/ <%org.eclipse.ocl.pivot.values.SequenceValue%>.@org.eclipse.jdt.annotation.NonNull Accumulator accumulator_0 = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createSequenceAccumulatorValue(<%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.SEQ_PRIMid_String);\n\t\t\t\t\t@<%org.eclipse.jdt.annotation.NonNull%> <%java.util.Iterator%><<%java.lang.Object%>> ITERATOR__1 = BOXED_domain_0.iterator();\n\t\t\t\t\t/*@Thrown\052/ org.eclipse.ocl.pivot.values.@<%org.eclipse.jdt.annotation.NonNull%> SequenceValue collect;\n\t\t\t\t\twhile (true) {\n\t\t\t\t\t\tif (!ITERATOR__1.hasNext()) {\n\t\t\t\t\t\t\tcollect = accumulator_0;\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t}\n\t\t\t\t\t\t@SuppressWarnings(\"null\")\n\t\t\t\t\t\t/*@NonInvalid\052/ org.eclipse.qvtd.pivot.qvtbase.@<%org.eclipse.jdt.annotation.NonNull%> Domain _1 = (<%org.eclipse.qvtd.pivot.qvtbase.Domain%>)ITERATOR__1.next();\n\t\t\t\t\t\t/**\n\t\t\t\t\t\t * name\n\t\t\t\t\t\t \052/\n\t\t\t\t\t\tfinal /*@NonInvalid\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> String name = _1.getName();\n\t\t\t\t\t\t//\n\t\t\t\t\t\taccumulator_0.add(name);\n\t\t\t\t\t}\n\t\t\t\t\tfinal /*@NonInvalid\052/ java.lang.@<%org.eclipse.jdt.annotation.Nullable%> String name_0 = od.getName();\n\t\t\t\t\tfinal /*@Thrown\052/ boolean includes = <%org.eclipse.ocl.pivot.library.collection.CollectionIncludesOperation%>.INSTANCE.evaluate(collect, name_0).booleanValue();\n\t\t\t\t\tCAUGHT_includes = includes;\n\t\t\t\t}\n\t\t\t\tcatch (<%java.lang.Exception%> e) {\n\t\t\t\t\tCAUGHT_includes = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createInvalidValue(e);\n\t\t\t\t}\n\t\t\t\t//\n\t\t\t\tif (CAUGHT_includes == <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.FALSE_VALUE) {\t\t\t\t\t// Normal unsuccessful body evaluation result\n\t\t\t\t\tforAll = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.FALSE_VALUE;\n\t\t\t\t\tbreak;\t\t\t\t\t\t\t\t\t\t\t\t\t\t// Stop immediately\n\t\t\t\t}\n\t\t\t\telse if (CAUGHT_includes == <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE) {\t\t\t\t// Normal successful body evaluation result\n\t\t\t\t\t;\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t// Carry on\n\t\t\t\t}\n\t\t\t\telse if (CAUGHT_includes instanceof <%org.eclipse.ocl.pivot.values.InvalidValueException%>) {\t\t// Abnormal exception evaluation result\n\t\t\t\t\taccumulator = CAUGHT_includes;\t\t\t\t\t\t\t\t\t// Cache an exception failure\n\t\t\t\t}\n\t\t\t\telse {\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t// Impossible badly typed result\n\t\t\t\t\taccumulator = new <%org.eclipse.ocl.pivot.values.InvalidValueException%>(<%org.eclipse.ocl.pivot.messages.PivotMessages%>.NonBooleanBody, \"forAll\");\n\t\t\t\t}\n\t\t\t}\n\t\t\tresult = forAll;\n\t\t}\n\t\telse {\n\t\t\tresult = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n\t\t}\n\t\tCAUGHT_result = result;\n\t}\n\tcatch (<%java.lang.Exception%> e) {\n\t\tCAUGHT_result = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.createInvalidValue(e);\n\t}\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = <%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.ocl.pivot.ids.TypeId%>.BOOLEAN, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.STR_Rule_c_c_OverridingRuleOverridesAllDomains, this, (Object)null, diagnostics, context, (Object)null, severity_0, CAUGHT_result, <%org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables%>.INT_0).booleanValue();\n\tsymbol_0 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_0;'" * @generated */ - boolean validateOverridesRuleOverridesAllDomains(DiagnosticChain diagnostics, Map<Object, Object> context); + boolean validateOverridingRuleOverridesAllDomains(DiagnosticChain diagnostics, Map<Object, Object> context); } // Rule diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java index 4e9405ba6..4efcd96f9 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java @@ -130,7 +130,7 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * + * * <p>This method is used to initialize {@link QVTbasePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> @@ -160,17 +160,18 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { // Register package validator EValidator.Registry.INSTANCE.put - (theQVTbasePackage, - new EValidator.Descriptor() { - public EValidator getEValidator() { - return QVTbaseValidator.INSTANCE; - } - }); + (theQVTbasePackage, + new EValidator.Descriptor() { + @Override + public EValidator getEValidator() { + return QVTbaseValidator.INSTANCE; + } + }); // Mark meta-data to indicate it can't be changed theQVTbasePackage.freeze(); - + // Update the registry and return the package EPackage.Registry.INSTANCE.put(QVTbasePackage.eNS_URI, theQVTbasePackage); return theQVTbasePackage; @@ -413,7 +414,7 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { */ @Override public EReference getRule_Overrides() { - return (EReference)ruleEClass.getEStructuralFeatures().get(2); + return (EReference)ruleEClass.getEStructuralFeatures().get(3); } /** @@ -423,7 +424,7 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { */ @Override public EReference getRule_Transformation() { - return (EReference)ruleEClass.getEStructuralFeatures().get(3); + return (EReference)ruleEClass.getEStructuralFeatures().get(4); } /** @@ -433,7 +434,7 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { */ @Override public EReference getRule_Overridden() { - return (EReference)ruleEClass.getEStructuralFeatures().get(4); + return (EReference)ruleEClass.getEStructuralFeatures().get(2); } /** @@ -462,7 +463,7 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { * @generated */ @Override - public EOperation getRule__ValidateOverridesRuleIsExtendedRule__DiagnosticChain_Map() { + public EOperation getRule__ValidateOverridingRuleOverridesAllDomains__DiagnosticChain_Map() { return ruleEClass.getEOperations().get(2); } @@ -472,16 +473,6 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { * @generated */ @Override - public EOperation getRule__ValidateOverridesRuleOverridesAllDomains__DiagnosticChain_Map() { - return ruleEClass.getEOperations().get(3); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override public EClass getTransformation() { return transformationEClass; } @@ -704,13 +695,12 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { ruleEClass = createEClass(RULE); createEReference(ruleEClass, RULE__DOMAIN); createEAttribute(ruleEClass, RULE__IS_ABSTRACT); + createEReference(ruleEClass, RULE__OVERRIDDEN); createEReference(ruleEClass, RULE__OVERRIDES); createEReference(ruleEClass, RULE__TRANSFORMATION); - createEReference(ruleEClass, RULE__OVERRIDDEN); createEOperation(ruleEClass, RULE___VALIDATE_DOMAIN_NAME_IS_UNIQUE__DIAGNOSTICCHAIN_MAP); createEOperation(ruleEClass, RULE___VALIDATE_NO_OVERRIDES_CYCLE__DIAGNOSTICCHAIN_MAP); - createEOperation(ruleEClass, RULE___VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE__DIAGNOSTICCHAIN_MAP); - createEOperation(ruleEClass, RULE___VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP); + createEOperation(ruleEClass, RULE___VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP); transformationEClass = createEClass(TRANSFORMATION); createEReference(transformationEClass, TRANSFORMATION__OWNED_TAG); @@ -844,9 +834,9 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { initEClass(ruleEClass, Rule.class, "Rule", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getRule_Domain(), this.getDomain(), this.getDomain_Rule(), "domain", null, 0, -1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getRule_IsAbstract(), ecorePackage.getEBoolean(), "isAbstract", "false", 1, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRule_Overrides(), this.getRule(), this.getRule_Overridden(), "overrides", null, 0, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRule_Overridden(), this.getRule(), this.getRule_Overrides(), "overridden", null, 0, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRule_Overrides(), this.getRule(), this.getRule_Overridden(), "overrides", null, 0, -1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getRule_Transformation(), this.getTransformation(), this.getTransformation_Rule(), "transformation", null, 0, 1, Rule.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRule_Overridden(), this.getRule(), this.getRule_Overrides(), "overridden", null, 0, -1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); op = initEOperation(getRule__ValidateDomainNameIsUnique__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validateDomainNameIsUnique", 0, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); @@ -866,16 +856,7 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - op = initEOperation(getRule__ValidateOverridesRuleIsExtendedRule__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validateOverridesRuleIsExtendedRule", 0, 1, IS_UNIQUE, IS_ORDERED); - addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); - g1 = createEGenericType(ecorePackage.getEMap()); - g2 = createEGenericType(ecorePackage.getEJavaObject()); - g1.getETypeArguments().add(g2); - g2 = createEGenericType(ecorePackage.getEJavaObject()); - g1.getETypeArguments().add(g2); - addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - - op = initEOperation(getRule__ValidateOverridesRuleOverridesAllDomains__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validateOverridesRuleOverridesAllDomains", 0, 1, IS_UNIQUE, IS_ORDERED); + op = initEOperation(getRule__ValidateOverridingRuleOverridesAllDomains__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validateOverridingRuleOverridesAllDomains", 0, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); g1 = createEGenericType(ecorePackage.getEMap()); g2 = createEGenericType(ecorePackage.getEJavaObject()); @@ -958,12 +939,12 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { * @generated */ protected void createEcoreAnnotations() { - String source = "http://www.eclipse.org/emf/2002/Ecore"; + String source = "http://www.eclipse.org/emf/2002/Ecore"; addAnnotation - (this, - source, - new String[] { - }); + (this, + source, + new String[] { + }); } /** @@ -973,25 +954,25 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { * @generated */ protected void createEmofAnnotations() { - String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName"; + String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName"; addAnnotation - (getPredicate_ConditionExpression(), - source, - new String[] { - "body", "predicate" - }); + (getPredicate_ConditionExpression(), + source, + new String[] { + "body", "predicate" + }); addAnnotation - (getTransformation_Extends(), - source, - new String[] { - "body", "extendedBy" - }); + (getTransformation_Extends(), + source, + new String[] { + "body", "extendedBy" + }); addAnnotation - (getTypedModel_DependsOn(), - source, - new String[] { - "body", "dependent" - }); + (getTypedModel_DependsOn(), + source, + new String[] { + "body", "dependent" + }); } /** @@ -1001,85 +982,79 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage { * @generated */ protected void createUMLAnnotations() { - String source = "http://www.eclipse.org/uml2/2.0.0/UML"; - addAnnotation - (getDomain__ValidateNameIsTypedModelName__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "NameIsTypedModelName" - }); + String source = "http://www.eclipse.org/uml2/2.0.0/UML"; addAnnotation - (getDomain__ValidateTypedModelIsTransformationModelParameter__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "TypedModelIsTransformationModelParameter" - }); + (getDomain__ValidateNameIsTypedModelName__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "NameIsTypedModelName" + }); addAnnotation - (getFunction__ValidateParametersAreFunctionParameter__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "ParametersAreFunctionParameter" - }); + (getDomain__ValidateTypedModelIsTransformationModelParameter__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "TypedModelIsTransformationModelParameter" + }); addAnnotation - (getFunction__ValidateReturnTypeIsQueryType__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "ReturnTypeIsQueryType" - }); + (getFunction__ValidateParametersAreFunctionParameter__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "ParametersAreFunctionParameter" + }); addAnnotation - (getPredicate__ValidateConditionIsBoolean__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "ConditionIsBoolean" - }); + (getFunction__ValidateReturnTypeIsQueryType__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "ReturnTypeIsQueryType" + }); addAnnotation - (getRule__ValidateDomainNameIsUnique__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "DomainNameIsUnique" - }); + (getPredicate__ValidateConditionIsBoolean__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "ConditionIsBoolean" + }); addAnnotation - (getRule__ValidateNoOverridesCycle__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "NoOverridesCycle" - }); + (getRule__ValidateDomainNameIsUnique__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "DomainNameIsUnique" + }); addAnnotation - (getRule__ValidateOverridesRuleIsExtendedRule__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "OverridesRuleIsExtendedRule" - }); + (getRule__ValidateNoOverridesCycle__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "NoOverridesCycle" + }); addAnnotation - (getRule__ValidateOverridesRuleOverridesAllDomains__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "OverridesRuleOverridesAllDomains" - }); + (getRule__ValidateOverridingRuleOverridesAllDomains__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "OverridingRuleOverridesAllDomains" + }); addAnnotation - (getTransformation__ValidateContextTypeIsTransformation__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "ContextTypeIsTransformation" - }); + (getTransformation__ValidateContextTypeIsTransformation__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "ContextTypeIsTransformation" + }); addAnnotation - (getTransformation__ValidateExtendedTypedModelIsExtended__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "ExtendedTypedModelIsExtended" - }); + (getTransformation__ValidateExtendedTypedModelIsExtended__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "ExtendedTypedModelIsExtended" + }); addAnnotation - (getTransformation__ValidateModelParameterIsUnique__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "ModelParameterIsUnique" - }); + (getTransformation__ValidateModelParameterIsUnique__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "ModelParameterIsUnique" + }); addAnnotation - (getTransformation__ValidateNoExtendsCycle__DiagnosticChain_Map(), - source, - new String[] { - "originalName", "NoExtendsCycle" - }); + (getTransformation__ValidateNoExtendsCycle__DiagnosticChain_Map(), + source, + new String[] { + "originalName", "NoExtendsCycle" + }); } } //QVTbasePackageImpl diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/RuleImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/RuleImpl.java index 785a57fef..122115597 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/RuleImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/RuleImpl.java @@ -36,7 +36,6 @@ import org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal; import org.eclipse.ocl.pivot.library.AbstractBinaryOperation; import org.eclipse.ocl.pivot.library.LibraryIteration; import org.eclipse.ocl.pivot.library.collection.CollectionExcludesOperation; -import org.eclipse.ocl.pivot.library.collection.CollectionExcludingOperation; import org.eclipse.ocl.pivot.library.collection.CollectionIncludesOperation; import org.eclipse.ocl.pivot.library.oclany.OclAnyOclAsSetOperation; import org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation; @@ -46,7 +45,6 @@ import org.eclipse.ocl.pivot.messages.PivotMessages; import org.eclipse.ocl.pivot.oclstdlib.OCLstdlibTables; import org.eclipse.ocl.pivot.utilities.ClassUtil; import org.eclipse.ocl.pivot.utilities.ValueUtil; -import org.eclipse.ocl.pivot.values.BagValue; import org.eclipse.ocl.pivot.values.InvalidValueException; import org.eclipse.ocl.pivot.values.SequenceValue; import org.eclipse.ocl.pivot.values.SetValue; @@ -66,9 +64,9 @@ import org.eclipse.qvtd.pivot.qvtbase.Transformation; * <ul> * <li>{@link org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl#getDomain <em>Domain</em>}</li> * <li>{@link org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl#isIsAbstract <em>Is Abstract</em>}</li> + * <li>{@link org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl#getOverridden <em>Overridden</em>}</li> * <li>{@link org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl#getOverrides <em>Overrides</em>}</li> * <li>{@link org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl#getTransformation <em>Transformation</em>}</li> - * <li>{@link org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl#getOverridden <em>Overridden</em>}</li> * </ul> * * @generated @@ -105,24 +103,24 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { protected boolean isAbstract = IS_ABSTRACT_EDEFAULT; /** - * The cached value of the '{@link #getOverrides() <em>Overrides</em>}' reference. + * The cached value of the '{@link #getOverridden() <em>Overridden</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getOverrides() + * @see #getOverridden() * @generated * @ordered */ - protected Rule overrides; + protected Rule overridden; /** - * The cached value of the '{@link #getOverridden() <em>Overridden</em>}' reference list. + * The cached value of the '{@link #getOverrides() <em>Overrides</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getOverridden() + * @see #getOverrides() * @generated * @ordered */ - protected EList<Rule> overridden; + protected EList<Rule> overrides; /** * <!-- begin-user-doc --> @@ -185,14 +183,9 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { * @generated */ @Override - public Rule getOverrides() { - if (overrides != null && overrides.eIsProxy()) { - InternalEObject oldOverrides = (InternalEObject)overrides; - overrides = (Rule)eResolveProxy(oldOverrides); - if (overrides != oldOverrides) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTbasePackage.RULE__OVERRIDES, oldOverrides, overrides)); - } + public EList<Rule> getOverrides() { + if (overrides == null) { + overrides = new EObjectWithInverseResolvingEList<Rule>(Rule.class, this, QVTbasePackage.RULE__OVERRIDES, QVTbasePackage.RULE__OVERRIDDEN); } return overrides; } @@ -202,8 +195,10 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { * <!-- end-user-doc --> * @generated */ - public Rule basicGetOverrides() { - return overrides; + @Override + public Transformation getTransformation() { + if (eContainerFeatureID() != QVTbasePackage.RULE__TRANSFORMATION) return null; + return (Transformation)eInternalContainer(); } /** @@ -211,13 +206,8 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetOverrides(Rule newOverrides, NotificationChain msgs) { - Rule oldOverrides = overrides; - overrides = newOverrides; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, QVTbasePackage.RULE__OVERRIDES, oldOverrides, newOverrides); - if (msgs == null) msgs = notification; else msgs.add(notification); - } + public NotificationChain basicSetTransformation(Transformation newTransformation, NotificationChain msgs) { + msgs = eBasicSetContainer((InternalEObject)newTransformation, QVTbasePackage.RULE__TRANSFORMATION, msgs); return msgs; } @@ -227,18 +217,20 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { * @generated */ @Override - public void setOverrides(Rule newOverrides) { - if (newOverrides != overrides) { + public void setTransformation(Transformation newTransformation) { + if (newTransformation != eInternalContainer() || (eContainerFeatureID() != QVTbasePackage.RULE__TRANSFORMATION && newTransformation != null)) { + if (EcoreUtil.isAncestor(this, newTransformation)) + throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); NotificationChain msgs = null; - if (overrides != null) - msgs = ((InternalEObject)overrides).eInverseRemove(this, QVTbasePackage.RULE__OVERRIDDEN, Rule.class, msgs); - if (newOverrides != null) - msgs = ((InternalEObject)newOverrides).eInverseAdd(this, QVTbasePackage.RULE__OVERRIDDEN, Rule.class, msgs); - msgs = basicSetOverrides(newOverrides, msgs); + if (eInternalContainer() != null) + msgs = eBasicRemoveFromContainer(msgs); + if (newTransformation != null) + msgs = ((InternalEObject)newTransformation).eInverseAdd(this, QVTbasePackage.TRANSFORMATION__RULE, Transformation.class, msgs); + msgs = basicSetTransformation(newTransformation, msgs); if (msgs != null) msgs.dispatch(); } else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, QVTbasePackage.RULE__OVERRIDES, newOverrides, newOverrides)); + eNotify(new ENotificationImpl(this, Notification.SET, QVTbasePackage.RULE__TRANSFORMATION, newTransformation, newTransformation)); } /** @@ -247,9 +239,16 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { * @generated */ @Override - public Transformation getTransformation() { - if (eContainerFeatureID() != QVTbasePackage.RULE__TRANSFORMATION) return null; - return (Transformation)eInternalContainer(); + public Rule getOverridden() { + if (overridden != null && overridden.eIsProxy()) { + InternalEObject oldOverridden = (InternalEObject)overridden; + overridden = (Rule)eResolveProxy(oldOverridden); + if (overridden != oldOverridden) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTbasePackage.RULE__OVERRIDDEN, oldOverridden, overridden)); + } + } + return overridden; } /** @@ -257,9 +256,8 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetTransformation(Transformation newTransformation, NotificationChain msgs) { - msgs = eBasicSetContainer((InternalEObject)newTransformation, QVTbasePackage.RULE__TRANSFORMATION, msgs); - return msgs; + public Rule basicGetOverridden() { + return overridden; } /** @@ -267,21 +265,14 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { * <!-- end-user-doc --> * @generated */ - @Override - public void setTransformation(Transformation newTransformation) { - if (newTransformation != eInternalContainer() || (eContainerFeatureID() != QVTbasePackage.RULE__TRANSFORMATION && newTransformation != null)) { - if (EcoreUtil.isAncestor(this, newTransformation)) - throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); - NotificationChain msgs = null; - if (eInternalContainer() != null) - msgs = eBasicRemoveFromContainer(msgs); - if (newTransformation != null) - msgs = ((InternalEObject)newTransformation).eInverseAdd(this, QVTbasePackage.TRANSFORMATION__RULE, Transformation.class, msgs); - msgs = basicSetTransformation(newTransformation, msgs); - if (msgs != null) msgs.dispatch(); + public NotificationChain basicSetOverridden(Rule newOverridden, NotificationChain msgs) { + Rule oldOverridden = overridden; + overridden = newOverridden; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, QVTbasePackage.RULE__OVERRIDDEN, oldOverridden, newOverridden); + if (msgs == null) msgs = notification; else msgs.add(notification); } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, QVTbasePackage.RULE__TRANSFORMATION, newTransformation, newTransformation)); + return msgs; } /** @@ -290,11 +281,18 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { * @generated */ @Override - public EList<Rule> getOverridden() { - if (overridden == null) { - overridden = new EObjectWithInverseResolvingEList<Rule>(Rule.class, this, QVTbasePackage.RULE__OVERRIDDEN, QVTbasePackage.RULE__OVERRIDES); + public void setOverridden(Rule newOverridden) { + if (newOverridden != overridden) { + NotificationChain msgs = null; + if (overridden != null) + msgs = ((InternalEObject)overridden).eInverseRemove(this, QVTbasePackage.RULE__OVERRIDES, Rule.class, msgs); + if (newOverridden != null) + msgs = ((InternalEObject)newOverridden).eInverseAdd(this, QVTbasePackage.RULE__OVERRIDES, Rule.class, msgs); + msgs = basicSetOverridden(newOverridden, msgs); + if (msgs != null) msgs.dispatch(); } - return overridden; + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, QVTbasePackage.RULE__OVERRIDDEN, newOverridden, newOverridden)); } /** @@ -381,7 +379,7 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { * then true * else * let - * result : Boolean[1] = overrides->closure(overrides) + * result : Boolean[1] = overridden->closure(overridden) * ->excludes(self) * in * 'Rule::NoOverridesCycle'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0) @@ -399,8 +397,8 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { else { /*@Caught*/ @NonNull Object CAUGHT_result; try { - final /*@NonInvalid*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Rule overrides = this.getOverrides(); - final /*@Thrown*/ org.eclipse.ocl.pivot.values.@NonNull SetValue oclAsSet = OclAnyOclAsSetOperation.INSTANCE.evaluate(executor, QVTbaseTables.SET_CLSSid_Rule, overrides); + final /*@NonInvalid*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Rule overridden = this.getOverridden(); + final /*@Thrown*/ org.eclipse.ocl.pivot.values.@NonNull SetValue oclAsSet = OclAnyOclAsSetOperation.INSTANCE.evaluate(executor, QVTbaseTables.SET_CLSSid_Rule, overridden); final org.eclipse.ocl.pivot.@NonNull Class TYPE_closure_0 = executor.getStaticTypeOf(oclAsSet); final LibraryIteration.@org.eclipse.jdt.annotation.NonNull LibraryIterationExtension IMPL_closure_0 = (LibraryIteration.LibraryIterationExtension)TYPE_closure_0.lookupImplementation(standardLibrary, OCLstdlibTables.Operations._Set__closure); final @NonNull Object ACC_closure_0 = IMPL_closure_0.createAccumulatorValue(executor, QVTbaseTables.SET_CLSSid_Rule, QVTbaseTables.CLSSid_Rule); @@ -409,16 +407,16 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { */ final @NonNull AbstractBinaryOperation BODY_closure_0 = new AbstractBinaryOperation() { /** - * overrides + * overridden */ @Override public @Nullable Object evaluate(final @NonNull Executor executor, final @NonNull TypeId typeId, final @Nullable Object oclAsSet, final /*@NonInvalid*/ java.lang.@Nullable Object _1) { final /*@NonInvalid*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Rule symbol_0 = (Rule)_1; if (symbol_0 == null) { - throw new InvalidValueException("Null source for \'\'http://www.eclipse.org/qvt/2015/QVTbase\'::Rule::overrides\'"); + throw new InvalidValueException("Null source for \'\'http://www.eclipse.org/qvt/2015/QVTbase\'::Rule::overridden\'"); } - final /*@Thrown*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Rule overrides_0 = symbol_0.getOverrides(); - return overrides_0; + final /*@Thrown*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Rule overridden_0 = symbol_0.getOverridden(); + return overridden_0; } }; final @NonNull ExecutorSingleIterationManager MGR_closure_0 = new ExecutorSingleIterationManager(executor, QVTbaseTables.SET_CLSSid_Rule, BODY_closure_0, oclAsSet, ACC_closure_0); @@ -441,140 +439,26 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { * @generated */ @Override - public boolean validateOverridesRuleIsExtendedRule(final DiagnosticChain diagnostics, final Map<Object, Object> context) { + public boolean validateOverridingRuleOverridesAllDomains(final DiagnosticChain diagnostics, final Map<Object, Object> context) { /** * - * inv OverridesRuleIsExtendedRule: + * inv OverridingRuleOverridesAllDomains: * let - * severity : Integer[1] = 'Rule::OverridesRuleIsExtendedRule'.getSeverity() + * severity : Integer[1] = 'Rule::OverridingRuleOverridesAllDomains'.getSeverity() * in * if severity <= 0 * then true * else - * let result : Boolean[?] = overrides <> null and transformation <> null implies - * let - * extendedRules : Bag(qvtbase::Rule) = transformation->closure(extends) - * ->excluding(transformation) - * ?->collect(rule) - * in extendedRules->includes(overrides) - * in - * 'Rule::OverridesRuleIsExtendedRule'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0) - * endif - */ - final /*@NonInvalid*/ org.eclipse.ocl.pivot.evaluation.@NonNull Executor executor = PivotUtilInternal.getExecutor(this); - final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.@NonNull IdResolver idResolver = executor.getIdResolver(); - final /*@NonInvalid*/ org.eclipse.ocl.pivot.@NonNull StandardLibrary standardLibrary = idResolver.getStandardLibrary(); - final /*@NonInvalid*/ org.eclipse.ocl.pivot.values.@NonNull IntegerValue severity_0 = CGStringGetSeverityOperation.INSTANCE.evaluate(executor, QVTbaseTables.STR_Rule_c_c_OverridesRuleIsExtendedRule); - final /*@NonInvalid*/ boolean le = OclComparableLessThanEqualOperation.INSTANCE.evaluate(executor, severity_0, QVTbaseTables.INT_0).booleanValue(); - /*@NonInvalid*/ boolean symbol_2; - if (le) { - symbol_2 = ValueUtil.TRUE_VALUE; - } - else { - /*@Caught*/ @NonNull Object CAUGHT_result; - try { - final /*@NonInvalid*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Rule overrides_0 = this.getOverrides(); - final /*@NonInvalid*/ boolean ne = overrides_0 != null; - /*@NonInvalid*/ boolean and; - if (ne) { - final /*@NonInvalid*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Transformation transformation = this.getTransformation(); - final /*@NonInvalid*/ boolean ne_0 = transformation != null; - and = ne_0; - } - else { - and = ValueUtil.FALSE_VALUE; - } - /*@Thrown*/ boolean result; - if (and) { - final /*@NonInvalid*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Transformation transformation_1 = this.getTransformation(); - final /*@Thrown*/ org.eclipse.ocl.pivot.values.@NonNull SetValue oclAsSet = OclAnyOclAsSetOperation.INSTANCE.evaluate(executor, QVTbaseTables.SET_CLSSid_Transformation, transformation_1); - final org.eclipse.ocl.pivot.@NonNull Class TYPE_closure_0 = executor.getStaticTypeOf(oclAsSet); - final LibraryIteration.@org.eclipse.jdt.annotation.NonNull LibraryIterationExtension IMPL_closure_0 = (LibraryIteration.LibraryIterationExtension)TYPE_closure_0.lookupImplementation(standardLibrary, OCLstdlibTables.Operations._Set__closure); - final @NonNull Object ACC_closure_0 = IMPL_closure_0.createAccumulatorValue(executor, QVTbaseTables.SET_CLSSid_Transformation, QVTbaseTables.CLSSid_Transformation); - /** - * Implementation of the iterator body. - */ - final @NonNull AbstractBinaryOperation BODY_closure_0 = new AbstractBinaryOperation() { - /** - * extends - */ - @Override - public @Nullable Object evaluate(final @NonNull Executor executor, final @NonNull TypeId typeId, final @Nullable Object oclAsSet, final /*@NonInvalid*/ java.lang.@Nullable Object _1) { - final /*@NonInvalid*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Transformation symbol_0 = (Transformation)_1; - if (symbol_0 == null) { - throw new InvalidValueException("Null source for \'\'http://www.eclipse.org/qvt/2015/QVTbase\'::Transformation::extends\'"); - } - final /*@Thrown*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Transformation symbol_1 = symbol_0.getExtends(); - return symbol_1; - } - }; - final @NonNull ExecutorSingleIterationManager MGR_closure_0 = new ExecutorSingleIterationManager(executor, QVTbaseTables.SET_CLSSid_Transformation, BODY_closure_0, oclAsSet, ACC_closure_0); - final /*@Thrown*/ org.eclipse.ocl.pivot.values.@NonNull SetValue closure = ClassUtil.nonNullState((SetValue)IMPL_closure_0.evaluateIteration(MGR_closure_0)); - final /*@Thrown*/ org.eclipse.ocl.pivot.values.@NonNull SetValue excluding = (SetValue)CollectionExcludingOperation.INSTANCE.evaluate(closure, transformation_1); - final /*@Thrown*/ org.eclipse.ocl.pivot.values.@NonNull SetValue safe_null_sources = (SetValue)CollectionExcludingOperation.INSTANCE.evaluate(excluding, (Object)null); - /*@Thrown*/ BagValue.@org.eclipse.jdt.annotation.NonNull Accumulator accumulator = ValueUtil.createBagAccumulatorValue(QVTbaseTables.BAG_CLSSid_Rule); - @NonNull Iterator<Object> ITERATOR__1_0 = safe_null_sources.iterator(); - /*@Thrown*/ org.eclipse.ocl.pivot.values.@NonNull BagValue extendedRules; - while (true) { - if (!ITERATOR__1_0.hasNext()) { - extendedRules = accumulator; - break; - } - @SuppressWarnings("null") - /*@NonInvalid*/ org.eclipse.qvtd.pivot.qvtbase.@NonNull Transformation _1_0 = (Transformation)ITERATOR__1_0.next(); - /** - * rule - */ - final /*@NonInvalid*/ java.util.@NonNull List<Rule> rule = _1_0.getRule(); - final /*@NonInvalid*/ org.eclipse.ocl.pivot.values.@NonNull SetValue BOXED_rule = idResolver.createSetOfAll(QVTbaseTables.SET_CLSSid_Rule, rule); - // - for (Object value : BOXED_rule.flatten().getElements()) { - accumulator.add(value); - } - } - final /*@Thrown*/ boolean includes = CollectionIncludesOperation.INSTANCE.evaluate(extendedRules, overrides_0).booleanValue(); - result = includes; - } - else { - result = ValueUtil.TRUE_VALUE; - } - CAUGHT_result = result; - } - catch (Exception e) { - CAUGHT_result = ValueUtil.createInvalidValue(e); - } - final /*@NonInvalid*/ boolean logDiagnostic = CGStringLogDiagnosticOperation.INSTANCE.evaluate(executor, TypeId.BOOLEAN, QVTbaseTables.STR_Rule_c_c_OverridesRuleIsExtendedRule, this, (Object)null, diagnostics, context, (Object)null, severity_0, CAUGHT_result, QVTbaseTables.INT_0).booleanValue(); - symbol_2 = logDiagnostic; - } - return Boolean.TRUE == symbol_2; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean validateOverridesRuleOverridesAllDomains(final DiagnosticChain diagnostics, final Map<Object, Object> context) { - /** - * - * inv OverridesRuleOverridesAllDomains: - * let - * severity : Integer[1] = 'Rule::OverridesRuleOverridesAllDomains'.getSeverity() - * in - * if severity <= 0 - * then true - * else - * let result : Boolean[?] = overrides <> null implies - * overrides.domain->forAll(od | + * let result : Boolean[?] = overridden <> null implies + * overridden.domain->forAll(od | * self.domain.name->includes(od.name)) * in - * 'Rule::OverridesRuleOverridesAllDomains'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0) + * 'Rule::OverridingRuleOverridesAllDomains'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0) * endif */ final /*@NonInvalid*/ org.eclipse.ocl.pivot.evaluation.@NonNull Executor executor = PivotUtilInternal.getExecutor(this); final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.@NonNull IdResolver idResolver = executor.getIdResolver(); - final /*@NonInvalid*/ org.eclipse.ocl.pivot.values.@NonNull IntegerValue severity_0 = CGStringGetSeverityOperation.INSTANCE.evaluate(executor, QVTbaseTables.STR_Rule_c_c_OverridesRuleOverridesAllDomains); + final /*@NonInvalid*/ org.eclipse.ocl.pivot.values.@NonNull IntegerValue severity_0 = CGStringGetSeverityOperation.INSTANCE.evaluate(executor, QVTbaseTables.STR_Rule_c_c_OverridingRuleOverridesAllDomains); final /*@NonInvalid*/ boolean le = OclComparableLessThanEqualOperation.INSTANCE.evaluate(executor, severity_0, QVTbaseTables.INT_0).booleanValue(); /*@NonInvalid*/ boolean symbol_0; if (le) { @@ -583,15 +467,15 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { else { /*@Caught*/ @NonNull Object CAUGHT_result; try { - final /*@NonInvalid*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Rule overrides = this.getOverrides(); - final /*@NonInvalid*/ boolean ne = overrides != null; + final /*@NonInvalid*/ org.eclipse.qvtd.pivot.qvtbase.@Nullable Rule overridden = this.getOverridden(); + final /*@NonInvalid*/ boolean ne = overridden != null; /*@Thrown*/ boolean result; if (ne) { - if (overrides == null) { + if (overridden == null) { throw new InvalidValueException("Null source for \'\'http://www.eclipse.org/qvt/2015/QVTbase\'::Rule::domain\'"); } @SuppressWarnings("null") - final /*@Thrown*/ java.util.@NonNull List<Domain> domain = overrides.getDomain(); + final /*@Thrown*/ java.util.@NonNull List<Domain> domain = overridden.getDomain(); final /*@Thrown*/ org.eclipse.ocl.pivot.values.@NonNull OrderedSetValue BOXED_domain = idResolver.createOrderedSetOfAll(QVTbaseTables.ORD_CLSSid_Domain, domain); /*@Thrown*/ java.lang.@Nullable Object accumulator = ValueUtil.TRUE_VALUE; @NonNull Iterator<Object> ITERATOR_od = BOXED_domain.iterator(); @@ -665,7 +549,7 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { catch (Exception e) { CAUGHT_result = ValueUtil.createInvalidValue(e); } - final /*@NonInvalid*/ boolean logDiagnostic = CGStringLogDiagnosticOperation.INSTANCE.evaluate(executor, TypeId.BOOLEAN, QVTbaseTables.STR_Rule_c_c_OverridesRuleOverridesAllDomains, this, (Object)null, diagnostics, context, (Object)null, severity_0, CAUGHT_result, QVTbaseTables.INT_0).booleanValue(); + final /*@NonInvalid*/ boolean logDiagnostic = CGStringLogDiagnosticOperation.INSTANCE.evaluate(executor, TypeId.BOOLEAN, QVTbaseTables.STR_Rule_c_c_OverridingRuleOverridesAllDomains, this, (Object)null, diagnostics, context, (Object)null, severity_0, CAUGHT_result, QVTbaseTables.INT_0).booleanValue(); symbol_0 = logDiagnostic; } return Boolean.TRUE == symbol_0; @@ -692,16 +576,16 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { switch (featureID) { case QVTbasePackage.RULE__DOMAIN: return ((InternalEList<InternalEObject>)(InternalEList<?>)getDomain()).basicAdd(otherEnd, msgs); + case QVTbasePackage.RULE__OVERRIDDEN: + if (overridden != null) + msgs = ((InternalEObject)overridden).eInverseRemove(this, QVTbasePackage.RULE__OVERRIDES, Rule.class, msgs); + return basicSetOverridden((Rule)otherEnd, msgs); case QVTbasePackage.RULE__OVERRIDES: - if (overrides != null) - msgs = ((InternalEObject)overrides).eInverseRemove(this, QVTbasePackage.RULE__OVERRIDDEN, Rule.class, msgs); - return basicSetOverrides((Rule)otherEnd, msgs); + return ((InternalEList<InternalEObject>)(InternalEList<?>)getOverrides()).basicAdd(otherEnd, msgs); case QVTbasePackage.RULE__TRANSFORMATION: if (eInternalContainer() != null) msgs = eBasicRemoveFromContainer(msgs); return basicSetTransformation((Transformation)otherEnd, msgs); - case QVTbasePackage.RULE__OVERRIDDEN: - return ((InternalEList<InternalEObject>)(InternalEList<?>)getOverridden()).basicAdd(otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -716,12 +600,12 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { switch (featureID) { case QVTbasePackage.RULE__DOMAIN: return ((InternalEList<?>)getDomain()).basicRemove(otherEnd, msgs); + case QVTbasePackage.RULE__OVERRIDDEN: + return basicSetOverridden(null, msgs); case QVTbasePackage.RULE__OVERRIDES: - return basicSetOverrides(null, msgs); + return ((InternalEList<?>)getOverrides()).basicRemove(otherEnd, msgs); case QVTbasePackage.RULE__TRANSFORMATION: return basicSetTransformation(null, msgs); - case QVTbasePackage.RULE__OVERRIDDEN: - return ((InternalEList<?>)getOverridden()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -752,13 +636,13 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { return getDomain(); case QVTbasePackage.RULE__IS_ABSTRACT: return isIsAbstract(); + case QVTbasePackage.RULE__OVERRIDDEN: + if (resolve) return getOverridden(); + return basicGetOverridden(); case QVTbasePackage.RULE__OVERRIDES: - if (resolve) return getOverrides(); - return basicGetOverrides(); + return getOverrides(); case QVTbasePackage.RULE__TRANSFORMATION: return getTransformation(); - case QVTbasePackage.RULE__OVERRIDDEN: - return getOverridden(); } return super.eGet(featureID, resolve, coreType); } @@ -779,16 +663,16 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { case QVTbasePackage.RULE__IS_ABSTRACT: setIsAbstract((Boolean)newValue); return; + case QVTbasePackage.RULE__OVERRIDDEN: + setOverridden((Rule)newValue); + return; case QVTbasePackage.RULE__OVERRIDES: - setOverrides((Rule)newValue); + getOverrides().clear(); + getOverrides().addAll((Collection<? extends Rule>)newValue); return; case QVTbasePackage.RULE__TRANSFORMATION: setTransformation((Transformation)newValue); return; - case QVTbasePackage.RULE__OVERRIDDEN: - getOverridden().clear(); - getOverridden().addAll((Collection<? extends Rule>)newValue); - return; } super.eSet(featureID, newValue); } @@ -807,15 +691,15 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { case QVTbasePackage.RULE__IS_ABSTRACT: setIsAbstract(IS_ABSTRACT_EDEFAULT); return; + case QVTbasePackage.RULE__OVERRIDDEN: + setOverridden((Rule)null); + return; case QVTbasePackage.RULE__OVERRIDES: - setOverrides((Rule)null); + getOverrides().clear(); return; case QVTbasePackage.RULE__TRANSFORMATION: setTransformation((Transformation)null); return; - case QVTbasePackage.RULE__OVERRIDDEN: - getOverridden().clear(); - return; } super.eUnset(featureID); } @@ -832,12 +716,12 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { return domain != null && !domain.isEmpty(); case QVTbasePackage.RULE__IS_ABSTRACT: return isAbstract != IS_ABSTRACT_EDEFAULT; + case QVTbasePackage.RULE__OVERRIDDEN: + return overridden != null; case QVTbasePackage.RULE__OVERRIDES: - return overrides != null; + return overrides != null && !overrides.isEmpty(); case QVTbasePackage.RULE__TRANSFORMATION: return getTransformation() != null; - case QVTbasePackage.RULE__OVERRIDDEN: - return overridden != null && !overridden.isEmpty(); } return super.eIsSet(featureID); } @@ -855,10 +739,8 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule { return validateDomainNameIsUnique((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1)); case QVTbasePackage.RULE___VALIDATE_NO_OVERRIDES_CYCLE__DIAGNOSTICCHAIN_MAP: return validateNoOverridesCycle((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1)); - case QVTbasePackage.RULE___VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE__DIAGNOSTICCHAIN_MAP: - return validateOverridesRuleIsExtendedRule((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1)); - case QVTbasePackage.RULE___VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP: - return validateOverridesRuleOverridesAllDomains((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1)); + case QVTbasePackage.RULE___VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP: + return validateOverridingRuleOverridesAllDomains((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1)); } return super.eInvoke(operationID, arguments); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTbaseMetamodel.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTbaseMetamodel.java index f0775417e..3ab85cfef 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTbaseMetamodel.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTbaseMetamodel.java @@ -194,8 +194,10 @@ public class QVTbaseMetamodel extends ASResourceImpl private final @NonNull CollectionType _Collection_TypedModel = createCollectionType(_Collection, _TypedModel); private final @NonNull CollectionType _Collection_Variable = createCollectionType(_Collection, _Variable); private final @NonNull CollectionType _OrderedCollection_Domain = createCollectionType(_OrderedCollection, _Domain); + private final @NonNull CollectionType _OrderedCollection_Rule = createCollectionType(_OrderedCollection, _Rule); private final @NonNull CollectionType _OrderedCollection_TypedModel = createCollectionType(_OrderedCollection, _TypedModel); private final @NonNull OrderedSetType _OrderedSet_Domain_NullFree = createOrderedSetType(_OrderedSet, _Domain); + private final @NonNull OrderedSetType _OrderedSet_Rule_NullFree = createOrderedSetType(_OrderedSet, _Rule); private final @NonNull OrderedSetType _OrderedSet_TypedModel_NullFree = createOrderedSetType(_OrderedSet, _TypedModel); private final @NonNull SetType _Set_Annotation_NullFree = createSetType(_Set, _Annotation); private final @NonNull SetType _Set_Package_NullFree = createSetType(_Set, _Package); @@ -304,6 +306,9 @@ public class QVTbaseMetamodel extends ASResourceImpl ownedClasses.add(type = _OrderedCollection_Domain); superClasses = type.getSuperClasses(); superClasses.add(_Collection_Domain); + ownedClasses.add(type = _OrderedCollection_Rule); + superClasses = type.getSuperClasses(); + superClasses.add(_Collection_Rule); ownedClasses.add(type = _OrderedCollection_TypedModel); superClasses = type.getSuperClasses(); superClasses.add(_Collection_TypedModel); @@ -312,6 +317,11 @@ public class QVTbaseMetamodel extends ASResourceImpl superClasses = type.getSuperClasses(); superClasses.add(_OrderedCollection_Domain); superClasses.add(_UniqueCollection_Domain); + ownedClasses.add(type = _OrderedSet_Rule_NullFree); + type.setIsNullFree(true); + superClasses = type.getSuperClasses(); + superClasses.add(_OrderedCollection_Rule); + superClasses.add(_UniqueCollection_Rule); ownedClasses.add(type = _OrderedSet_TypedModel_NullFree); type.setIsNullFree(true); superClasses = type.getSuperClasses(); @@ -401,8 +411,8 @@ public class QVTbaseMetamodel extends ASResourceImpl private final @NonNull Property pr_Predicate_pattern = createProperty(QVTbasePackage.Literals.PREDICATE__PATTERN, _Pattern); private final @NonNull Property pr_Rule_domain = createProperty(QVTbasePackage.Literals.RULE__DOMAIN, _OrderedSet_Domain_NullFree); private final @NonNull Property pr_Rule_isAbstract = createProperty(QVTbasePackage.Literals.RULE__IS_ABSTRACT, _Boolean); - private final @NonNull Property pr_Rule_overridden = createProperty(QVTbasePackage.Literals.RULE__OVERRIDDEN, _Set_Rule_NullFree); - private final @NonNull Property pr_Rule_overrides = createProperty(QVTbasePackage.Literals.RULE__OVERRIDES, _Rule); + private final @NonNull Property pr_Rule_overridden = createProperty(QVTbasePackage.Literals.RULE__OVERRIDDEN, _Rule); + private final @NonNull Property pr_Rule_overrides = createProperty(QVTbasePackage.Literals.RULE__OVERRIDES, _OrderedSet_Rule_NullFree); private final @NonNull Property pr_Rule_transformation = createProperty(QVTbasePackage.Literals.RULE__TRANSFORMATION, _Transformation); private final @NonNull Property pr_Transformation_extends = createProperty(QVTbasePackage.Literals.TRANSFORMATION__EXTENDS, _Transformation); private final @NonNull Property pr_Transformation_modelParameter = createProperty(QVTbasePackage.Literals.TRANSFORMATION__MODEL_PARAMETER, _OrderedSet_TypedModel_NullFree); @@ -512,10 +522,10 @@ public class QVTbaseMetamodel extends ASResourceImpl ownedProperties.add(property = pr_Rule_isAbstract); property.setIsResolveProxies(true); ownedProperties.add(property = pr_Rule_overridden); + property.setIsRequired(false); property.setIsResolveProxies(true); property.setOpposite(pr_Rule_overrides); ownedProperties.add(property = pr_Rule_overrides); - property.setIsRequired(false); property.setIsResolveProxies(true); property.setOpposite(pr_Rule_overridden); ownedProperties.add(property = pr_Rule_transformation); @@ -603,10 +613,14 @@ public class QVTbaseMetamodel extends ASResourceImpl createTemplateParameterSubstitution(_Collection_T, _Variable))); _OrderedCollection_Domain.getOwnedBindings().add(createTemplateBinding( createTemplateParameterSubstitution(_OrderedCollection_T, _Domain))); + _OrderedCollection_Rule.getOwnedBindings().add(createTemplateBinding( + createTemplateParameterSubstitution(_OrderedCollection_T, _Rule))); _OrderedCollection_TypedModel.getOwnedBindings().add(createTemplateBinding( createTemplateParameterSubstitution(_OrderedCollection_T, _TypedModel))); _OrderedSet_Domain_NullFree.getOwnedBindings().add(createTemplateBinding( createTemplateParameterSubstitution(_OrderedSet_T, _Domain))); + _OrderedSet_Rule_NullFree.getOwnedBindings().add(createTemplateBinding( + createTemplateParameterSubstitution(_OrderedSet_T, _Rule))); _OrderedSet_TypedModel_NullFree.getOwnedBindings().add(createTemplateBinding( createTemplateParameterSubstitution(_OrderedSet_T, _TypedModel))); _Set_Annotation_NullFree.getOwnedBindings().add(createTemplateBinding( diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseValidator.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseValidator.java index 58383bcb7..5a46c93c8 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseValidator.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseValidator.java @@ -115,20 +115,12 @@ public class QVTbaseValidator extends EObjectValidator { public static final int RULE__VALIDATE_NO_OVERRIDES_CYCLE = 7; /** - * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Overrides Rule Is Extended Rule' of 'Rule'. + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Overriding Rule Overrides All Domains' of 'Rule'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - public static final int RULE__VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE = 8; - - /** - * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Overrides Rule Overrides All Domains' of 'Rule'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final int RULE__VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS = 9; + public static final int RULE__VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS = 8; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Context Type Is Transformation' of 'Transformation'. @@ -136,7 +128,7 @@ public class QVTbaseValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - public static final int TRANSFORMATION__VALIDATE_CONTEXT_TYPE_IS_TRANSFORMATION = 10; + public static final int TRANSFORMATION__VALIDATE_CONTEXT_TYPE_IS_TRANSFORMATION = 9; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Extended Typed Model Is Extended' of 'Transformation'. @@ -144,7 +136,7 @@ public class QVTbaseValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - public static final int TRANSFORMATION__VALIDATE_EXTENDED_TYPED_MODEL_IS_EXTENDED = 11; + public static final int TRANSFORMATION__VALIDATE_EXTENDED_TYPED_MODEL_IS_EXTENDED = 10; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Model Parameter Is Unique' of 'Transformation'. @@ -152,7 +144,7 @@ public class QVTbaseValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - public static final int TRANSFORMATION__VALIDATE_MODEL_PARAMETER_IS_UNIQUE = 12; + public static final int TRANSFORMATION__VALIDATE_MODEL_PARAMETER_IS_UNIQUE = 11; /** * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Extends Cycle' of 'Transformation'. @@ -160,7 +152,7 @@ public class QVTbaseValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - public static final int TRANSFORMATION__VALIDATE_NO_EXTENDS_CYCLE = 13; + public static final int TRANSFORMATION__VALIDATE_NO_EXTENDS_CYCLE = 12; /** * A constant with a fixed name that can be used as the base value for additional hand written constants. @@ -168,7 +160,7 @@ public class QVTbaseValidator extends EObjectValidator { * <!-- end-user-doc --> * @generated */ - private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 13; + private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 12; /** * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class. @@ -412,8 +404,7 @@ public class QVTbaseValidator extends EObjectValidator { if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(rule, diagnostics, context); if (result || diagnostics != null) result &= validateRule_validateDomainNameIsUnique(rule, diagnostics, context); if (result || diagnostics != null) result &= validateRule_validateNoOverridesCycle(rule, diagnostics, context); - if (result || diagnostics != null) result &= validateRule_validateOverridesRuleIsExtendedRule(rule, diagnostics, context); - if (result || diagnostics != null) result &= validateRule_validateOverridesRuleOverridesAllDomains(rule, diagnostics, context); + if (result || diagnostics != null) result &= validateRule_validateOverridingRuleOverridesAllDomains(rule, diagnostics, context); return result; } @@ -438,23 +429,13 @@ public class QVTbaseValidator extends EObjectValidator { } /** - * Validates the validateOverridesRuleIsExtendedRule constraint of '<em>Rule</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateRule_validateOverridesRuleIsExtendedRule(Rule rule, DiagnosticChain diagnostics, Map<Object, Object> context) { - return rule.validateOverridesRuleIsExtendedRule(diagnostics, context); - } - - /** - * Validates the validateOverridesRuleOverridesAllDomains constraint of '<em>Rule</em>'. + * Validates the validateOverridingRuleOverridesAllDomains constraint of '<em>Rule</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - public boolean validateRule_validateOverridesRuleOverridesAllDomains(Rule rule, DiagnosticChain diagnostics, Map<Object, Object> context) { - return rule.validateOverridesRuleOverridesAllDomains(diagnostics, context); + public boolean validateRule_validateOverridingRuleOverridesAllDomains(Rule rule, DiagnosticChain diagnostics, Map<Object, Object> context) { + return rule.validateOverridingRuleOverridesAllDomains(diagnostics, context); } /** diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model-gen/QVTbase.oclas b/plugins/org.eclipse.qvtd.pivot.qvtbase/model-gen/QVTbase.oclas index 42f25011d..dee0a5c0e 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model-gen/QVTbase.oclas +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model-gen/QVTbase.oclas @@ -28,9 +28,9 @@ </ownedClasses> <ownedClasses xmi:id="T.qvtbase.FunctionParameter" name="FunctionParameter" superClasses="../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Parameter"/> <ownedClasses xmi:id="T.qvtbase.Pattern" name="Pattern" superClasses="../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Element"> - <ownedProperties xmi:id="p.qvtbase.Pattern.bindsTo" name="bindsTo" opposite="#p.pivot.Variable.Pattern" type="#//@ownedPackages.2/@ownedClasses.17"/> + <ownedProperties xmi:id="p.qvtbase.Pattern.bindsTo" name="bindsTo" opposite="#p.pivot.Variable.Pattern" type="#//@ownedPackages.2/@ownedClasses.19"/> <ownedProperties xmi:id="p.qvtbase.Pattern.predicate" isComposite="true" name="predicate" opposite="#p.qvtbase.Predicate.pattern" - type="#//@ownedPackages.2/@ownedClasses.18"/> + type="#//@ownedPackages.2/@ownedClasses.20"/> </ownedClasses> <ownedClasses xmi:id="T.qvtbase.Predicate" name="Predicate" superClasses="../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Element"> <ownedInvariants xmi:id="ciqvtbase.Predicate.ConditionIsBoolean" isCallable="true" name="ConditionIsBoolean"> @@ -46,18 +46,15 @@ <ownedSpecification xsi:type="pivot:ExpressionInOCL" body="
	domain->isUnique(name)

"/> </ownedInvariants> <ownedInvariants xmi:id="ciqvtbase.Rule.NoOverridesCycle" isCallable="true" name="NoOverridesCycle"> - <ownedSpecification xsi:type="pivot:ExpressionInOCL" body="
	overrides->closure(overrides)->excludes(self)

"/> + <ownedSpecification xsi:type="pivot:ExpressionInOCL" body="
	overridden->closure(overridden)->excludes(self)

"/> </ownedInvariants> - <ownedInvariants xmi:id="ciqvtbase.Rule.OverridesRuleIsExtendedRule" isCallable="true" name="OverridesRuleIsExtendedRule"> - <ownedSpecification xsi:type="pivot:ExpressionInOCL" body="
	overrides <> null and transformation <> null implies
	let extendedRules = transformation->closure(_extends)->excluding(transformation)?->collect(rule)
	in extendedRules->includes(overrides)

"/> + <ownedInvariants xmi:id="ciqvtbase.Rule.OverridingRuleOverridesAllDomains" isCallable="true" name="OverridingRuleOverridesAllDomains"> + <ownedSpecification xsi:type="pivot:ExpressionInOCL" body="
	overridden <> null implies
	overridden.domain->forAll(od | self.domain.name->includes(od.name))

"/> </ownedInvariants> - <ownedInvariants xmi:id="ciqvtbase.Rule.OverridesRuleOverridesAllDomains" isCallable="true" name="OverridesRuleOverridesAllDomains"> - <ownedSpecification xsi:type="pivot:ExpressionInOCL" body="
	overrides <> null implies
	overrides.domain->forAll(od | self.domain.name->includes(od.name))

"/> - </ownedInvariants> - <ownedProperties xmi:id="p.qvtbase.Rule.domain" isComposite="true" name="domain" opposite="#p.qvtbase.Domain.rule" type="#//@ownedPackages.2/@ownedClasses.13"/> + <ownedProperties xmi:id="p.qvtbase.Rule.domain" isComposite="true" name="domain" opposite="#p.qvtbase.Domain.rule" type="#//@ownedPackages.2/@ownedClasses.14"/> <ownedProperties xmi:id="p.qvtbase.Rule.isAbstract" defaultValueString="false" name="isAbstract" type="pivot:PrimitiveType http://www.eclipse.org/ocl/2015/Library.oclas#Boolean"/> - <ownedProperties xmi:id="p.qvtbase.Rule.overridden" name="overridden" opposite="#p.qvtbase.Rule.overrides" type="#//@ownedPackages.2/@ownedClasses.19"/> - <ownedProperties xmi:id="p.qvtbase.Rule.overrides" isRequired="false" name="overrides" opposite="#p.qvtbase.Rule.overridden" type="#T.qvtbase.Rule"/> + <ownedProperties xmi:id="p.qvtbase.Rule.overridden" isRequired="false" name="overridden" opposite="#p.qvtbase.Rule.overrides" type="#T.qvtbase.Rule"/> + <ownedProperties xmi:id="p.qvtbase.Rule.overrides" name="overrides" opposite="#p.qvtbase.Rule.overridden" type="#//@ownedPackages.2/@ownedClasses.15"/> <ownedProperties xmi:id="p.qvtbase.Rule.transformation" isRequired="false" isResolveProxies="false" isTransient="true" name="transformation" opposite="#p.qvtbase.Transformation.rule" type="#T.qvtbase.Transformation"/> </ownedClasses> @@ -83,23 +80,23 @@ <ownedProperties xmi:id="p.qvtbase.Transformation.extends" isRequired="false" name="extends" opposite="#p.qvtbase.Transformation.extendedBy" type="#T.qvtbase.Transformation"/> <ownedProperties xmi:id="p.qvtbase.Transformation.modelParameter" isComposite="true" name="modelParameter" opposite="#p.qvtbase.TypedModel.transformation" - type="#//@ownedPackages.2/@ownedClasses.14"/> + type="#//@ownedPackages.2/@ownedClasses.16"/> <ownedProperties xmi:id="p.qvtbase.Transformation.ownedContext" isComposite="true" isRequired="false" name="ownedContext" opposite="#p.pivot.Variable.Transformation" type="pivot:Class ../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"/> <ownedProperties xmi:id="p.qvtbase.Transformation.ownedTag" isComposite="true" name="ownedTag" opposite="#p.pivot.Annotation.Transformation" - type="#//@ownedPackages.2/@ownedClasses.15"/> + type="#//@ownedPackages.2/@ownedClasses.17"/> <ownedProperties xmi:id="p.qvtbase.Transformation.rule" isComposite="true" name="rule" opposite="#p.qvtbase.Rule.transformation" - type="#//@ownedPackages.2/@ownedClasses.19"/> + type="#//@ownedPackages.2/@ownedClasses.21"/> <ownedProperties xmi:id="p.qvtbase.Transformation.extendedBy" isImplicit="true" isRequired="false" name="extendedBy" opposite="#p.qvtbase.Transformation.extends" type="#T.qvtbase.Transformation"/> </ownedClasses> <ownedClasses xmi:id="T.qvtbase.TypedModel" name="TypedModel" superClasses="../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.NamedElement"> - <ownedProperties xmi:id="p.qvtbase.TypedModel.dependsOn" name="dependsOn" opposite="#p.qvtbase.TypedModel.dependent" type="#//@ownedPackages.2/@ownedClasses.20"/> + <ownedProperties xmi:id="p.qvtbase.TypedModel.dependsOn" name="dependsOn" opposite="#p.qvtbase.TypedModel.dependent" type="#//@ownedPackages.2/@ownedClasses.22"/> <ownedProperties xmi:id="p.qvtbase.TypedModel.ownedContext" isComposite="true" isRequired="false" name="ownedContext" opposite="#p.pivot.Variable.TypedModel" type="pivot:Class ../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"/> <ownedProperties xmi:id="p.qvtbase.TypedModel.transformation" isTransient="true" name="transformation" opposite="#p.qvtbase.Transformation.modelParameter" type="#T.qvtbase.Transformation"/> - <ownedProperties xmi:id="p.qvtbase.TypedModel.usedPackage" name="usedPackage" opposite="#p.pivot.Package.TypedModel" type="#//@ownedPackages.2/@ownedClasses.16"/> + <ownedProperties xmi:id="p.qvtbase.TypedModel.usedPackage" name="usedPackage" opposite="#p.pivot.Package.TypedModel" type="#//@ownedPackages.2/@ownedClasses.18"/> <ownedProperties xmi:id="p.qvtbase.TypedModel.Domain" isImplicit="true" name="Domain" opposite="#p.qvtbase.Domain.typedModel" type="#//@ownedPackages.2/@ownedClasses.0"/> <ownedProperties xmi:id="p.qvtbase.TypedModel.dependent" isImplicit="true" isRequired="false" name="dependent" opposite="#p.qvtbase.TypedModel.dependsOn" type="#T.qvtbase.TypedModel"/> @@ -192,50 +189,60 @@ <ownedSubstitutions actual="#T.qvtbase.Domain" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..OrderedCollectionT"/> </ownedBindings> </ownedClasses> + <ownedClasses xsi:type="pivot:CollectionType" elementType="#T.qvtbase.Rule" name="OrderedCollection" superClasses="#//@ownedPackages.2/@ownedClasses.9"> + <ownedBindings> + <ownedSubstitutions actual="#T.qvtbase.Rule" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..OrderedCollectionT"/> + </ownedBindings> + </ownedClasses> <ownedClasses xsi:type="pivot:CollectionType" elementType="#T.qvtbase.TypedModel" name="OrderedCollection" superClasses="#//@ownedPackages.2/@ownedClasses.10"> <ownedBindings> <ownedSubstitutions actual="#T.qvtbase.TypedModel" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..OrderedCollectionT"/> </ownedBindings> </ownedClasses> - <ownedClasses xsi:type="pivot:OrderedSetType" elementType="#T.qvtbase.Domain" isNullFree="true" name="OrderedSet" superClasses="#//@ownedPackages.2/@ownedClasses.11 #//@ownedPackages.2/@ownedClasses.24"> + <ownedClasses xsi:type="pivot:OrderedSetType" elementType="#T.qvtbase.Domain" isNullFree="true" name="OrderedSet" superClasses="#//@ownedPackages.2/@ownedClasses.11 #//@ownedPackages.2/@ownedClasses.26"> <ownedBindings> <ownedSubstitutions actual="#T.qvtbase.Domain" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..OrderedSetT"/> </ownedBindings> </ownedClasses> - <ownedClasses xsi:type="pivot:OrderedSetType" elementType="#T.qvtbase.TypedModel" isNullFree="true" name="OrderedSet" superClasses="#//@ownedPackages.2/@ownedClasses.12 #//@ownedPackages.2/@ownedClasses.27"> + <ownedClasses xsi:type="pivot:OrderedSetType" elementType="#T.qvtbase.Rule" isNullFree="true" name="OrderedSet" superClasses="#//@ownedPackages.2/@ownedClasses.12 #//@ownedPackages.2/@ownedClasses.28"> + <ownedBindings> + <ownedSubstitutions actual="#T.qvtbase.Rule" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..OrderedSetT"/> + </ownedBindings> + </ownedClasses> + <ownedClasses xsi:type="pivot:OrderedSetType" elementType="#T.qvtbase.TypedModel" isNullFree="true" name="OrderedSet" superClasses="#//@ownedPackages.2/@ownedClasses.13 #//@ownedPackages.2/@ownedClasses.29"> <ownedBindings> <ownedSubstitutions actual="#T.qvtbase.TypedModel" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..OrderedSetT"/> </ownedBindings> </ownedClasses> <ownedClasses xsi:type="pivot:SetType" elementType="pivot:Class ../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Annotation" - isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.21"> + isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.23"> <ownedBindings> <ownedSubstitutions actual="pivot:Class ../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Annotation" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..SetT"/> </ownedBindings> </ownedClasses> <ownedClasses xsi:type="pivot:SetType" elementType="pivot:Class ../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Package" - isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.22"> + isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.24"> <ownedBindings> <ownedSubstitutions actual="pivot:Class ../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Package" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..SetT"/> </ownedBindings> </ownedClasses> <ownedClasses xsi:type="pivot:SetType" elementType="pivot:Class ../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable" - isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.23"> + isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.25"> <ownedBindings> <ownedSubstitutions actual="pivot:Class ../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..SetT"/> </ownedBindings> </ownedClasses> - <ownedClasses xsi:type="pivot:SetType" elementType="#T.qvtbase.Predicate" isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.25"> + <ownedClasses xsi:type="pivot:SetType" elementType="#T.qvtbase.Predicate" isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.27"> <ownedBindings> <ownedSubstitutions actual="#T.qvtbase.Predicate" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..SetT"/> </ownedBindings> </ownedClasses> - <ownedClasses xsi:type="pivot:SetType" elementType="#T.qvtbase.Rule" isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.26"> + <ownedClasses xsi:type="pivot:SetType" elementType="#T.qvtbase.Rule" isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.28"> <ownedBindings> <ownedSubstitutions actual="#T.qvtbase.Rule" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..SetT"/> </ownedBindings> </ownedClasses> - <ownedClasses xsi:type="pivot:SetType" elementType="#T.qvtbase.TypedModel" isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.27"> + <ownedClasses xsi:type="pivot:SetType" elementType="#T.qvtbase.TypedModel" isNullFree="true" name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.29"> <ownedBindings> <ownedSubstitutions actual="#T.qvtbase.TypedModel" formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..SetT"/> </ownedBindings> diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore index 68b6f0e13..22cd8b624 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore @@ -148,7 +148,7 @@ <details key="originalName" value="NoOverridesCycle"/> </eAnnotations> <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"> - <details key="body" value="
	overrides->closure(overrides)->excludes(self)

"/> + <details key="body" value="
	overridden->closure(overridden)->excludes(self)

"/> </eAnnotations> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/> <eParameters name="context"> @@ -158,27 +158,12 @@ </eGenericType> </eParameters> </eOperations> - <eOperations name="validateOverridesRuleIsExtendedRule" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> + <eOperations name="validateOverridingRuleOverridesAllDomains" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML"> - <details key="originalName" value="OverridesRuleIsExtendedRule"/> + <details key="originalName" value="OverridingRuleOverridesAllDomains"/> </eAnnotations> <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"> - <details key="body" value="
	overrides <> null and transformation <> null implies
	let extendedRules = transformation->closure(_extends)->excluding(transformation)?->collect(rule)
	in extendedRules->includes(overrides)

"/> - </eAnnotations> - <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/> - <eParameters name="context"> - <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"> - <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> - <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> - </eGenericType> - </eParameters> - </eOperations> - <eOperations name="validateOverridesRuleOverridesAllDomains" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"> - <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML"> - <details key="originalName" value="OverridesRuleOverridesAllDomains"/> - </eAnnotations> - <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"> - <details key="body" value="
	overrides <> null implies
	overrides.domain->forAll(od | self.domain.name->includes(od.name))

"/> + <details key="body" value="
	overridden <> null implies
	overridden.domain->forAll(od | self.domain.name->includes(od.name))

"/> </eAnnotations> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/> <eParameters name="context"> @@ -194,14 +179,13 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtbase-Rule-isAbstract" name="isAbstract" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/> + <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-overridden" + name="overridden" eType="#T-qvtbase-Rule" eOpposite="#F-qvtbase-Rule-overrides"/> <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-overrides" - name="overrides" eType="#T-qvtbase-Rule" eOpposite="#F-qvtbase-Rule-overridden"/> + name="overrides" upperBound="-1" eType="#T-qvtbase-Rule" eOpposite="#F-qvtbase-Rule-overridden"/> <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-transformation" name="transformation" eType="#T-qvtbase-Transformation" transient="true" resolveProxies="false" eOpposite="#F-qvtbase-Transformation-rule"/> - <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-overridden" - name="overridden" ordered="false" upperBound="-1" eType="#T-qvtbase-Rule" - eOpposite="#F-qvtbase-Rule-overrides"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Transformation" name="Transformation" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Class"> diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel index 01f31f19d..0ef03dcb0 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel @@ -58,9 +58,9 @@ <genClasses image="false" ecoreClass="QVTbase.ecore#T-qvtbase-Rule"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTbase.ecore#F-qvtbase-Rule-domain"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute QVTbase.ecore#F-qvtbase-Rule-isAbstract"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTbase.ecore#F-qvtbase-Rule-overridden"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTbase.ecore#F-qvtbase-Rule-overrides"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference QVTbase.ecore#F-qvtbase-Rule-transformation"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTbase.ecore#F-qvtbase-Rule-overridden"/> <genOperations ecoreOperation="QVTbase.ecore#//Rule/validateDomainNameIsUnique"> <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateDomainNameIsUnique/diagnostics"/> <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateDomainNameIsUnique/context"/> @@ -69,13 +69,9 @@ <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateNoOverridesCycle/diagnostics"/> <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateNoOverridesCycle/context"/> </genOperations> - <genOperations ecoreOperation="QVTbase.ecore#//Rule/validateOverridesRuleIsExtendedRule"> - <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateOverridesRuleIsExtendedRule/diagnostics"/> - <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateOverridesRuleIsExtendedRule/context"/> - </genOperations> - <genOperations ecoreOperation="QVTbase.ecore#//Rule/validateOverridesRuleOverridesAllDomains"> - <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateOverridesRuleOverridesAllDomains/diagnostics"/> - <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateOverridesRuleOverridesAllDomains/context"/> + <genOperations ecoreOperation="QVTbase.ecore#//Rule/validateOverridingRuleOverridesAllDomains"> + <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateOverridingRuleOverridesAllDomains/diagnostics"/> + <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateOverridingRuleOverridesAllDomains/context"/> </genOperations> </genClasses> <genClasses ecoreClass="QVTbase.ecore#T-qvtbase-Transformation"> diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ocl b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ocl index b3dcdc2ab..41d188e39 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ocl +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ocl @@ -27,16 +27,16 @@ inv DomainNameIsUnique: domain->isUnique(name) inv NoOverridesCycle: - overrides->closure(overrides)->excludes(self) + overridden->closure(overridden)->excludes(self) -inv OverridesRuleIsExtendedRule: - overrides <> null and transformation <> null implies - let extendedRules = transformation->closure(_extends)->excluding(transformation)?->collect(rule) - in extendedRules->includes(overrides) +--inv OverridesRuleIsExtendedRule: +-- overrides <> null and transformation <> null implies +-- let extendedRules = transformation->closure(_extends)->excluding(transformation)?->collect(rule) +-- in extendedRules->includes(overrides) -inv OverridesRuleOverridesAllDomains: - overrides <> null implies - overrides.domain->forAll(od | self.domain.name->includes(od.name)) +inv OverridingRuleOverridesAllDomains: + overridden <> null implies + overridden.domain->forAll(od | self.domain.name->includes(od.name)) context Transformation inv ContextTypeIsTransformation: diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbaseStructural.ecore b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbaseStructural.ecore index bfbff8e1c..6264a6971 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbaseStructural.ecore +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbaseStructural.ecore @@ -42,16 +42,16 @@ eType="#//Domain" containment="true" eOpposite="#//Domain/rule"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAbstract" eType="ecore:EDataType ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Boolean" defaultValueLiteral="false"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="overrides" eType="#//Rule" - eOpposite="#//Rule/overridden"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="transformation" eType="#//Transformation" - transient="true" resolveProxies="false" eOpposite="#//Transformation/rule"/> <eStructuralFeatures xsi:type="ecore:EReference" name="overridden" ordered="false" - upperBound="-1" eType="#//Rule" eOpposite="#//Rule/overrides"> + eType="#//Rule" eOpposite="#//Rule/overrides"> <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName"> <details key="body" value="overriden"/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="overrides" upperBound="-1" + eType="#//Rule" eOpposite="#//Rule/overridden"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="transformation" eType="#//Transformation" + transient="true" resolveProxies="false" eOpposite="#//Transformation/rule"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Transformation" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Class"> <eOperations name="getFunction" lowerBound="1" eType="#//Function"> diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbaseUtil.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbaseUtil.java index 1eeb4f8d1..362a7c10d 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbaseUtil.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbaseUtil.java @@ -74,8 +74,8 @@ public class QVTbaseUtil extends PivotUtil return ClassUtil.nullFree(asTransformation.getModelParameter()); } - public static @NonNull List<@NonNull Rule> getOverriddenList(@NonNull Rule asRule) { - return ClassUtil.nullFree(asRule.getOverridden()); + public static @NonNull List<@NonNull Rule> getOverridesList(@NonNull Rule asRule) { + return ClassUtil.nullFree(asRule.getOverrides()); } public static @NonNull List<@NonNull Predicate> getPredicatesList(@NonNull Pattern asPattern) { diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcorePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcorePackage.java index f1458b07a..b5ba82ac5 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcorePackage.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcorePackage.java @@ -1591,31 +1591,31 @@ public interface QVTcorePackage extends EPackage { int MAPPING__IS_ABSTRACT = QVTbasePackage.RULE__IS_ABSTRACT; /** - * The feature id for the '<em><b>Overrides</b></em>' reference. + * The feature id for the '<em><b>Overridden</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING__OVERRIDES = QVTbasePackage.RULE__OVERRIDES; + int MAPPING__OVERRIDDEN = QVTbasePackage.RULE__OVERRIDDEN; /** - * The feature id for the '<em><b>Transformation</b></em>' container reference. + * The feature id for the '<em><b>Overrides</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING__TRANSFORMATION = QVTbasePackage.RULE__TRANSFORMATION; + int MAPPING__OVERRIDES = QVTbasePackage.RULE__OVERRIDES; /** - * The feature id for the '<em><b>Overridden</b></em>' reference list. + * The feature id for the '<em><b>Transformation</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING__OVERRIDDEN = QVTbasePackage.RULE__OVERRIDDEN; + int MAPPING__TRANSFORMATION = QVTbasePackage.RULE__TRANSFORMATION; /** * The feature id for the '<em><b>Guard Pattern</b></em>' containment reference. @@ -1717,22 +1717,13 @@ public interface QVTcorePackage extends EPackage { int MAPPING___VALIDATE_NO_OVERRIDES_CYCLE__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_NO_OVERRIDES_CYCLE__DIAGNOSTICCHAIN_MAP; /** - * The operation id for the '<em>Validate Overrides Rule Is Extended Rule</em>' operation. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MAPPING___VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE__DIAGNOSTICCHAIN_MAP; - - /** - * The operation id for the '<em>Validate Overrides Rule Overrides All Domains</em>' operation. + * The operation id for the '<em>Validate Overriding Rule Overrides All Domains</em>' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING___VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP; + int MAPPING___VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP; /** * The operation id for the '<em>Validate Domains Are Core Domains</em>' operation. diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/QVTcoreValidator.java b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/QVTcoreValidator.java index 37565fcc0..e5ebf7260 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/QVTcoreValidator.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/QVTcoreValidator.java @@ -461,8 +461,7 @@ public class QVTcoreValidator extends EObjectValidator { if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(mapping, diagnostics, context); if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateDomainNameIsUnique(mapping, diagnostics, context); if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateNoOverridesCycle(mapping, diagnostics, context); - if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateOverridesRuleIsExtendedRule(mapping, diagnostics, context); - if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateOverridesRuleOverridesAllDomains(mapping, diagnostics, context); + if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateOverridingRuleOverridesAllDomains(mapping, diagnostics, context); if (result || diagnostics != null) result &= validateMapping_validateDomainsAreCoreDomains(mapping, diagnostics, context); if (result || diagnostics != null) result &= validateMapping_validateNestedNameIsNull(mapping, diagnostics, context); if (result || diagnostics != null) result &= validateMapping_validateRootNameIsNotNull(mapping, diagnostics, context); diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/src/org/eclipse/qvtd/pivot/qvtcore/utilities/QVTcorePrettyPrintVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtcore/src/org/eclipse/qvtd/pivot/qvtcore/utilities/QVTcorePrettyPrintVisitor.java index 57c232e18..d89182b1e 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtcore/src/org/eclipse/qvtd/pivot/qvtcore/utilities/QVTcorePrettyPrintVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/src/org/eclipse/qvtd/pivot/qvtcore/utilities/QVTcorePrettyPrintVisitor.java @@ -17,6 +17,7 @@ import org.eclipse.ocl.pivot.Variable; import org.eclipse.ocl.pivot.internal.prettyprint.PrettyPrinter; import org.eclipse.qvtd.pivot.qvtbase.Domain; import org.eclipse.qvtd.pivot.qvtbase.Predicate; +import org.eclipse.qvtd.pivot.qvtbase.Rule; import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbasePrettyPrintVisitor; import org.eclipse.qvtd.pivot.qvtcore.Area; import org.eclipse.qvtd.pivot.qvtcore.Assignment; @@ -137,6 +138,23 @@ public class QVTcorePrettyPrintVisitor extends QVTbasePrettyPrintVisitor impleme context.appendName(pMapping); context.append(" in "); context.appendName(pMapping.getTransformation()); + List<Mapping> asRefines = pMapping.getSpecification(); + if (asRefines.size() > 0) { + context.append(" refines "); + boolean isFirst = true; + for (Mapping asRefine : asRefines) { + if (!isFirst) { + context.append(","); + } + context.appendName(asRefine); + isFirst = false; + } + } + Rule asOverridden = pMapping.getOverridden(); + if (asOverridden != null) { + context.append(" overrides "); + context.appendName(asOverridden); + } context.append(" {"); context.push("", ""); for (Domain pDomain : pMapping.getDomain()) { diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java index 12e75e1dc..b6e5e9180 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java @@ -3407,31 +3407,31 @@ public interface QVTimperativePackage extends EPackage { int MAPPING__IS_ABSTRACT = QVTbasePackage.RULE__IS_ABSTRACT; /** - * The feature id for the '<em><b>Overrides</b></em>' reference. + * The feature id for the '<em><b>Overridden</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING__OVERRIDES = QVTbasePackage.RULE__OVERRIDES; + int MAPPING__OVERRIDDEN = QVTbasePackage.RULE__OVERRIDDEN; /** - * The feature id for the '<em><b>Transformation</b></em>' container reference. + * The feature id for the '<em><b>Overrides</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING__TRANSFORMATION = QVTbasePackage.RULE__TRANSFORMATION; + int MAPPING__OVERRIDES = QVTbasePackage.RULE__OVERRIDES; /** - * The feature id for the '<em><b>Overridden</b></em>' reference list. + * The feature id for the '<em><b>Transformation</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING__OVERRIDDEN = QVTbasePackage.RULE__OVERRIDDEN; + int MAPPING__TRANSFORMATION = QVTbasePackage.RULE__TRANSFORMATION; /** * The feature id for the '<em><b>Is Strict</b></em>' attribute. @@ -3506,22 +3506,13 @@ public interface QVTimperativePackage extends EPackage { int MAPPING___VALIDATE_NO_OVERRIDES_CYCLE__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_NO_OVERRIDES_CYCLE__DIAGNOSTICCHAIN_MAP; /** - * The operation id for the '<em>Validate Overrides Rule Is Extended Rule</em>' operation. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MAPPING___VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE__DIAGNOSTICCHAIN_MAP; - - /** - * The operation id for the '<em>Validate Overrides Rule Overrides All Domains</em>' operation. + * The operation id for the '<em>Validate Overriding Rule Overrides All Domains</em>' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING___VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP; + int MAPPING___VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP; /** * The operation id for the '<em>Validate Name Is Not Null</em>' operation. diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeValidator.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeValidator.java index 1aea99959..28635a108 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeValidator.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeValidator.java @@ -767,8 +767,7 @@ public class QVTimperativeValidator extends EObjectValidator { if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(mapping, diagnostics, context); if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateDomainNameIsUnique(mapping, diagnostics, context); if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateNoOverridesCycle(mapping, diagnostics, context); - if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateOverridesRuleIsExtendedRule(mapping, diagnostics, context); - if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateOverridesRuleOverridesAllDomains(mapping, diagnostics, context); + if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateOverridingRuleOverridesAllDomains(mapping, diagnostics, context); if (result || diagnostics != null) result &= validateMapping_validateNameIsNotNull(mapping, diagnostics, context); if (result || diagnostics != null) result &= validateMapping_validateMappingParameterNamesAreUnique(mapping, diagnostics, context); if (result || diagnostics != null) result &= validateMapping_validateLocalVariableNamesAreUnique(mapping, diagnostics, context); diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationPackage.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationPackage.java index 3a3bda018..45f06f027 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationPackage.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationPackage.java @@ -448,31 +448,31 @@ public interface QVTrelationPackage extends EPackage { int RELATION__IS_ABSTRACT = QVTbasePackage.RULE__IS_ABSTRACT; /** - * The feature id for the '<em><b>Overrides</b></em>' reference. + * The feature id for the '<em><b>Overridden</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATION__OVERRIDES = QVTbasePackage.RULE__OVERRIDES; + int RELATION__OVERRIDDEN = QVTbasePackage.RULE__OVERRIDDEN; /** - * The feature id for the '<em><b>Transformation</b></em>' container reference. + * The feature id for the '<em><b>Overrides</b></em>' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATION__TRANSFORMATION = QVTbasePackage.RULE__TRANSFORMATION; + int RELATION__OVERRIDES = QVTbasePackage.RULE__OVERRIDES; /** - * The feature id for the '<em><b>Overridden</b></em>' reference list. + * The feature id for the '<em><b>Transformation</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATION__OVERRIDDEN = QVTbasePackage.RULE__OVERRIDDEN; + int RELATION__TRANSFORMATION = QVTbasePackage.RULE__TRANSFORMATION; /** * The feature id for the '<em><b>Is Top Level</b></em>' attribute. @@ -565,22 +565,13 @@ public interface QVTrelationPackage extends EPackage { int RELATION___VALIDATE_NO_OVERRIDES_CYCLE__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_NO_OVERRIDES_CYCLE__DIAGNOSTICCHAIN_MAP; /** - * The operation id for the '<em>Validate Overrides Rule Is Extended Rule</em>' operation. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int RELATION___VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_OVERRIDES_RULE_IS_EXTENDED_RULE__DIAGNOSTICCHAIN_MAP; - - /** - * The operation id for the '<em>Validate Overrides Rule Overrides All Domains</em>' operation. + * The operation id for the '<em>Validate Overriding Rule Overrides All Domains</em>' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATION___VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_OVERRIDES_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP; + int RELATION___VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP = QVTbasePackage.RULE___VALIDATE_OVERRIDING_RULE_OVERRIDES_ALL_DOMAINS__DIAGNOSTICCHAIN_MAP; /** * The operation id for the '<em>Validate Domains Are Relation Domains</em>' operation. diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationValidator.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationValidator.java index dd5258139..f26dbddfc 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationValidator.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationValidator.java @@ -389,8 +389,7 @@ public class QVTrelationValidator extends EObjectValidator { if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(relation, diagnostics, context); if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateDomainNameIsUnique(relation, diagnostics, context); if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateNoOverridesCycle(relation, diagnostics, context); - if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateOverridesRuleIsExtendedRule(relation, diagnostics, context); - if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateOverridesRuleOverridesAllDomains(relation, diagnostics, context); + if (result || diagnostics != null) result &= qvTbaseValidator.validateRule_validateOverridingRuleOverridesAllDomains(relation, diagnostics, context); if (result || diagnostics != null) result &= validateRelation_validateDomainsAreRelationDomains(relation, diagnostics, context); if (result || diagnostics != null) result &= validateRelation_validateTransformationIsRelationalTransformation(relation, diagnostics, context); return result; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbase.xtextbin b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbase.xtextbin Binary files differindex 5e8114bc6..fc5563f57 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbase.xtextbin +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbase.xtextbin diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/serializer/AbstractQVTbaseSyntacticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/serializer/AbstractQVTbaseSyntacticSequencer.java index fe9da3d6a..a2c00622e 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/serializer/AbstractQVTbaseSyntacticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/serializer/AbstractQVTbaseSyntacticSequencer.java @@ -630,7 +630,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * (';' ('initial' UnrestrictedName? ':' ';')* 'derivation' UnrestrictedName? ':')* * ownedDefaultExpressions+=SpecificationCS * ) - * qualifiers+='!derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!derived' (ambiguity) qualifiers+='!derived' * qualifiers+='!derived' (ambiguity) qualifiers+='!id' @@ -648,7 +647,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!derived' (ambiguity) qualifiers+='unique' * qualifiers+='!derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='!derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='!id' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!id' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!id' (ambiguity) qualifiers+='!derived' * qualifiers+='!id' (ambiguity) qualifiers+='!id' @@ -666,7 +664,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!id' (ambiguity) qualifiers+='unique' * qualifiers+='!id' (ambiguity) qualifiers+='unsettable' * qualifiers+='!id' (ambiguity) qualifiers+='volatile' - * qualifiers+='!ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!ordered' (ambiguity) qualifiers+='!derived' * qualifiers+='!ordered' (ambiguity) qualifiers+='!id' @@ -684,7 +681,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!ordered' (ambiguity) qualifiers+='unique' * qualifiers+='!ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='!ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='!readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!readonly' (ambiguity) qualifiers+='!derived' * qualifiers+='!readonly' (ambiguity) qualifiers+='!id' @@ -702,7 +698,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!readonly' (ambiguity) qualifiers+='unique' * qualifiers+='!readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='!readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='!transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!transient' (ambiguity) qualifiers+='!derived' * qualifiers+='!transient' (ambiguity) qualifiers+='!id' @@ -720,7 +715,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!transient' (ambiguity) qualifiers+='unique' * qualifiers+='!transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='!transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unique' (ambiguity) qualifiers+='!derived' * qualifiers+='!unique' (ambiguity) qualifiers+='!id' @@ -738,7 +732,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!unique' (ambiguity) qualifiers+='unique' * qualifiers+='!unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unsettable' (ambiguity) qualifiers+='!derived' * qualifiers+='!unsettable' (ambiguity) qualifiers+='!id' @@ -756,7 +749,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='!unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='!volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!volatile' (ambiguity) qualifiers+='!derived' * qualifiers+='!volatile' (ambiguity) qualifiers+='!id' @@ -774,7 +766,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!volatile' (ambiguity) qualifiers+='unique' * qualifiers+='!volatile' (ambiguity) qualifiers+='unsettable' * qualifiers+='!volatile' (ambiguity) qualifiers+='volatile' - * qualifiers+='derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='derived' (ambiguity) qualifiers+='!derived' * qualifiers+='derived' (ambiguity) qualifiers+='!id' @@ -792,7 +783,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='derived' (ambiguity) qualifiers+='unique' * qualifiers+='derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='id' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='id' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='id' (ambiguity) qualifiers+='!derived' * qualifiers+='id' (ambiguity) qualifiers+='!id' @@ -810,7 +800,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='id' (ambiguity) qualifiers+='unique' * qualifiers+='id' (ambiguity) qualifiers+='unsettable' * qualifiers+='id' (ambiguity) qualifiers+='volatile' - * qualifiers+='ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='ordered' (ambiguity) qualifiers+='!derived' * qualifiers+='ordered' (ambiguity) qualifiers+='!id' @@ -828,7 +817,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='ordered' (ambiguity) qualifiers+='unique' * qualifiers+='ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='readonly' (ambiguity) qualifiers+='!derived' * qualifiers+='readonly' (ambiguity) qualifiers+='!id' @@ -846,7 +834,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='readonly' (ambiguity) qualifiers+='unique' * qualifiers+='readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='transient' (ambiguity) qualifiers+='!derived' * qualifiers+='transient' (ambiguity) qualifiers+='!id' @@ -864,7 +851,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='transient' (ambiguity) qualifiers+='unique' * qualifiers+='transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unique' (ambiguity) qualifiers+='!derived' * qualifiers+='unique' (ambiguity) qualifiers+='!id' @@ -882,7 +868,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='unique' (ambiguity) qualifiers+='unique' * qualifiers+='unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unsettable' (ambiguity) qualifiers+='!derived' * qualifiers+='unsettable' (ambiguity) qualifiers+='!id' @@ -900,7 +885,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='volatile' (ambiguity) qualifiers+='!derived' * qualifiers+='volatile' (ambiguity) qualifiers+='!id' @@ -1656,11 +1640,8 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * * This ambiguous syntax occurs at: * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (';' | ('{' '}')) (rule end) - * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (('{' '}') | ';') (rule end) * name=UnrestrictedName (ambiguity) (';' | ('{' '}')) (rule end) - * name=UnrestrictedName (ambiguity) (('{' '}') | ';') (rule end) * ownedSignature=TemplateSignatureCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSignature=TemplateSignatureCS (ambiguity) (('{' '}') | ';') (rule end) */ protected void emit_DataTypeCS___LeftCurlyBracketKeyword_5_0_SerializableKeyword_5_1_1_q_RightCurlyBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) { acceptNodes(transition, nodes); @@ -1687,13 +1668,10 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * This ambiguous syntax occurs at: * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) '{' ownedLiterals+=EnumerationLiteralCS * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (';' | ('{' '}')) (rule end) - * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (('{' '}') | ';') (rule end) * name=UnrestrictedName (ambiguity) '{' ownedLiterals+=EnumerationLiteralCS * name=UnrestrictedName (ambiguity) (';' | ('{' '}')) (rule end) - * name=UnrestrictedName (ambiguity) (('{' '}') | ';') (rule end) * ownedSignature=TemplateSignatureCS (ambiguity) '{' ownedLiterals+=EnumerationLiteralCS * ownedSignature=TemplateSignatureCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSignature=TemplateSignatureCS (ambiguity) (('{' '}') | ';') (rule end) */ protected void emit_EnumerationCS___LeftCurlyBracketKeyword_4_0_SerializableKeyword_4_1_1_q_RightCurlyBracketKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) { acceptNodes(transition, nodes); @@ -2350,7 +2328,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * (';' ('initial' UnrestrictedName? ':' ';')* 'derivation' UnrestrictedName? ':')* * ownedDefaultExpressions+=SpecificationCS * ) - * qualifiers+='!composes' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!composes' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!composes' (ambiguity) qualifiers+='!composes' * qualifiers+='!composes' (ambiguity) qualifiers+='!derived' @@ -2370,7 +2347,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!composes' (ambiguity) qualifiers+='unique' * qualifiers+='!composes' (ambiguity) qualifiers+='unsettable' * qualifiers+='!composes' (ambiguity) qualifiers+='volatile' - * qualifiers+='!derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!derived' (ambiguity) qualifiers+='!composes' * qualifiers+='!derived' (ambiguity) qualifiers+='!derived' @@ -2390,7 +2366,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!derived' (ambiguity) qualifiers+='unique' * qualifiers+='!derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='!derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='!ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!ordered' (ambiguity) qualifiers+='!composes' * qualifiers+='!ordered' (ambiguity) qualifiers+='!derived' @@ -2410,7 +2385,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!ordered' (ambiguity) qualifiers+='unique' * qualifiers+='!ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='!ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='!readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!readonly' (ambiguity) qualifiers+='!composes' * qualifiers+='!readonly' (ambiguity) qualifiers+='!derived' @@ -2430,7 +2404,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!readonly' (ambiguity) qualifiers+='unique' * qualifiers+='!readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='!readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='!resolve' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!resolve' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!resolve' (ambiguity) qualifiers+='!composes' * qualifiers+='!resolve' (ambiguity) qualifiers+='!derived' @@ -2450,7 +2423,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!resolve' (ambiguity) qualifiers+='unique' * qualifiers+='!resolve' (ambiguity) qualifiers+='unsettable' * qualifiers+='!resolve' (ambiguity) qualifiers+='volatile' - * qualifiers+='!transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!transient' (ambiguity) qualifiers+='!composes' * qualifiers+='!transient' (ambiguity) qualifiers+='!derived' @@ -2470,7 +2442,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!transient' (ambiguity) qualifiers+='unique' * qualifiers+='!transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='!transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unique' (ambiguity) qualifiers+='!composes' * qualifiers+='!unique' (ambiguity) qualifiers+='!derived' @@ -2490,7 +2461,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!unique' (ambiguity) qualifiers+='unique' * qualifiers+='!unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unsettable' (ambiguity) qualifiers+='!composes' * qualifiers+='!unsettable' (ambiguity) qualifiers+='!derived' @@ -2510,7 +2480,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='!unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='!volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!volatile' (ambiguity) qualifiers+='!composes' * qualifiers+='!volatile' (ambiguity) qualifiers+='!derived' @@ -2530,7 +2499,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='!volatile' (ambiguity) qualifiers+='unique' * qualifiers+='!volatile' (ambiguity) qualifiers+='unsettable' * qualifiers+='!volatile' (ambiguity) qualifiers+='volatile' - * qualifiers+='composes' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='composes' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='composes' (ambiguity) qualifiers+='!composes' * qualifiers+='composes' (ambiguity) qualifiers+='!derived' @@ -2550,7 +2518,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='composes' (ambiguity) qualifiers+='unique' * qualifiers+='composes' (ambiguity) qualifiers+='unsettable' * qualifiers+='composes' (ambiguity) qualifiers+='volatile' - * qualifiers+='derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='derived' (ambiguity) qualifiers+='!composes' * qualifiers+='derived' (ambiguity) qualifiers+='!derived' @@ -2570,7 +2537,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='derived' (ambiguity) qualifiers+='unique' * qualifiers+='derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='ordered' (ambiguity) qualifiers+='!composes' * qualifiers+='ordered' (ambiguity) qualifiers+='!derived' @@ -2590,7 +2556,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='ordered' (ambiguity) qualifiers+='unique' * qualifiers+='ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='readonly' (ambiguity) qualifiers+='!composes' * qualifiers+='readonly' (ambiguity) qualifiers+='!derived' @@ -2610,7 +2575,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='readonly' (ambiguity) qualifiers+='unique' * qualifiers+='readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='resolve' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='resolve' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='resolve' (ambiguity) qualifiers+='!composes' * qualifiers+='resolve' (ambiguity) qualifiers+='!derived' @@ -2630,7 +2594,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='resolve' (ambiguity) qualifiers+='unique' * qualifiers+='resolve' (ambiguity) qualifiers+='unsettable' * qualifiers+='resolve' (ambiguity) qualifiers+='volatile' - * qualifiers+='transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='transient' (ambiguity) qualifiers+='!composes' * qualifiers+='transient' (ambiguity) qualifiers+='!derived' @@ -2650,7 +2613,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='transient' (ambiguity) qualifiers+='unique' * qualifiers+='transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unique' (ambiguity) qualifiers+='!composes' * qualifiers+='unique' (ambiguity) qualifiers+='!derived' @@ -2670,7 +2632,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='unique' (ambiguity) qualifiers+='unique' * qualifiers+='unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unsettable' (ambiguity) qualifiers+='!composes' * qualifiers+='unsettable' (ambiguity) qualifiers+='!derived' @@ -2690,7 +2651,6 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * qualifiers+='unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='volatile' (ambiguity) qualifiers+='!composes' * qualifiers+='volatile' (ambiguity) qualifiers+='!derived' @@ -3534,19 +3494,15 @@ public abstract class AbstractQVTbaseSyntacticSequencer extends AbstractSyntacti * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) '{' ownedOperations+=OperationCS * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) '{' ownedProperties+=StructuralFeatureCS * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (';' | ('{' '}')) (rule end) - * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (('{' '}') | ';') (rule end) * name=UnrestrictedName (ambiguity) '{' ownedOperations+=OperationCS * name=UnrestrictedName (ambiguity) '{' ownedProperties+=StructuralFeatureCS * name=UnrestrictedName (ambiguity) (';' | ('{' '}')) (rule end) - * name=UnrestrictedName (ambiguity) (('{' '}') | ';') (rule end) * ownedSignature=TemplateSignatureCS (ambiguity) '{' ownedOperations+=OperationCS * ownedSignature=TemplateSignatureCS (ambiguity) '{' ownedProperties+=StructuralFeatureCS * ownedSignature=TemplateSignatureCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSignature=TemplateSignatureCS (ambiguity) (('{' '}') | ';') (rule end) * ownedSuperTypes+=TypedRefCS (ambiguity) '{' ownedOperations+=OperationCS * ownedSuperTypes+=TypedRefCS (ambiguity) '{' ownedProperties+=StructuralFeatureCS * ownedSuperTypes+=TypedRefCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSuperTypes+=TypedRefCS (ambiguity) (('{' '}') | ';') (rule end) */ protected void emit_StructuredClassCS___LeftCurlyBracketKeyword_6_0_RightCurlyBracketKeyword_6_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) { acceptNodes(transition, nodes); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/services/QVTbaseGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/services/QVTbaseGrammarAccess.java index f70331143..d092a3e1e 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/services/QVTbaseGrammarAccess.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/services/QVTbaseGrammarAccess.java @@ -118,7 +118,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // qualifiers+='!transient' | qualifiers+='unique' | qualifiers+='!unique' | qualifiers+='unsettable' | // qualifiers+='!unsettable' | qualifiers+='volatile' | qualifiers+='!volatile') ','?)+ '}')? ('{' ('initial' // UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' UnrestrictedName? ':' - // ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';') + // ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';'); @Override public ParserRule getRule() { return rule; } //(qualifiers+='static' qualifiers+='definition'? | qualifiers+='definition' qualifiers+='static'?)? 'attribute' @@ -212,10 +212,10 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //qualifiers+='!unsettable' | qualifiers+='volatile' | qualifiers+='!volatile') ','?)+ public Group getGroup_5_1() { return cGroup_5_1; } - //(qualifiers+='derived' | qualifiers+='!derived' | qualifiers+='id' | qualifiers+='!id' | qualifiers+='ordered' | + //qualifiers+='derived' | qualifiers+='!derived' | qualifiers+='id' | qualifiers+='!id' | qualifiers+='ordered' | //qualifiers+='!ordered' | qualifiers+='readonly' | qualifiers+='!readonly' | qualifiers+='transient' | //qualifiers+='!transient' | qualifiers+='unique' | qualifiers+='!unique' | qualifiers+='unsettable' | - //qualifiers+='!unsettable' | qualifiers+='volatile' | qualifiers+='!volatile') + //qualifiers+='!unsettable' | qualifiers+='volatile' | qualifiers+='!volatile' public Alternatives getAlternatives_5_1_0() { return cAlternatives_5_1_0; } //qualifiers+='derived' @@ -320,8 +320,8 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //'}' public Keyword getRightCurlyBracketKeyword_5_2() { return cRightCurlyBracketKeyword_5_2; } - //('{' ('initial' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' UnrestrictedName? ':' - //ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';') + //'{' ('initial' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' UnrestrictedName? ':' + //ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';' public Alternatives getAlternatives_6() { return cAlternatives_6; } //'{' ('initial' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' UnrestrictedName? ':' @@ -335,8 +335,8 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //ownedDefaultExpressions+=SpecificationCS? ';')* public Alternatives getAlternatives_6_0_1() { return cAlternatives_6_0_1; } - /// *ownedAnnotations+=AnnotationElementCS - // |* / 'initial' UnrestrictedName? ':' + ///*ownedAnnotations+=AnnotationElementCS + // |*/ 'initial' UnrestrictedName? ':' //ownedDefaultExpressions+=SpecificationCS? ';' public Group getGroup_6_0_1_0() { return cGroup_6_0_1_0; } @@ -394,7 +394,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cEnumerationCSParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); //ClassCS base::ClassCS: - // StructuredClassCS | DataTypeCS | EnumerationCS + // StructuredClassCS | DataTypeCS | EnumerationCS; @Override public ParserRule getRule() { return rule; } //StructuredClassCS | DataTypeCS | EnumerationCS @@ -440,14 +440,14 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //DataTypeCS base::DataTypeCS: // isPrimitive?='primitive'? 'datatype' name=UnrestrictedName ownedSignature=TemplateSignatureCS? (':' // instanceClassName=SINGLE_QUOTED_STRING)? ('{' (isSerializable?='serializable' | '!serializable')? '}')? ('{' - // / *(ownedAnnotations+=AnnotationElementCS - // | ownedConstraints+=InvariantConstraintCS)* * / '}' | ';') + // /*(ownedAnnotations+=AnnotationElementCS + // | ownedConstraints+=InvariantConstraintCS)* */ '}' | ';'); @Override public ParserRule getRule() { return rule; } //isPrimitive?='primitive'? 'datatype' name=UnrestrictedName ownedSignature=TemplateSignatureCS? (':' //instanceClassName=SINGLE_QUOTED_STRING)? ('{' (isSerializable?='serializable' | '!serializable')? '}')? ('{' - /// *(ownedAnnotations+=AnnotationElementCS - // | ownedConstraints+=InvariantConstraintCS)* * / '}' | ';') + ///*(ownedAnnotations+=AnnotationElementCS + // | ownedConstraints+=InvariantConstraintCS)* */ '}' | ';') public Group getGroup() { return cGroup; } //isPrimitive?='primitive'? @@ -504,19 +504,19 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //'}' public Keyword getRightCurlyBracketKeyword_5_2() { return cRightCurlyBracketKeyword_5_2; } - //('{' / *(ownedAnnotations+=AnnotationElementCS - // | ownedConstraints+=InvariantConstraintCS)* * / '}' | ';') + //'{' /*(ownedAnnotations+=AnnotationElementCS + // | ownedConstraints+=InvariantConstraintCS)* */ '}' | ';' public Alternatives getAlternatives_6() { return cAlternatives_6; } - //'{' / *(ownedAnnotations+=AnnotationElementCS - // | ownedConstraints+=InvariantConstraintCS)* * / '}' + //'{' /*(ownedAnnotations+=AnnotationElementCS + // | ownedConstraints+=InvariantConstraintCS)* */ '}' public Group getGroup_6_0() { return cGroup_6_0; } //'{' public Keyword getLeftCurlyBracketKeyword_6_0_0() { return cLeftCurlyBracketKeyword_6_0_0; } - /// *(ownedAnnotations+=AnnotationElementCS - // | ownedConstraints+=InvariantConstraintCS)* * / '}' + ///*(ownedAnnotations+=AnnotationElementCS + // | ownedConstraints+=InvariantConstraintCS)* */ '}' public Keyword getRightCurlyBracketKeyword_6_0_1() { return cRightCurlyBracketKeyword_6_0_1; } //';' @@ -553,12 +553,12 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //EnumerationCS base::EnumerationCS: // 'enum' name=UnrestrictedName ownedSignature=TemplateSignatureCS? (':' instanceClassName=SINGLE_QUOTED_STRING)? ('{' // (isSerializable?='serializable' | '!serializable')? '}')? ('{' ownedLiterals+=EnumerationLiteralCS - // / *| ownedConstraints+=InvariantConstraintCS* / * '}' | ';') + // /*| ownedConstraints+=InvariantConstraintCS*/* '}' | ';'); @Override public ParserRule getRule() { return rule; } //'enum' name=UnrestrictedName ownedSignature=TemplateSignatureCS? (':' instanceClassName=SINGLE_QUOTED_STRING)? ('{' //(isSerializable?='serializable' | '!serializable')? '}')? ('{' ownedLiterals+=EnumerationLiteralCS - /// *| ownedConstraints+=InvariantConstraintCS* / * '}' | ';') + ///*| ownedConstraints+=InvariantConstraintCS*/* '}' | ';') public Group getGroup() { return cGroup; } //'enum' @@ -609,16 +609,16 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //'}' public Keyword getRightCurlyBracketKeyword_4_2() { return cRightCurlyBracketKeyword_4_2; } - //('{' ownedLiterals+=EnumerationLiteralCS / *| ownedConstraints+=InvariantConstraintCS* / * '}' | ';') + //'{' ownedLiterals+=EnumerationLiteralCS /*| ownedConstraints+=InvariantConstraintCS*/* '}' | ';' public Alternatives getAlternatives_5() { return cAlternatives_5; } - //'{' ownedLiterals+=EnumerationLiteralCS / *| ownedConstraints+=InvariantConstraintCS* / * '}' + //'{' ownedLiterals+=EnumerationLiteralCS /*| ownedConstraints+=InvariantConstraintCS*/* '}' public Group getGroup_5_0() { return cGroup_5_0; } //'{' public Keyword getLeftCurlyBracketKeyword_5_0_0() { return cLeftCurlyBracketKeyword_5_0_0; } - //ownedLiterals+=EnumerationLiteralCS / *| ownedConstraints+=InvariantConstraintCS* / * + //ownedLiterals+=EnumerationLiteralCS /*| ownedConstraints+=InvariantConstraintCS*/* public Assignment getOwnedLiteralsAssignment_5_0_1() { return cOwnedLiteralsAssignment_5_0_1; } //EnumerationLiteralCS @@ -653,14 +653,14 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //EnumerationLiteralCS base::EnumerationLiteralCS: // ('literal' name=UnrestrictedName | name=EnumerationLiteralName) ('=' value=SIGNED)? ('{' - // / *ownedAnnotations+=AnnotationElementCS* * / '}' | ';') + // /*ownedAnnotations+=AnnotationElementCS* */ '}' | ';'); @Override public ParserRule getRule() { return rule; } //('literal' name=UnrestrictedName | name=EnumerationLiteralName) ('=' value=SIGNED)? ('{' - /// *ownedAnnotations+=AnnotationElementCS* * / '}' | ';') + ///*ownedAnnotations+=AnnotationElementCS* */ '}' | ';') public Group getGroup() { return cGroup; } - //('literal' name=UnrestrictedName | name=EnumerationLiteralName) + //'literal' name=UnrestrictedName | name=EnumerationLiteralName public Alternatives getAlternatives_0() { return cAlternatives_0; } //'literal' name=UnrestrictedName @@ -693,16 +693,16 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //SIGNED public RuleCall getValueSIGNEDParserRuleCall_1_1_0() { return cValueSIGNEDParserRuleCall_1_1_0; } - //('{' / *ownedAnnotations+=AnnotationElementCS* * / '}' | ';') + //'{' /*ownedAnnotations+=AnnotationElementCS* */ '}' | ';' public Alternatives getAlternatives_2() { return cAlternatives_2; } - //'{' / *ownedAnnotations+=AnnotationElementCS* * / '}' + //'{' /*ownedAnnotations+=AnnotationElementCS* */ '}' public Group getGroup_2_0() { return cGroup_2_0; } //'{' public Keyword getLeftCurlyBracketKeyword_2_0_0() { return cLeftCurlyBracketKeyword_2_0_0; } - /// *ownedAnnotations+=AnnotationElementCS* * / '}' + ///*ownedAnnotations+=AnnotationElementCS* */ '}' public Keyword getRightCurlyBracketKeyword_2_0_1() { return cRightCurlyBracketKeyword_2_0_1; } //';' @@ -786,7 +786,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // ownedParameters+=ParameterCS)*)? ')' (':' ownedType=TypedMultiplicityRefCS)? ('throws' ownedExceptions+=TypedRefCS // (',' ownedExceptions+=TypedRefCS)*)? ('{' ((qualifiers+='derived' | qualifiers+='!derived' | qualifiers+='ordered' | // qualifiers+='!ordered' | qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' ('body' UnrestrictedName? - // ':' ownedBodyExpressions+=SpecificationCS? ';')* '}' | ';') + // ':' ownedBodyExpressions+=SpecificationCS? ';')* '}' | ';'); @Override public ParserRule getRule() { return rule; } //(qualifiers+='static' qualifiers+='definition'? | qualifiers+='definition' qualifiers+='static'?)? 'operation' @@ -919,8 +919,8 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //| qualifiers+='!unique') ','?)+ public Group getGroup_9_1() { return cGroup_9_1; } - //(qualifiers+='derived' | qualifiers+='!derived' | qualifiers+='ordered' | qualifiers+='!ordered' | qualifiers+='unique' - //| qualifiers+='!unique') + //qualifiers+='derived' | qualifiers+='!derived' | qualifiers+='ordered' | qualifiers+='!ordered' | qualifiers+='unique' | + //qualifiers+='!unique' public Alternatives getAlternatives_9_1_0() { return cAlternatives_9_1_0; } //qualifiers+='derived' @@ -965,7 +965,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //'}' public Keyword getRightCurlyBracketKeyword_9_2() { return cRightCurlyBracketKeyword_9_2; } - //('{' ('body' UnrestrictedName? ':' ownedBodyExpressions+=SpecificationCS? ';')* '}' | ';') + //'{' ('body' UnrestrictedName? ':' ownedBodyExpressions+=SpecificationCS? ';')* '}' | ';' public Alternatives getAlternatives_10() { return cAlternatives_10; } //'{' ('body' UnrestrictedName? ':' ownedBodyExpressions+=SpecificationCS? ';')* '}' @@ -1031,11 +1031,11 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //ParameterCS base::ParameterCS: // name=UnrestrictedName (':' ownedType=TypedMultiplicityRefCS)? ('{' ((qualifiers+='ordered' | qualifiers+='!ordered' | - // qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' / *ownedAnnotations+=AnnotationElementCS* * / '}')? + // qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' /*ownedAnnotations+=AnnotationElementCS* */ '}')?; @Override public ParserRule getRule() { return rule; } //name=UnrestrictedName (':' ownedType=TypedMultiplicityRefCS)? ('{' ((qualifiers+='ordered' | qualifiers+='!ordered' | - //qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' / *ownedAnnotations+=AnnotationElementCS* * / '}')? + //qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' /*ownedAnnotations+=AnnotationElementCS* */ '}')? public Group getGroup() { return cGroup; } //name=UnrestrictedName @@ -1065,7 +1065,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //((qualifiers+='ordered' | qualifiers+='!ordered' | qualifiers+='unique' | qualifiers+='!unique') ','?)+ public Group getGroup_2_1() { return cGroup_2_1; } - //(qualifiers+='ordered' | qualifiers+='!ordered' | qualifiers+='unique' | qualifiers+='!unique') + //qualifiers+='ordered' | qualifiers+='!ordered' | qualifiers+='unique' | qualifiers+='!unique' public Alternatives getAlternatives_2_1_0() { return cAlternatives_2_1_0; } //qualifiers+='ordered' @@ -1098,13 +1098,13 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //'}' public Keyword getRightCurlyBracketKeyword_2_2() { return cRightCurlyBracketKeyword_2_2; } - //('{' / *ownedAnnotations+=AnnotationElementCS* * / '}')? + //('{' /*ownedAnnotations+=AnnotationElementCS* */ '}')? public Group getGroup_3() { return cGroup_3; } //'{' public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; } - /// *ownedAnnotations+=AnnotationElementCS* * / '}' + ///*ownedAnnotations+=AnnotationElementCS* */ '}' public Keyword getRightCurlyBracketKeyword_3_1() { return cRightCurlyBracketKeyword_3_1; } } @@ -1210,7 +1210,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // qualifiers+='!resolve' | qualifiers+='transient' | qualifiers+='!transient' | qualifiers+='unique' | // qualifiers+='!unique' | qualifiers+='unsettable' | qualifiers+='!unsettable' | qualifiers+='volatile' | // qualifiers+='!volatile') ','?)+ '}')? ('{' ('initial' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? - // ';' | 'derivation' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';') + // ';' | 'derivation' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';'); @Override public ParserRule getRule() { return rule; } //(qualifiers+='static' qualifiers+='definition'? | qualifiers+='definition' qualifiers+='static'?)? 'property' @@ -1322,11 +1322,11 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //qualifiers+='volatile' | qualifiers+='!volatile') ','?)+ public Group getGroup_6_1() { return cGroup_6_1; } - //(qualifiers+='composes' | qualifiers+='!composes' | qualifiers+='derived' | qualifiers+='!derived' | + //qualifiers+='composes' | qualifiers+='!composes' | qualifiers+='derived' | qualifiers+='!derived' | //qualifiers+='ordered' | qualifiers+='!ordered' | qualifiers+='readonly' | qualifiers+='!readonly' | //qualifiers+='resolve' | qualifiers+='!resolve' | qualifiers+='transient' | qualifiers+='!transient' | //qualifiers+='unique' | qualifiers+='!unique' | qualifiers+='unsettable' | qualifiers+='!unsettable' | - //qualifiers+='volatile' | qualifiers+='!volatile') + //qualifiers+='volatile' | qualifiers+='!volatile' public Alternatives getAlternatives_6_1_0() { return cAlternatives_6_1_0; } //qualifiers+='composes' @@ -1443,8 +1443,8 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //'}' public Keyword getRightCurlyBracketKeyword_6_2() { return cRightCurlyBracketKeyword_6_2; } - //('{' ('initial' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' UnrestrictedName? ':' - //ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';') + //'{' ('initial' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' UnrestrictedName? ':' + //ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';' public Alternatives getAlternatives_7() { return cAlternatives_7; } //'{' ('initial' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' UnrestrictedName? ':' @@ -1458,9 +1458,9 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //ownedDefaultExpressions+=SpecificationCS? ';')* public Alternatives getAlternatives_7_0_1() { return cAlternatives_7_0_1; } - /// *ownedAnnotations+=AnnotationElementCS + ///*ownedAnnotations+=AnnotationElementCS // | ('key' referredKeys+=[pivot::Property|UnrestrictedName] (',' referredKeys+=[pivot::Property|UnrestrictedName])* ';') - // |* / + // |*/ //'initial' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' public Group getGroup_7_0_1_0() { return cGroup_7_0_1_0; } @@ -1519,7 +1519,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cExprStringUNQUOTED_STRINGTerminalRuleCall_1_0 = (RuleCall)cExprStringAssignment_1.eContents().get(0); //SpecificationCS essentialocl::ExpSpecificationCS: - // ownedExpression=ExpCS | exprString=UNQUOTED_STRING + // ownedExpression=ExpCS | exprString=UNQUOTED_STRING; @Override public ParserRule getRule() { return rule; } //ownedExpression=ExpCS | exprString=UNQUOTED_STRING @@ -1580,13 +1580,13 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // isAbstract?='abstract'? 'class' name=UnrestrictedName ownedSignature=TemplateSignatureCS? ('extends' // ownedSuperTypes+=TypedRefCS (',' ownedSuperTypes+=TypedRefCS)*)? (':' instanceClassName=SINGLE_QUOTED_STRING)? ('{' // isInterface?='interface'? '}')? ('{' (ownedOperations+=OperationCS | ownedProperties+=StructuralFeatureCS - // / *| ownedConstraints+=InvariantConstraintCS* /)* '}' | ';') + // /*| ownedConstraints+=InvariantConstraintCS*/)* '}' | ';'); @Override public ParserRule getRule() { return rule; } //isAbstract?='abstract'? 'class' name=UnrestrictedName ownedSignature=TemplateSignatureCS? ('extends' //ownedSuperTypes+=TypedRefCS (',' ownedSuperTypes+=TypedRefCS)*)? (':' instanceClassName=SINGLE_QUOTED_STRING)? ('{' //isInterface?='interface'? '}')? ('{' (ownedOperations+=OperationCS | ownedProperties+=StructuralFeatureCS - /// *| ownedConstraints+=InvariantConstraintCS* /)* '}' | ';') + ///*| ownedConstraints+=InvariantConstraintCS*/)* '}' | ';') public Group getGroup() { return cGroup; } //isAbstract?='abstract'? @@ -1661,22 +1661,22 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //'}' public Keyword getRightCurlyBracketKeyword_6_2() { return cRightCurlyBracketKeyword_6_2; } - //('{' (ownedOperations+=OperationCS | ownedProperties+=StructuralFeatureCS - /// *| ownedConstraints+=InvariantConstraintCS* /)* '}' | ';') + //'{' (ownedOperations+=OperationCS | ownedProperties+=StructuralFeatureCS /*| ownedConstraints+=InvariantConstraintCS*/)* + //'}' | ';' public Alternatives getAlternatives_7() { return cAlternatives_7; } - //'{' (ownedOperations+=OperationCS | ownedProperties+=StructuralFeatureCS / *| ownedConstraints+=InvariantConstraintCS* /)* + //'{' (ownedOperations+=OperationCS | ownedProperties+=StructuralFeatureCS /*| ownedConstraints+=InvariantConstraintCS*/)* //'}' public Group getGroup_7_0() { return cGroup_7_0; } //'{' public Keyword getLeftCurlyBracketKeyword_7_0_0() { return cLeftCurlyBracketKeyword_7_0_0; } - //(ownedOperations+=OperationCS | ownedProperties+=StructuralFeatureCS / *| ownedConstraints+=InvariantConstraintCS* /)* + //(ownedOperations+=OperationCS | ownedProperties+=StructuralFeatureCS /*| ownedConstraints+=InvariantConstraintCS*/)* public Alternatives getAlternatives_7_0_1() { return cAlternatives_7_0_1; } - /// *ownedAnnotations+=AnnotationElementCS - // |* / ownedOperations+=OperationCS + ///*ownedAnnotations+=AnnotationElementCS + // |*/ ownedOperations+=OperationCS public Assignment getOwnedOperationsAssignment_7_0_1_0() { return cOwnedOperationsAssignment_7_0_1_0; } //OperationCS @@ -1703,7 +1703,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cOwnedMultiplicityMultiplicityCSParserRuleCall_1_0 = (RuleCall)cOwnedMultiplicityAssignment_1.eContents().get(0); //TypedMultiplicityRefCS base::TypedRefCS: - // TypedRefCS ownedMultiplicity=MultiplicityCS? + // TypedRefCS ownedMultiplicity=MultiplicityCS?; @Override public ParserRule getRule() { return rule; } //TypedRefCS ownedMultiplicity=MultiplicityCS? @@ -1726,7 +1726,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cReferenceCSParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //StructuralFeatureCS base::StructuralFeatureCS: - // AttributeCS | ReferenceCS + // AttributeCS | ReferenceCS; @Override public ParserRule getRule() { return rule; } //AttributeCS | ReferenceCS @@ -1885,7 +1885,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cHyphenMinusKeyword_0 = (Keyword)cGroup.eContents().get(0); private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1); - /// * + ///* //| 'callable' //| 'import' //| 'key' @@ -1895,9 +1895,9 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //| 'postcondition' //| 'precondition' //| 'reference' - // * / + //*/ //SIGNED ecore::EInt: - // '-'? INT + // '-'? INT; @Override public ParserRule getRule() { return rule; } //'-'? INT @@ -1998,7 +1998,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // qualifiers+='!transient' | qualifiers+='unique' | qualifiers+='!unique' | qualifiers+='unsettable' | // qualifiers+='!unsettable' | qualifiers+='volatile' | qualifiers+='!volatile') ','?)+ '}')? ('{' ('initial' // UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' UnrestrictedName? ':' - // ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';') + // ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';'); public AttributeCSElements getAttributeCSAccess() { return pAttributeCS; } @@ -2008,7 +2008,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //ClassCS base::ClassCS: - // StructuredClassCS | DataTypeCS | EnumerationCS + // StructuredClassCS | DataTypeCS | EnumerationCS; public ClassCSElements getClassCSAccess() { return pClassCS; } @@ -2020,8 +2020,8 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //DataTypeCS base::DataTypeCS: // isPrimitive?='primitive'? 'datatype' name=UnrestrictedName ownedSignature=TemplateSignatureCS? (':' // instanceClassName=SINGLE_QUOTED_STRING)? ('{' (isSerializable?='serializable' | '!serializable')? '}')? ('{' - // / *(ownedAnnotations+=AnnotationElementCS - // | ownedConstraints+=InvariantConstraintCS)* * / '}' | ';') + // /*(ownedAnnotations+=AnnotationElementCS + // | ownedConstraints+=InvariantConstraintCS)* */ '}' | ';'); public DataTypeCSElements getDataTypeCSAccess() { return pDataTypeCS; } @@ -2033,7 +2033,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //EnumerationCS base::EnumerationCS: // 'enum' name=UnrestrictedName ownedSignature=TemplateSignatureCS? (':' instanceClassName=SINGLE_QUOTED_STRING)? ('{' // (isSerializable?='serializable' | '!serializable')? '}')? ('{' ownedLiterals+=EnumerationLiteralCS - // / *| ownedConstraints+=InvariantConstraintCS* / * '}' | ';') + // /*| ownedConstraints+=InvariantConstraintCS*/* '}' | ';'); public EnumerationCSElements getEnumerationCSAccess() { return pEnumerationCS; } @@ -2044,7 +2044,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //EnumerationLiteralCS base::EnumerationLiteralCS: // ('literal' name=UnrestrictedName | name=EnumerationLiteralName) ('=' value=SIGNED)? ('{' - // / *ownedAnnotations+=AnnotationElementCS* * / '}' | ';') + // /*ownedAnnotations+=AnnotationElementCS* */ '}' | ';'); public EnumerationLiteralCSElements getEnumerationLiteralCSAccess() { return pEnumerationLiteralCS; } @@ -2059,7 +2059,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // ownedParameters+=ParameterCS)*)? ')' (':' ownedType=TypedMultiplicityRefCS)? ('throws' ownedExceptions+=TypedRefCS // (',' ownedExceptions+=TypedRefCS)*)? ('{' ((qualifiers+='derived' | qualifiers+='!derived' | qualifiers+='ordered' | // qualifiers+='!ordered' | qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' ('body' UnrestrictedName? - // ':' ownedBodyExpressions+=SpecificationCS? ';')* '}' | ';') + // ':' ownedBodyExpressions+=SpecificationCS? ';')* '}' | ';'); public OperationCSElements getOperationCSAccess() { return pOperationCS; } @@ -2070,7 +2070,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //ParameterCS base::ParameterCS: // name=UnrestrictedName (':' ownedType=TypedMultiplicityRefCS)? ('{' ((qualifiers+='ordered' | qualifiers+='!ordered' | - // qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' / *ownedAnnotations+=AnnotationElementCS* * / '}')? + // qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' /*ownedAnnotations+=AnnotationElementCS* */ '}')?; public ParameterCSElements getParameterCSAccess() { return pParameterCS; } @@ -2088,7 +2088,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // qualifiers+='!resolve' | qualifiers+='transient' | qualifiers+='!transient' | qualifiers+='unique' | // qualifiers+='!unique' | qualifiers+='unsettable' | qualifiers+='!unsettable' | qualifiers+='volatile' | // qualifiers+='!volatile') ','?)+ '}')? ('{' ('initial' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? - // ';' | 'derivation' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';') + // ';' | 'derivation' UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';'); public ReferenceCSElements getReferenceCSAccess() { return pReferenceCS; } @@ -2098,7 +2098,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //SpecificationCS essentialocl::ExpSpecificationCS: - // ownedExpression=ExpCS | exprString=UNQUOTED_STRING + // ownedExpression=ExpCS | exprString=UNQUOTED_STRING; public SpecificationCSElements getSpecificationCSAccess() { return pSpecificationCS; } @@ -2111,7 +2111,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // isAbstract?='abstract'? 'class' name=UnrestrictedName ownedSignature=TemplateSignatureCS? ('extends' // ownedSuperTypes+=TypedRefCS (',' ownedSuperTypes+=TypedRefCS)*)? (':' instanceClassName=SINGLE_QUOTED_STRING)? ('{' // isInterface?='interface'? '}')? ('{' (ownedOperations+=OperationCS | ownedProperties+=StructuralFeatureCS - // / *| ownedConstraints+=InvariantConstraintCS* /)* '}' | ';') + // /*| ownedConstraints+=InvariantConstraintCS*/)* '}' | ';'); public StructuredClassCSElements getStructuredClassCSAccess() { return pStructuredClassCS; } @@ -2121,7 +2121,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //TypedMultiplicityRefCS base::TypedRefCS: - // TypedRefCS ownedMultiplicity=MultiplicityCS? + // TypedRefCS ownedMultiplicity=MultiplicityCS?; public TypedMultiplicityRefCSElements getTypedMultiplicityRefCSAccess() { return pTypedMultiplicityRefCS; } @@ -2131,7 +2131,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //StructuralFeatureCS base::StructuralFeatureCS: - // AttributeCS | ReferenceCS + // AttributeCS | ReferenceCS; public StructuralFeatureCSElements getStructuralFeatureCSAccess() { return pStructuralFeatureCS; } @@ -2162,7 +2162,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getQVTbaseUnrestrictedNameAccess().getRule(); } - /// * + ///* //| 'callable' //| 'import' //| 'key' @@ -2172,9 +2172,9 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //| 'postcondition' //| 'precondition' //| 'reference' - // * / + //*/ //SIGNED ecore::EInt: - // '-'? INT + // '-'? INT; public SIGNEDElements getSIGNEDAccess() { return pSIGNED; } @@ -2193,7 +2193,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { ////generate essentialOCLCST "http://www.eclipse.org/ocl/3.0.0/EssentialOCLCST" // Model ContextCS: - // ownedExpression=ExpCS + // ownedExpression=ExpCS; public EssentialOCLGrammarAccess.ModelElements getModelAccess() { return gaEssentialOCL.getModelAccess(); } @@ -2202,7 +2202,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getModelAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLReservedKeyword: // 'and' | 'else' | 'endif' | 'if' | 'implies' | 'in' | 'let' | 'not' | 'or' | 'then' | 'xor'; public EssentialOCLGrammarAccess.EssentialOCLReservedKeywordElements getEssentialOCLReservedKeywordAccess() { @@ -2213,7 +2213,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLReservedKeywordAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLUnaryOperatorName: // '-' | 'not'; public EssentialOCLGrammarAccess.EssentialOCLUnaryOperatorNameElements getEssentialOCLUnaryOperatorNameAccess() { @@ -2224,7 +2224,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLUnaryOperatorNameAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLInfixOperatorName: // '*' | '/' | '+' | '-' | '>' | '<' | '>=' | '<=' | '=' | '<>' | 'and' | 'or' | 'xor' | 'implies'; public EssentialOCLGrammarAccess.EssentialOCLInfixOperatorNameElements getEssentialOCLInfixOperatorNameAccess() { @@ -2235,7 +2235,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLInfixOperatorNameAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLNavigationOperatorName: // '.' | '->' | '?.' | '?->'; public EssentialOCLGrammarAccess.EssentialOCLNavigationOperatorNameElements getEssentialOCLNavigationOperatorNameAccess() { @@ -2291,7 +2291,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // ////--------------------------------------------------------------------- // - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLUnrestrictedName: // Identifier; public EssentialOCLGrammarAccess.EssentialOCLUnrestrictedNameElements getEssentialOCLUnrestrictedNameAccess() { @@ -2312,7 +2312,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getUnrestrictedNameAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLUnreservedName: // UnrestrictedName | CollectionTypeIdentifier | PrimitiveTypeIdentifier | 'Map' | 'Tuple'; public EssentialOCLGrammarAccess.EssentialOCLUnreservedNameElements getEssentialOCLUnreservedNameAccess() { @@ -2334,7 +2334,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //URIPathNameCS base::PathNameCS: - // ownedPathElements+=URIFirstPathElementCS ('::' ownedPathElements+=NextPathElementCS)* + // ownedPathElements+=URIFirstPathElementCS ('::' ownedPathElements+=NextPathElementCS)*; public EssentialOCLGrammarAccess.URIPathNameCSElements getURIPathNameCSAccess() { return gaEssentialOCL.getURIPathNameCSAccess(); } @@ -2345,7 +2345,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //URIFirstPathElementCS base::PathElementCS: // referredElement=[pivot::NamedElement|UnrestrictedName] | {base::PathElementWithURICS} - // referredElement=[pivot::Namespace|URI] + // referredElement=[pivot::Namespace|URI]; public EssentialOCLGrammarAccess.URIFirstPathElementCSElements getURIFirstPathElementCSAccess() { return gaEssentialOCL.getURIFirstPathElementCSAccess(); } @@ -2369,7 +2369,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //PrimitiveTypeCS base::PrimitiveTypeRefCS: - // name=PrimitiveTypeIdentifier + // name=PrimitiveTypeIdentifier; public EssentialOCLGrammarAccess.PrimitiveTypeCSElements getPrimitiveTypeCSAccess() { return gaEssentialOCL.getPrimitiveTypeCSAccess(); } @@ -2410,7 +2410,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //TupleTypeCS base::TupleTypeCS: - // name='Tuple' ('(' (ownedParts+=TuplePartCS (',' ownedParts+=TuplePartCS)*)? ')')? + // name='Tuple' ('(' (ownedParts+=TuplePartCS (',' ownedParts+=TuplePartCS)*)? ')')?; public EssentialOCLGrammarAccess.TupleTypeCSElements getTupleTypeCSAccess() { return gaEssentialOCL.getTupleTypeCSAccess(); } @@ -2420,7 +2420,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //TuplePartCS base::TuplePartCS: - // name=UnrestrictedName ':' ownedType=TypeExpCS + // name=UnrestrictedName ':' ownedType=TypeExpCS; public EssentialOCLGrammarAccess.TuplePartCSElements getTuplePartCSAccess() { return gaEssentialOCL.getTuplePartCSAccess(); } @@ -2607,7 +2607,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //TypeLiteralCS base::TypedRefCS: - // PrimitiveTypeCS | CollectionTypeCS | MapTypeCS | TupleTypeCS + // PrimitiveTypeCS | CollectionTypeCS | MapTypeCS | TupleTypeCS; public EssentialOCLGrammarAccess.TypeLiteralCSElements getTypeLiteralCSAccess() { return gaEssentialOCL.getTypeLiteralCSAccess(); } @@ -2617,7 +2617,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //TypeLiteralWithMultiplicityCS base::TypedRefCS: - // TypeLiteralCS ownedMultiplicity=MultiplicityCS? + // TypeLiteralCS ownedMultiplicity=MultiplicityCS?; public EssentialOCLGrammarAccess.TypeLiteralWithMultiplicityCSElements getTypeLiteralWithMultiplicityCSAccess() { return gaEssentialOCL.getTypeLiteralWithMultiplicityCSAccess(); } @@ -2647,7 +2647,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //TypeExpWithoutMultiplicityCS base::TypedRefCS: - // TypeNameExpCS | TypeLiteralCS | CollectionPatternCS + // TypeNameExpCS | TypeLiteralCS | CollectionPatternCS; public EssentialOCLGrammarAccess.TypeExpWithoutMultiplicityCSElements getTypeExpWithoutMultiplicityCSAccess() { return gaEssentialOCL.getTypeExpWithoutMultiplicityCSAccess(); } @@ -2657,7 +2657,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //TypeExpCS base::TypedRefCS: - // TypeExpWithoutMultiplicityCS ownedMultiplicity=MultiplicityCS? + // TypeExpWithoutMultiplicityCS ownedMultiplicity=MultiplicityCS?; public EssentialOCLGrammarAccess.TypeExpCSElements getTypeExpCSAccess() { return gaEssentialOCL.getTypeExpCSAccess(); } @@ -2680,8 +2680,8 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // //// a = (64 / 16) / (let b : Integer in 8 / (let c : Integer in 4 )) // - /// * An expression elaborates a prefixed expression with zero or more binary operator and expression suffixes. - // * An optionally prefixed let expression is permitted except when suffixed with further expressions.* / + ///* An expression elaborates a prefixed expression with zero or more binary operator and expression suffixes. + // * An optionally prefixed let expression is permitted except when suffixed with further expressions.*/ //ExpCS: // PrefixedPrimaryExpCS ({InfixExpCS.ownedLeft=current} name=BinaryOperatorName ownedRight=ExpCS)? | PrefixedLetExpCS; public EssentialOCLGrammarAccess.ExpCSElements getExpCSAccess() { @@ -2692,9 +2692,9 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getExpCSAccess().getRule(); } - /// * A prefixed let expression elaborates a let expression with zero or more unary prefix operators. * / PrefixedLetExpCS + ///* A prefixed let expression elaborates a let expression with zero or more unary prefix operators. */ PrefixedLetExpCS //ExpCS: - // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedLetExpCS | LetExpCS + // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedLetExpCS | LetExpCS; public EssentialOCLGrammarAccess.PrefixedLetExpCSElements getPrefixedLetExpCSAccess() { return gaEssentialOCL.getPrefixedLetExpCSAccess(); } @@ -2703,9 +2703,9 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getPrefixedLetExpCSAccess().getRule(); } - /// * A prefixed primary expression elaborates a primary expression with zero or more unary prefix operators. * / + ///* A prefixed primary expression elaborates a primary expression with zero or more unary prefix operators. */ //PrefixedPrimaryExpCS ExpCS: - // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedPrimaryExpCS | PrimaryExpCS + // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedPrimaryExpCS | PrimaryExpCS; public EssentialOCLGrammarAccess.PrefixedPrimaryExpCSElements getPrefixedPrimaryExpCSAccess() { return gaEssentialOCL.getPrefixedPrimaryExpCSAccess(); } @@ -2714,10 +2714,10 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getPrefixedPrimaryExpCSAccess().getRule(); } - /// * A primary expression identifies the basic expressions from which more complex expressions may be constructed. * / + ///* A primary expression identifies the basic expressions from which more complex expressions may be constructed. */ //PrimaryExpCS ExpCS: // NestedExpCS | IfExpCS | SelfExpCS | PrimitiveLiteralExpCS | TupleLiteralExpCS | MapLiteralExpCS | - // CollectionLiteralExpCS | LambdaLiteralExpCS | TypeLiteralExpCS | NameExpCS + // CollectionLiteralExpCS | LambdaLiteralExpCS | TypeLiteralExpCS | NameExpCS; public EssentialOCLGrammarAccess.PrimaryExpCSElements getPrimaryExpCSAccess() { return gaEssentialOCL.getPrimaryExpCSAccess(); } @@ -2726,8 +2726,8 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getPrimaryExpCSAccess().getRule(); } - /// * A name expression is a generalised rule for expressions that start with a name and which may be followed by square, round or - // * curly bracket clauses and optionally an @pre as well.* / + ///* A name expression is a generalised rule for expressions that start with a name and which may be followed by square, round or + // * curly bracket clauses and optionally an @pre as well.*/ //NameExpCS: // ownedPathName=PathNameCS ownedSquareBracketedClauses+=SquareBracketedClauseCS* // ownedRoundBracketedClause=RoundBracketedClauseCS? ownedCurlyBracketedClause=CurlyBracketedClauseCS? (isPre?='@' @@ -2740,7 +2740,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getNameExpCSAccess().getRule(); } - /// * A curly bracket clause is a generalized rule for the literal arguments of collections, maps, tuples and shadows.* / + ///* A curly bracket clause is a generalized rule for the literal arguments of collections, maps, tuples and shadows.*/ //CurlyBracketedClauseCS: // {CurlyBracketedClauseCS} '{' (ownedParts+=ShadowPartCS (',' ownedParts+=ShadowPartCS)*)? '}'; public EssentialOCLGrammarAccess.CurlyBracketedClauseCSElements getCurlyBracketedClauseCSAccess() { @@ -2751,7 +2751,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getCurlyBracketedClauseCSAccess().getRule(); } - /// * A curly bracket clause is a generalized rule for template specialisations and operations arguments.* / + ///* A curly bracket clause is a generalized rule for template specialisations and operations arguments.*/ //RoundBracketedClauseCS: // {RoundBracketedClauseCS} '(' (ownedArguments+=NavigatingArgCS ownedArguments+=NavigatingCommaArgCS* // (ownedArguments+=NavigatingSemiArgCS ownedArguments+=NavigatingCommaArgCS*)? (ownedArguments+=NavigatingBarArgCS @@ -2764,7 +2764,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getRoundBracketedClauseCSAccess().getRule(); } - /// * A square bracket clause is a generalized rule for association class qualifiers and roles.* / SquareBracketedClauseCS: + ///* A square bracket clause is a generalized rule for association class qualifiers and roles.*/ SquareBracketedClauseCS: // '[' ownedTerms+=ExpCS (',' ownedTerms+=ExpCS)* ']'; public EssentialOCLGrammarAccess.SquareBracketedClauseCSElements getSquareBracketedClauseCSAccess() { return gaEssentialOCL.getSquareBracketedClauseCSAccess(); @@ -2774,8 +2774,8 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getSquareBracketedClauseCSAccess().getRule(); } - /// * A navigating argument is a generalized rule for the first argument in a round bracket clause. This is typically the first operation - // * parameter or an iterator. * / + ///* A navigating argument is a generalized rule for the first argument in a round bracket clause. This is typically the first operation + // * parameter or an iterator. */ //NavigatingArgCS: // ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)? | 'in' // ownedInitExpression=ExpCS)? | ':' ownedType=TypeExpCS; @@ -2789,9 +2789,9 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // - /// * A navigating bar argument is a generalized rule for a bar-prefixed argument in a round bracket clause. This is typically the body of an iteration. * / + ///* A navigating bar argument is a generalized rule for a bar-prefixed argument in a round bracket clause. This is typically the body of an iteration. */ //NavigatingBarArgCS NavigatingArgCS: - // prefix='|' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)? + // prefix='|' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)?; public EssentialOCLGrammarAccess.NavigatingBarArgCSElements getNavigatingBarArgCSAccess() { return gaEssentialOCL.getNavigatingBarArgCSAccess(); } @@ -2802,11 +2802,11 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // - /// * A navigating comma argument is a generalized rule for non-first argument in a round bracket clause. These are typically non-first operation - // * parameters or a second iterator. * / + ///* A navigating comma argument is a generalized rule for non-first argument in a round bracket clause. These are typically non-first operation + // * parameters or a second iterator. */ //NavigatingCommaArgCS NavigatingArgCS: // prefix=',' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)? | 'in' - // ownedInitExpression=ExpCS)? + // ownedInitExpression=ExpCS)?; public EssentialOCLGrammarAccess.NavigatingCommaArgCSElements getNavigatingCommaArgCSAccess() { return gaEssentialOCL.getNavigatingCommaArgCSAccess(); } @@ -2817,9 +2817,9 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // - /// * A navigating semi argument is a generalized rule for a semicolon prefixed argument in a round bracket clause. This is typically an iterate accumulator. * / + ///* A navigating semi argument is a generalized rule for a semicolon prefixed argument in a round bracket clause. This is typically an iterate accumulator. */ //NavigatingSemiArgCS NavigatingArgCS: - // prefix=';' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)? + // prefix=';' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)?; public EssentialOCLGrammarAccess.NavigatingSemiArgCSElements getNavigatingSemiArgCSAccess() { return gaEssentialOCL.getNavigatingSemiArgCSAccess(); } @@ -2830,7 +2830,8 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // NavigatingArgExpCS ExpCS: - // ExpCS + // ExpCS // '?' -- defined by Complete OCL + //; public EssentialOCLGrammarAccess.NavigatingArgExpCSElements getNavigatingArgExpCSAccess() { return gaEssentialOCL.getNavigatingArgExpCSAccess(); } @@ -2857,7 +2858,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { // //; // ElseIfThenExpCS //IfThenExpCS: - // 'elseif' ownedCondition=ExpCS 'then' ownedThenExpression=ExpCS + // 'elseif' ownedCondition=ExpCS 'then' ownedThenExpression=ExpCS; public EssentialOCLGrammarAccess.ElseIfThenExpCSElements getElseIfThenExpCSAccess() { return gaEssentialOCL.getElseIfThenExpCSAccess(); } @@ -2948,7 +2949,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //FirstPathElementCS PathElementCS: - // referredElement=[pivot::NamedElement|super::UnrestrictedName] + // referredElement=[pivot::NamedElement|super::UnrestrictedName]; public BaseGrammarAccess.FirstPathElementCSElements getFirstPathElementCSAccess() { return gaBase.getFirstPathElementCSAccess(); } @@ -2958,7 +2959,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //NextPathElementCS PathElementCS: - // referredElement=[pivot::NamedElement|super::UnreservedName] + // referredElement=[pivot::NamedElement|super::UnreservedName]; public BaseGrammarAccess.NextPathElementCSElements getNextPathElementCSAccess() { return gaBase.getNextPathElementCSAccess(); } @@ -3068,9 +3069,9 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getIdentifierAccess().getRule(); } - /// * A lowerbounded integer is used to define the lowerbound of a collection multiplicity. The value may not be the unlimited value. * / + ///* A lowerbounded integer is used to define the lowerbound of a collection multiplicity. The value may not be the unlimited value. */ //LOWER ecore::EInt: - // INT + // INT; public BaseGrammarAccess.LOWERElements getLOWERAccess() { return gaBase.getLOWERAccess(); } @@ -3079,13 +3080,13 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getLOWERAccess().getRule(); } - /// * A number may be an integer or floating point value. The declaration here appears to be that for just an integer. This is to avoid + ///* A number may be an integer or floating point value. The declaration here appears to be that for just an integer. This is to avoid // * lookahead conflicts in simple lexers between a dot within a floating point number and the dot-dot in a CollectionLiteralPartCS. A // * practical implementation should give high priority to a successful parse of INT ('.' INT)? (('e' | 'E') ('+' | '-')? INT)? than // * to the unsuccessful partial parse of INT '..'. The type of the INT terminal is String to allow the floating point syntax to be used. - // * / + // */ //NUMBER_LITERAL BigNumber: - // INT + // INT; public BaseGrammarAccess.NUMBER_LITERALElements getNUMBER_LITERALAccess() { return gaBase.getNUMBER_LITERALAccess(); } @@ -3105,9 +3106,9 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { return getStringLiteralAccess().getRule(); } - /// * An upperbounded integer is used to define the upperbound of a collection multiplicity. The value may be the unlimited value. * / + ///* An upperbounded integer is used to define the upperbound of a collection multiplicity. The value may be the unlimited value. */ //UPPER ecore::EInt: - // INT | '*' + // INT | '*'; public BaseGrammarAccess.UPPERElements getUPPERAccess() { return gaBase.getUPPERAccess(); } @@ -3175,7 +3176,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaBase.getML_COMMENTRule(); } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/AbstractQVTcoreProposalProvider.java b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/AbstractQVTcoreProposalProvider.java index 1ad9c8f9a..0bf4f54fa 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/AbstractQVTcoreProposalProvider.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/AbstractQVTcoreProposalProvider.java @@ -89,7 +89,7 @@ public class AbstractQVTcoreProposalProvider extends org.eclipse.qvtd.xtext.qvtb public void completeMappingCS_Refines(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor); } - public void completeMappingCS_Overrides(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeMappingCS_Overridden(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor); } public void completeMappingCS_OwnedDomains(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/QVTcoreParser.java b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/QVTcoreParser.java index 038b0d503..a0db5bf5a 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/QVTcoreParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/QVTcoreParser.java @@ -349,7 +349,7 @@ public class QVTcoreParser extends AbstractContentAssistParser { put(grammarAccess.getMappingCSAccess().getOwnedInPathNameAssignment_4_1(), "rule__MappingCS__OwnedInPathNameAssignment_4_1"); put(grammarAccess.getMappingCSAccess().getRefinesAssignment_5_1(), "rule__MappingCS__RefinesAssignment_5_1"); put(grammarAccess.getMappingCSAccess().getRefinesAssignment_5_2_1(), "rule__MappingCS__RefinesAssignment_5_2_1"); - put(grammarAccess.getMappingCSAccess().getOverridesAssignment_6_1(), "rule__MappingCS__OverridesAssignment_6_1"); + put(grammarAccess.getMappingCSAccess().getOverriddenAssignment_6_1(), "rule__MappingCS__OverriddenAssignment_6_1"); put(grammarAccess.getMappingCSAccess().getOwnedDomainsAssignment_8(), "rule__MappingCS__OwnedDomainsAssignment_8"); put(grammarAccess.getMappingCSAccess().getOwnedMiddleAssignment_9_1(), "rule__MappingCS__OwnedMiddleAssignment_9_1"); put(grammarAccess.getMappingCSAccess().getOwnedComposedMappingsAssignment_10(), "rule__MappingCS__OwnedComposedMappingsAssignment_10"); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g index 88e30ebfa..2d9668ae6 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g @@ -8538,9 +8538,9 @@ rule__MappingCS__Group_6__1__Impl } : ( -{ before(grammarAccess.getMappingCSAccess().getOverridesAssignment_6_1()); } -(rule__MappingCS__OverridesAssignment_6_1) -{ after(grammarAccess.getMappingCSAccess().getOverridesAssignment_6_1()); } +{ before(grammarAccess.getMappingCSAccess().getOverriddenAssignment_6_1()); } +(rule__MappingCS__OverriddenAssignment_6_1) +{ after(grammarAccess.getMappingCSAccess().getOverriddenAssignment_6_1()); } ) ; @@ -25350,18 +25350,18 @@ finally { restoreStackSize(stackSize); } -rule__MappingCS__OverridesAssignment_6_1 +rule__MappingCS__OverriddenAssignment_6_1 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getMappingCSAccess().getOverridesMappingCrossReference_6_1_0()); } +{ before(grammarAccess.getMappingCSAccess().getOverriddenMappingCrossReference_6_1_0()); } ( -{ before(grammarAccess.getMappingCSAccess().getOverridesMappingUnrestrictedNameParserRuleCall_6_1_0_1()); } - ruleUnrestrictedName{ after(grammarAccess.getMappingCSAccess().getOverridesMappingUnrestrictedNameParserRuleCall_6_1_0_1()); } +{ before(grammarAccess.getMappingCSAccess().getOverriddenMappingUnrestrictedNameParserRuleCall_6_1_0_1()); } + ruleUnrestrictedName{ after(grammarAccess.getMappingCSAccess().getOverriddenMappingUnrestrictedNameParserRuleCall_6_1_0_1()); } ) -{ after(grammarAccess.getMappingCSAccess().getOverridesMappingCrossReference_6_1_0()); } +{ after(grammarAccess.getMappingCSAccess().getOverriddenMappingCrossReference_6_1_0()); } ) ; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java index e620accfd..004581c0c 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java @@ -27847,26 +27847,26 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__MappingCS__Group_6__1__Impl" - // InternalQVTcore.g:8535:1: rule__MappingCS__Group_6__1__Impl : ( ( rule__MappingCS__OverridesAssignment_6_1 ) ) ; + // InternalQVTcore.g:8535:1: rule__MappingCS__Group_6__1__Impl : ( ( rule__MappingCS__OverriddenAssignment_6_1 ) ) ; public final void rule__MappingCS__Group_6__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalQVTcore.g:8539:1: ( ( ( rule__MappingCS__OverridesAssignment_6_1 ) ) ) - // InternalQVTcore.g:8540:1: ( ( rule__MappingCS__OverridesAssignment_6_1 ) ) + // InternalQVTcore.g:8539:1: ( ( ( rule__MappingCS__OverriddenAssignment_6_1 ) ) ) + // InternalQVTcore.g:8540:1: ( ( rule__MappingCS__OverriddenAssignment_6_1 ) ) { - // InternalQVTcore.g:8540:1: ( ( rule__MappingCS__OverridesAssignment_6_1 ) ) - // InternalQVTcore.g:8541:1: ( rule__MappingCS__OverridesAssignment_6_1 ) + // InternalQVTcore.g:8540:1: ( ( rule__MappingCS__OverriddenAssignment_6_1 ) ) + // InternalQVTcore.g:8541:1: ( rule__MappingCS__OverriddenAssignment_6_1 ) { if ( state.backtracking==0 ) { - before(grammarAccess.getMappingCSAccess().getOverridesAssignment_6_1()); + before(grammarAccess.getMappingCSAccess().getOverriddenAssignment_6_1()); } - // InternalQVTcore.g:8542:1: ( rule__MappingCS__OverridesAssignment_6_1 ) - // InternalQVTcore.g:8542:2: rule__MappingCS__OverridesAssignment_6_1 + // InternalQVTcore.g:8542:1: ( rule__MappingCS__OverriddenAssignment_6_1 ) + // InternalQVTcore.g:8542:2: rule__MappingCS__OverriddenAssignment_6_1 { pushFollow(FollowSets000.FOLLOW_2); - rule__MappingCS__OverridesAssignment_6_1(); + rule__MappingCS__OverriddenAssignment_6_1(); state._fsp--; if (state.failed) return ; @@ -27874,7 +27874,7 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { } if ( state.backtracking==0 ) { - after(grammarAccess.getMappingCSAccess().getOverridesAssignment_6_1()); + after(grammarAccess.getMappingCSAccess().getOverriddenAssignment_6_1()); } } @@ -74524,9 +74524,9 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__MappingCS__RefinesAssignment_5_2_1" - // $ANTLR start "rule__MappingCS__OverridesAssignment_6_1" - // InternalQVTcore.g:25353:1: rule__MappingCS__OverridesAssignment_6_1 : ( ( ruleUnrestrictedName ) ) ; - public final void rule__MappingCS__OverridesAssignment_6_1() throws RecognitionException { + // $ANTLR start "rule__MappingCS__OverriddenAssignment_6_1" + // InternalQVTcore.g:25353:1: rule__MappingCS__OverriddenAssignment_6_1 : ( ( ruleUnrestrictedName ) ) ; + public final void rule__MappingCS__OverriddenAssignment_6_1() throws RecognitionException { int stackSize = keepStackSize(); @@ -74538,13 +74538,13 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { // InternalQVTcore.g:25359:1: ( ruleUnrestrictedName ) { if ( state.backtracking==0 ) { - before(grammarAccess.getMappingCSAccess().getOverridesMappingCrossReference_6_1_0()); + before(grammarAccess.getMappingCSAccess().getOverriddenMappingCrossReference_6_1_0()); } // InternalQVTcore.g:25360:1: ( ruleUnrestrictedName ) // InternalQVTcore.g:25361:1: ruleUnrestrictedName { if ( state.backtracking==0 ) { - before(grammarAccess.getMappingCSAccess().getOverridesMappingUnrestrictedNameParserRuleCall_6_1_0_1()); + before(grammarAccess.getMappingCSAccess().getOverriddenMappingUnrestrictedNameParserRuleCall_6_1_0_1()); } pushFollow(FollowSets000.FOLLOW_2); ruleUnrestrictedName(); @@ -74552,13 +74552,13 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { state._fsp--; if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getMappingCSAccess().getOverridesMappingUnrestrictedNameParserRuleCall_6_1_0_1()); + after(grammarAccess.getMappingCSAccess().getOverriddenMappingUnrestrictedNameParserRuleCall_6_1_0_1()); } } if ( state.backtracking==0 ) { - after(grammarAccess.getMappingCSAccess().getOverridesMappingCrossReference_6_1_0()); + after(grammarAccess.getMappingCSAccess().getOverriddenMappingCrossReference_6_1_0()); } } @@ -74578,7 +74578,7 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__MappingCS__OverridesAssignment_6_1" + // $ANTLR end "rule__MappingCS__OverriddenAssignment_6_1" // $ANTLR start "rule__MappingCS__OwnedDomainsAssignment_8" diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/MappingCS.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/MappingCS.java index 233fd4a77..e44c441ae 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/MappingCS.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/MappingCS.java @@ -25,11 +25,11 @@ import org.eclipse.qvtd.pivot.qvtcore.Mapping; * </p> * <ul> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#isIsAbstract <em>Is Abstract</em>}</li> + * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOverridden <em>Overridden</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOwnedComposedMappings <em>Owned Composed Mappings</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOwnedDomains <em>Owned Domains</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOwnedInPathName <em>Owned In Path Name</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOwnedMiddle <em>Owned Middle</em>}</li> - * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOverrides <em>Overrides</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getRefines <em>Refines</em>}</li> * </ul> * @@ -66,6 +66,32 @@ public interface MappingCS extends NamedElementCS { void setIsAbstract(boolean value); /** + * Returns the value of the '<em><b>Overridden</b></em>' reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Overridden</em>' reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Overridden</em>' reference. + * @see #setOverridden(Mapping) + * @see org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage#getMappingCS_Overridden() + * @model + * @generated + */ + Mapping getOverridden(); + + /** + * Sets the value of the '{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOverridden <em>Overridden</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Overridden</em>' reference. + * @see #getOverridden() + * @generated + */ + void setOverridden(Mapping value); + + /** * Returns the value of the '<em><b>Owned Composed Mappings</b></em>' containment reference list. * The list contents are of type {@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS}. * <!-- begin-user-doc --> @@ -150,32 +176,6 @@ public interface MappingCS extends NamedElementCS { void setOwnedMiddle(DomainCS value); /** - * Returns the value of the '<em><b>Overrides</b></em>' reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Overrides</em>' reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Overrides</em>' reference. - * @see #setOverrides(Mapping) - * @see org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage#getMappingCS_Overrides() - * @model - * @generated - */ - Mapping getOverrides(); - - /** - * Sets the value of the '{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOverrides <em>Overrides</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Overrides</em>' reference. - * @see #getOverrides() - * @generated - */ - void setOverrides(Mapping value); - - /** * Returns the value of the '<em><b>Refines</b></em>' reference list. * The list contents are of type {@link org.eclipse.qvtd.pivot.qvtcore.Mapping}. * <!-- begin-user-doc --> diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/QVTcoreCSPackage.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/QVTcoreCSPackage.java index 2b9ae7141..0502a9478 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/QVTcoreCSPackage.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/QVTcoreCSPackage.java @@ -785,49 +785,49 @@ public interface QVTcoreCSPackage extends EPackage { int MAPPING_CS__IS_ABSTRACT = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Owned Composed Mappings</b></em>' containment reference list. + * The feature id for the '<em><b>Overridden</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING_CS__OWNED_COMPOSED_MAPPINGS = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 1; + int MAPPING_CS__OVERRIDDEN = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Owned Domains</b></em>' containment reference list. + * The feature id for the '<em><b>Owned Composed Mappings</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING_CS__OWNED_DOMAINS = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 2; + int MAPPING_CS__OWNED_COMPOSED_MAPPINGS = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Owned In Path Name</b></em>' containment reference. + * The feature id for the '<em><b>Owned Domains</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING_CS__OWNED_IN_PATH_NAME = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 3; + int MAPPING_CS__OWNED_DOMAINS = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Owned Middle</b></em>' containment reference. + * The feature id for the '<em><b>Owned In Path Name</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING_CS__OWNED_MIDDLE = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 4; + int MAPPING_CS__OWNED_IN_PATH_NAME = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 4; /** - * The feature id for the '<em><b>Overrides</b></em>' reference. + * The feature id for the '<em><b>Owned Middle</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MAPPING_CS__OVERRIDES = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 5; + int MAPPING_CS__OWNED_MIDDLE = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Refines</b></em>' reference list. @@ -2170,6 +2170,17 @@ public interface QVTcoreCSPackage extends EPackage { EAttribute getMappingCS_IsAbstract(); /** + * Returns the meta object for the reference '{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOverridden <em>Overridden</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the reference '<em>Overridden</em>'. + * @see org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOverridden() + * @see #getMappingCS() + * @generated + */ + EReference getMappingCS_Overridden(); + + /** * Returns the meta object for the containment reference list '{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOwnedComposedMappings <em>Owned Composed Mappings</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2214,17 +2225,6 @@ public interface QVTcoreCSPackage extends EPackage { EReference getMappingCS_OwnedMiddle(); /** - * Returns the meta object for the reference '{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOverrides <em>Overrides</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Overrides</em>'. - * @see org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getOverrides() - * @see #getMappingCS() - * @generated - */ - EReference getMappingCS_Overrides(); - - /** * Returns the meta object for the reference list '{@link org.eclipse.qvtd.xtext.qvtcorecs.MappingCS#getRefines <em>Refines</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2727,6 +2727,14 @@ public interface QVTcoreCSPackage extends EPackage { EAttribute MAPPING_CS__IS_ABSTRACT = eINSTANCE.getMappingCS_IsAbstract(); /** + * The meta object literal for the '<em><b>Overridden</b></em>' reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference MAPPING_CS__OVERRIDDEN = eINSTANCE.getMappingCS_Overridden(); + + /** * The meta object literal for the '<em><b>Owned Composed Mappings</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2759,14 +2767,6 @@ public interface QVTcoreCSPackage extends EPackage { EReference MAPPING_CS__OWNED_MIDDLE = eINSTANCE.getMappingCS_OwnedMiddle(); /** - * The meta object literal for the '<em><b>Overrides</b></em>' reference feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EReference MAPPING_CS__OVERRIDES = eINSTANCE.getMappingCS_Overrides(); - - /** * The meta object literal for the '<em><b>Refines</b></em>' reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/MappingCSImpl.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/MappingCSImpl.java index 5c0f4b9a6..6c3697c3d 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/MappingCSImpl.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/MappingCSImpl.java @@ -40,11 +40,11 @@ import org.eclipse.qvtd.xtext.qvtcorecs.util.QVTcoreCSVisitor; * </p> * <ul> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.impl.MappingCSImpl#isIsAbstract <em>Is Abstract</em>}</li> + * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.impl.MappingCSImpl#getOverridden <em>Overridden</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.impl.MappingCSImpl#getOwnedComposedMappings <em>Owned Composed Mappings</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.impl.MappingCSImpl#getOwnedDomains <em>Owned Domains</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.impl.MappingCSImpl#getOwnedInPathName <em>Owned In Path Name</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.impl.MappingCSImpl#getOwnedMiddle <em>Owned Middle</em>}</li> - * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.impl.MappingCSImpl#getOverrides <em>Overrides</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtcorecs.impl.MappingCSImpl#getRefines <em>Refines</em>}</li> * </ul> * @@ -72,6 +72,16 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { protected boolean isAbstract = IS_ABSTRACT_EDEFAULT; /** + * The cached value of the '{@link #getOverridden() <em>Overridden</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getOverridden() + * @generated + * @ordered + */ + protected Mapping overridden; + + /** * The cached value of the '{@link #getOwnedComposedMappings() <em>Owned Composed Mappings</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -112,16 +122,6 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { protected DomainCS ownedMiddle; /** - * The cached value of the '{@link #getOverrides() <em>Overrides</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getOverrides() - * @generated - * @ordered - */ - protected Mapping overrides; - - /** * The cached value of the '{@link #getRefines() <em>Refines</em>}' reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -179,6 +179,46 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { * @generated */ @Override + public Mapping getOverridden() { + if (overridden != null && overridden.eIsProxy()) { + InternalEObject oldOverridden = (InternalEObject)overridden; + overridden = (Mapping)eResolveProxy(oldOverridden); + if (overridden != oldOverridden) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTcoreCSPackage.MAPPING_CS__OVERRIDDEN, oldOverridden, overridden)); + } + } + return overridden; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Mapping basicGetOverridden() { + return overridden; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setOverridden(Mapping newOverridden) { + Mapping oldOverridden = overridden; + overridden = newOverridden; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, QVTcoreCSPackage.MAPPING_CS__OVERRIDDEN, oldOverridden, overridden)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override public EList<MappingCS> getOwnedComposedMappings() { if (ownedComposedMappings == null) { ownedComposedMappings = new EObjectContainmentEList<MappingCS>(MappingCS.class, this, QVTcoreCSPackage.MAPPING_CS__OWNED_COMPOSED_MAPPINGS); @@ -295,46 +335,6 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { * @generated */ @Override - public Mapping getOverrides() { - if (overrides != null && overrides.eIsProxy()) { - InternalEObject oldOverrides = (InternalEObject)overrides; - overrides = (Mapping)eResolveProxy(oldOverrides); - if (overrides != oldOverrides) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTcoreCSPackage.MAPPING_CS__OVERRIDES, oldOverrides, overrides)); - } - } - return overrides; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Mapping basicGetOverrides() { - return overrides; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void setOverrides(Mapping newOverrides) { - Mapping oldOverrides = overrides; - overrides = newOverrides; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, QVTcoreCSPackage.MAPPING_CS__OVERRIDES, oldOverrides, overrides)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override public EList<Mapping> getRefines() { if (refines == null) { refines = new EObjectResolvingEList<Mapping>(Mapping.class, this, QVTcoreCSPackage.MAPPING_CS__REFINES); @@ -382,6 +382,9 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { switch (featureID) { case QVTcoreCSPackage.MAPPING_CS__IS_ABSTRACT: return isIsAbstract(); + case QVTcoreCSPackage.MAPPING_CS__OVERRIDDEN: + if (resolve) return getOverridden(); + return basicGetOverridden(); case QVTcoreCSPackage.MAPPING_CS__OWNED_COMPOSED_MAPPINGS: return getOwnedComposedMappings(); case QVTcoreCSPackage.MAPPING_CS__OWNED_DOMAINS: @@ -390,9 +393,6 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { return getOwnedInPathName(); case QVTcoreCSPackage.MAPPING_CS__OWNED_MIDDLE: return getOwnedMiddle(); - case QVTcoreCSPackage.MAPPING_CS__OVERRIDES: - if (resolve) return getOverrides(); - return basicGetOverrides(); case QVTcoreCSPackage.MAPPING_CS__REFINES: return getRefines(); } @@ -411,6 +411,9 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { case QVTcoreCSPackage.MAPPING_CS__IS_ABSTRACT: setIsAbstract((Boolean)newValue); return; + case QVTcoreCSPackage.MAPPING_CS__OVERRIDDEN: + setOverridden((Mapping)newValue); + return; case QVTcoreCSPackage.MAPPING_CS__OWNED_COMPOSED_MAPPINGS: getOwnedComposedMappings().clear(); getOwnedComposedMappings().addAll((Collection<? extends MappingCS>)newValue); @@ -425,9 +428,6 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { case QVTcoreCSPackage.MAPPING_CS__OWNED_MIDDLE: setOwnedMiddle((DomainCS)newValue); return; - case QVTcoreCSPackage.MAPPING_CS__OVERRIDES: - setOverrides((Mapping)newValue); - return; case QVTcoreCSPackage.MAPPING_CS__REFINES: getRefines().clear(); getRefines().addAll((Collection<? extends Mapping>)newValue); @@ -447,6 +447,9 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { case QVTcoreCSPackage.MAPPING_CS__IS_ABSTRACT: setIsAbstract(IS_ABSTRACT_EDEFAULT); return; + case QVTcoreCSPackage.MAPPING_CS__OVERRIDDEN: + setOverridden((Mapping)null); + return; case QVTcoreCSPackage.MAPPING_CS__OWNED_COMPOSED_MAPPINGS: getOwnedComposedMappings().clear(); return; @@ -459,9 +462,6 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { case QVTcoreCSPackage.MAPPING_CS__OWNED_MIDDLE: setOwnedMiddle((DomainCS)null); return; - case QVTcoreCSPackage.MAPPING_CS__OVERRIDES: - setOverrides((Mapping)null); - return; case QVTcoreCSPackage.MAPPING_CS__REFINES: getRefines().clear(); return; @@ -479,6 +479,8 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { switch (featureID) { case QVTcoreCSPackage.MAPPING_CS__IS_ABSTRACT: return isAbstract != IS_ABSTRACT_EDEFAULT; + case QVTcoreCSPackage.MAPPING_CS__OVERRIDDEN: + return overridden != null; case QVTcoreCSPackage.MAPPING_CS__OWNED_COMPOSED_MAPPINGS: return ownedComposedMappings != null && !ownedComposedMappings.isEmpty(); case QVTcoreCSPackage.MAPPING_CS__OWNED_DOMAINS: @@ -487,8 +489,6 @@ public class MappingCSImpl extends NamedElementCSImpl implements MappingCS { return ownedInPathName != null; case QVTcoreCSPackage.MAPPING_CS__OWNED_MIDDLE: return ownedMiddle != null; - case QVTcoreCSPackage.MAPPING_CS__OVERRIDES: - return overrides != null; case QVTcoreCSPackage.MAPPING_CS__REFINES: return refines != null && !refines.isEmpty(); } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/QVTcoreCSPackageImpl.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/QVTcoreCSPackageImpl.java index 24ce8a74f..4ed87a2dc 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/QVTcoreCSPackageImpl.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/emf-gen/org/eclipse/qvtd/xtext/qvtcorecs/impl/QVTcoreCSPackageImpl.java @@ -453,7 +453,7 @@ public class QVTcoreCSPackageImpl extends EPackageImpl implements QVTcoreCSPacka * @generated */ @Override - public EReference getMappingCS_OwnedComposedMappings() { + public EReference getMappingCS_Overridden() { return (EReference)mappingCSEClass.getEStructuralFeatures().get(1); } @@ -463,7 +463,7 @@ public class QVTcoreCSPackageImpl extends EPackageImpl implements QVTcoreCSPacka * @generated */ @Override - public EReference getMappingCS_OwnedDomains() { + public EReference getMappingCS_OwnedComposedMappings() { return (EReference)mappingCSEClass.getEStructuralFeatures().get(2); } @@ -473,7 +473,7 @@ public class QVTcoreCSPackageImpl extends EPackageImpl implements QVTcoreCSPacka * @generated */ @Override - public EReference getMappingCS_OwnedInPathName() { + public EReference getMappingCS_OwnedDomains() { return (EReference)mappingCSEClass.getEStructuralFeatures().get(3); } @@ -483,7 +483,7 @@ public class QVTcoreCSPackageImpl extends EPackageImpl implements QVTcoreCSPacka * @generated */ @Override - public EReference getMappingCS_OwnedMiddle() { + public EReference getMappingCS_OwnedInPathName() { return (EReference)mappingCSEClass.getEStructuralFeatures().get(4); } @@ -493,7 +493,7 @@ public class QVTcoreCSPackageImpl extends EPackageImpl implements QVTcoreCSPacka * @generated */ @Override - public EReference getMappingCS_Overrides() { + public EReference getMappingCS_OwnedMiddle() { return (EReference)mappingCSEClass.getEStructuralFeatures().get(5); } @@ -833,11 +833,11 @@ public class QVTcoreCSPackageImpl extends EPackageImpl implements QVTcoreCSPacka mappingCSEClass = createEClass(MAPPING_CS); createEAttribute(mappingCSEClass, MAPPING_CS__IS_ABSTRACT); + createEReference(mappingCSEClass, MAPPING_CS__OVERRIDDEN); createEReference(mappingCSEClass, MAPPING_CS__OWNED_COMPOSED_MAPPINGS); createEReference(mappingCSEClass, MAPPING_CS__OWNED_DOMAINS); createEReference(mappingCSEClass, MAPPING_CS__OWNED_IN_PATH_NAME); createEReference(mappingCSEClass, MAPPING_CS__OWNED_MIDDLE); - createEReference(mappingCSEClass, MAPPING_CS__OVERRIDES); createEReference(mappingCSEClass, MAPPING_CS__REFINES); paramDeclarationCSEClass = createEClass(PARAM_DECLARATION_CS); @@ -960,11 +960,11 @@ public class QVTcoreCSPackageImpl extends EPackageImpl implements QVTcoreCSPacka initEClass(mappingCSEClass, MappingCS.class, "MappingCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMappingCS_IsAbstract(), ecorePackage.getEBoolean(), "isAbstract", "false", 0, 1, MappingCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMappingCS_Overridden(), theQVTcorePackage.getMapping(), null, "overridden", null, 0, 1, MappingCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getMappingCS_OwnedComposedMappings(), this.getMappingCS(), null, "ownedComposedMappings", null, 0, -1, MappingCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEReference(getMappingCS_OwnedDomains(), this.getDomainCS(), null, "ownedDomains", null, 0, -1, MappingCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getMappingCS_OwnedInPathName(), theBaseCSPackage.getPathNameCS(), null, "ownedInPathName", null, 0, 1, MappingCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getMappingCS_OwnedMiddle(), this.getDomainCS(), null, "ownedMiddle", null, 1, 1, MappingCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMappingCS_Overrides(), theQVTcorePackage.getMapping(), null, "overrides", null, 0, 1, MappingCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getMappingCS_Refines(), theQVTcorePackage.getMapping(), null, "refines", null, 0, -1, MappingCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(paramDeclarationCSEClass, ParamDeclarationCS.class, "ParamDeclarationCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore index 8933c38c8..a4d704c34 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore @@ -38,6 +38,7 @@ <eClassifiers xsi:type="ecore:EClass" name="MappingCS" eSuperTypes="../../org.eclipse.ocl.xtext.base/model/BaseCS.ecore#//NamedElementCS"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAbstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="overridden" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore#T-qvtcore-Mapping"/> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedComposedMappings" ordered="false" upperBound="-1" eType="#//MappingCS" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedDomains" upperBound="-1" @@ -46,7 +47,6 @@ containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedMiddle" lowerBound="1" eType="#//DomainCS" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="overrides" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore#T-qvtcore-Mapping"/> <eStructuralFeatures xsi:type="ecore:EReference" name="refines" upperBound="-1" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore#T-qvtcore-Mapping"/> </eClassifiers> diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.genmodel b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.genmodel index 8ea09ff67..3f1cdc1b7 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.genmodel +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.genmodel @@ -42,11 +42,11 @@ </genClasses> <genClasses ecoreClass="QVTcoreCS.ecore#//MappingCS"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute QVTcoreCS.ecore#//MappingCS/isAbstract"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTcoreCS.ecore#//MappingCS/overridden"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTcoreCS.ecore#//MappingCS/ownedComposedMappings"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTcoreCS.ecore#//MappingCS/ownedDomains"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTcoreCS.ecore#//MappingCS/ownedInPathName"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTcoreCS.ecore#//MappingCS/ownedMiddle"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTcoreCS.ecore#//MappingCS/overrides"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTcoreCS.ecore#//MappingCS/refines"/> </genClasses> <genClasses ecoreClass="QVTcoreCS.ecore#//ParamDeclarationCS"/> diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin Binary files differindex e8656a094..ddb0a83c6 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java index 71a08a374..61f590240 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java @@ -128,7 +128,7 @@ public class QVTcoreGrammarResource extends AbstractGrammarResource PR_GuardPatternCS.setAlternatives(createAlternatives(createGroup(createKeyword("("), createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_GuardVariableCS)), setCardinality("*", createGroup(createKeyword(","), createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_GuardVariableCS)))), createKeyword("|"), setCardinality("*", createAssignment("ownedPredicates", "+=", createRuleCall(PR_PredicateCS))), createKeyword(")")), createGroup(createKeyword("("), createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_GuardVariableCS)), setCardinality("*", createGroup(createKeyword(","), createAssignment("ownedUnrealizedVariables", "+=", createRuleCall(PR_GuardVariableCS)))), createKeyword(")")), createGroup(createKeyword("("), setCardinality("+", createAssignment("ownedPredicates", "+=", createRuleCall(PR_PredicateCS))), createKeyword(")")), createGroup(createAction(null, null, createTypeRef(MM, org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage.Literals.GUARD_PATTERN_CS)), createKeyword("("), createKeyword(")")))); PR_GuardVariableCS.setAlternatives(createGroup(createAssignment("name", "=", createRuleCall(PR_UnrestrictedName)), createKeyword(":"), createAssignment("ownedType", "=", createRuleCall(_EssentialOCL.PR_TypeExpCS)))); PR_ImportCS.setAlternatives(createGroup(createKeyword("import"), setCardinality("?", createGroup(createAssignment("name", "=", createRuleCall(_Base.PR_Identifier)), createKeyword(":"))), createAssignment("ownedPathName", "=", createRuleCall(_EssentialOCL.PR_URIPathNameCS)), setCardinality("?", createGroup(createAssignment("isAll", "?=", createKeyword("::")), createKeyword("*"))), createKeyword(";"))); - PR_MappingCS.setAlternatives(createGroup(createAction(null, null, createTypeRef(MM, org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage.Literals.MAPPING_CS)), setCardinality("?", createAssignment("isAbstract", "?=", createKeyword("abstract"))), createKeyword("map"), setCardinality("?", createAssignment("name", "=", createRuleCall(PR_UnrestrictedName))), setCardinality("?", createGroup(createKeyword("in"), createAssignment("ownedInPathName", "=", createRuleCall(_Base.PR_PathNameCS)))), setCardinality("?", createGroup(createKeyword("refines"), createAssignment("refines", "+=", createCrossReference(createTypeRef(MM_qvtcore, org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage.Literals.MAPPING), createRuleCall(PR_UnrestrictedName))), setCardinality("*", createGroup(createKeyword(","), createAssignment("refines", "+=", createCrossReference(createTypeRef(MM_qvtcore, org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage.Literals.MAPPING), createRuleCall(PR_UnrestrictedName))))))), setCardinality("?", createGroup(createKeyword("overrides"), createAssignment("overrides", "=", createCrossReference(createTypeRef(MM_qvtcore, org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage.Literals.MAPPING), createRuleCall(PR_UnrestrictedName))))), createKeyword("{"), setCardinality("*", createAssignment("ownedDomains", "+=", createRuleCall(PR_NamedDomainCS))), setCardinality("?", createGroup(createKeyword("where"), createAssignment("ownedMiddle", "=", createRuleCall(PR_UnnamedDomainCS)))), setCardinality("*", createAssignment("ownedComposedMappings", "+=", createRuleCall(PR_MappingCS))), createKeyword("}"))); + PR_MappingCS.setAlternatives(createGroup(createAction(null, null, createTypeRef(MM, org.eclipse.qvtd.xtext.qvtcorecs.QVTcoreCSPackage.Literals.MAPPING_CS)), setCardinality("?", createAssignment("isAbstract", "?=", createKeyword("abstract"))), createKeyword("map"), setCardinality("?", createAssignment("name", "=", createRuleCall(PR_UnrestrictedName))), setCardinality("?", createGroup(createKeyword("in"), createAssignment("ownedInPathName", "=", createRuleCall(_Base.PR_PathNameCS)))), setCardinality("?", createGroup(createKeyword("refines"), createAssignment("refines", "+=", createCrossReference(createTypeRef(MM_qvtcore, org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage.Literals.MAPPING), createRuleCall(PR_UnrestrictedName))), setCardinality("*", createGroup(createKeyword(","), createAssignment("refines", "+=", createCrossReference(createTypeRef(MM_qvtcore, org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage.Literals.MAPPING), createRuleCall(PR_UnrestrictedName))))))), setCardinality("?", createGroup(createKeyword("overrides"), createAssignment("overridden", "=", createCrossReference(createTypeRef(MM_qvtcore, org.eclipse.qvtd.pivot.qvtcore.QVTcorePackage.Literals.MAPPING), createRuleCall(PR_UnrestrictedName))))), createKeyword("{"), setCardinality("*", createAssignment("ownedDomains", "+=", createRuleCall(PR_NamedDomainCS))), setCardinality("?", createGroup(createKeyword("where"), createAssignment("ownedMiddle", "=", createRuleCall(PR_UnnamedDomainCS)))), setCardinality("*", createAssignment("ownedComposedMappings", "+=", createRuleCall(PR_MappingCS))), createKeyword("}"))); PR_NamedDomainCS.setAlternatives(createGroup(setCardinality("?", createAssignment("isCheck", "?=", createKeyword("check"))), setCardinality("?", createAssignment("isEnforce", "?=", createKeyword("enforce"))), createAssignment("direction", "=", createCrossReference(createTypeRef(MM_qvtbase, org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage.Literals.TYPED_MODEL), createRuleCall(PR_UnrestrictedName))), createAssignment("ownedGuardPattern", "=", createRuleCall(PR_GuardPatternCS)), createAssignment("ownedBottomPattern", "=", createRuleCall(PR_BottomPatternCS)))); PR_ParamDeclarationCS.setAlternatives(createGroup(createAssignment("name", "=", createRuleCall(PR_UnrestrictedName)), createKeyword(":"), createAssignment("ownedType", "=", createRuleCall(_EssentialOCL.PR_TypeExpCS)))); PR_PredicateCS.setAlternatives(createGroup(createAssignment("ownedCondition", "=", createRuleCall(_EssentialOCL.PR_ExpCS)), createKeyword(";"))); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g index b19f485d4..f5cd44868 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g @@ -1062,7 +1062,7 @@ ruleMappingCS returns [EObject current=null] } } { - newCompositeNode(grammarAccess.getMappingCSAccess().getOverridesMappingCrossReference_6_1_0()); + newCompositeNode(grammarAccess.getMappingCSAccess().getOverriddenMappingCrossReference_6_1_0()); } ruleUnrestrictedName { afterParserOrEnumRuleCall(); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java index 1b74febb5..45947d633 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java @@ -3267,7 +3267,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } if ( state.backtracking==0 ) { - newCompositeNode(grammarAccess.getMappingCSAccess().getOverridesMappingCrossReference_6_1_0()); + newCompositeNode(grammarAccess.getMappingCSAccess().getOverriddenMappingCrossReference_6_1_0()); } pushFollow(FollowSets000.FOLLOW_28); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java index ed31fc296..1ebe5eac3 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java @@ -599,7 +599,7 @@ public abstract class AbstractQVTcoreSemanticSequencer extends QVTbaseSemanticSe * name=UnrestrictedName? * ownedInPathName=PathNameCS? * (refines+=[Mapping|UnrestrictedName] refines+=[Mapping|UnrestrictedName]*)? - * overrides=[Mapping|UnrestrictedName]? + * overridden=[Mapping|UnrestrictedName]? * ownedDomains+=NamedDomainCS* * ownedMiddle=UnnamedDomainCS? * ownedComposedMappings+=MappingCS* diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java index c41d8bc7e..0d7429f3e 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java @@ -644,9 +644,9 @@ public class QVTcoreGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cRefinesMappingUnrestrictedNameParserRuleCall_5_2_1_0_1 = (RuleCall)cRefinesMappingCrossReference_5_2_1_0.eContents().get(1); private final Group cGroup_6 = (Group)cGroup.eContents().get(6); private final Keyword cOverridesKeyword_6_0 = (Keyword)cGroup_6.eContents().get(0); - private final Assignment cOverridesAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1); - private final CrossReference cOverridesMappingCrossReference_6_1_0 = (CrossReference)cOverridesAssignment_6_1.eContents().get(0); - private final RuleCall cOverridesMappingUnrestrictedNameParserRuleCall_6_1_0_1 = (RuleCall)cOverridesMappingCrossReference_6_1_0.eContents().get(1); + private final Assignment cOverriddenAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1); + private final CrossReference cOverriddenMappingCrossReference_6_1_0 = (CrossReference)cOverriddenAssignment_6_1.eContents().get(0); + private final RuleCall cOverriddenMappingUnrestrictedNameParserRuleCall_6_1_0_1 = (RuleCall)cOverriddenMappingCrossReference_6_1_0.eContents().get(1); private final Keyword cLeftCurlyBracketKeyword_7 = (Keyword)cGroup.eContents().get(7); private final Assignment cOwnedDomainsAssignment_8 = (Assignment)cGroup.eContents().get(8); private final RuleCall cOwnedDomainsNamedDomainCSParserRuleCall_8_0 = (RuleCall)cOwnedDomainsAssignment_8.eContents().get(0); @@ -661,13 +661,13 @@ public class QVTcoreGrammarAccess extends AbstractGrammarElementFinder { //MappingCS: // {MappingCS} isAbstract?='abstract'? 'map' name=UnrestrictedName? ('in' ownedInPathName=PathNameCS)? ('refines' // refines+=[qvtcore::Mapping|UnrestrictedName] (',' refines+=[qvtcore::Mapping|UnrestrictedName])*)? ('overrides' - // overrides=[qvtcore::Mapping|UnrestrictedName])? '{' ownedDomains+=NamedDomainCS* ('where' + // overridden=[qvtcore::Mapping|UnrestrictedName])? '{' ownedDomains+=NamedDomainCS* ('where' // ownedMiddle=UnnamedDomainCS)? ownedComposedMappings+=MappingCS* '}'; @Override public ParserRule getRule() { return rule; } //{MappingCS} isAbstract?='abstract'? 'map' name=UnrestrictedName? ('in' ownedInPathName=PathNameCS)? ('refines' //refines+=[qvtcore::Mapping|UnrestrictedName] (',' refines+=[qvtcore::Mapping|UnrestrictedName])*)? ('overrides' - //overrides=[qvtcore::Mapping|UnrestrictedName])? '{' ownedDomains+=NamedDomainCS* ('where' + //overridden=[qvtcore::Mapping|UnrestrictedName])? '{' ownedDomains+=NamedDomainCS* ('where' //ownedMiddle=UnnamedDomainCS)? ownedComposedMappings+=MappingCS* '}' public Group getGroup() { return cGroup; } @@ -731,20 +731,20 @@ public class QVTcoreGrammarAccess extends AbstractGrammarElementFinder { //UnrestrictedName public RuleCall getRefinesMappingUnrestrictedNameParserRuleCall_5_2_1_0_1() { return cRefinesMappingUnrestrictedNameParserRuleCall_5_2_1_0_1; } - //('overrides' overrides=[qvtcore::Mapping|UnrestrictedName])? + //('overrides' overridden=[qvtcore::Mapping|UnrestrictedName])? public Group getGroup_6() { return cGroup_6; } //'overrides' public Keyword getOverridesKeyword_6_0() { return cOverridesKeyword_6_0; } - //overrides=[qvtcore::Mapping|UnrestrictedName] - public Assignment getOverridesAssignment_6_1() { return cOverridesAssignment_6_1; } + //overridden=[qvtcore::Mapping|UnrestrictedName] + public Assignment getOverriddenAssignment_6_1() { return cOverriddenAssignment_6_1; } //[qvtcore::Mapping|UnrestrictedName] - public CrossReference getOverridesMappingCrossReference_6_1_0() { return cOverridesMappingCrossReference_6_1_0; } + public CrossReference getOverriddenMappingCrossReference_6_1_0() { return cOverriddenMappingCrossReference_6_1_0; } //UnrestrictedName - public RuleCall getOverridesMappingUnrestrictedNameParserRuleCall_6_1_0_1() { return cOverridesMappingUnrestrictedNameParserRuleCall_6_1_0_1; } + public RuleCall getOverriddenMappingUnrestrictedNameParserRuleCall_6_1_0_1() { return cOverriddenMappingUnrestrictedNameParserRuleCall_6_1_0_1; } //'{' public Keyword getLeftCurlyBracketKeyword_7() { return cLeftCurlyBracketKeyword_7; } @@ -1678,7 +1678,7 @@ public class QVTcoreGrammarAccess extends AbstractGrammarElementFinder { //MappingCS: // {MappingCS} isAbstract?='abstract'? 'map' name=UnrestrictedName? ('in' ownedInPathName=PathNameCS)? ('refines' // refines+=[qvtcore::Mapping|UnrestrictedName] (',' refines+=[qvtcore::Mapping|UnrestrictedName])*)? ('overrides' - // overrides=[qvtcore::Mapping|UnrestrictedName])? '{' ownedDomains+=NamedDomainCS* ('where' + // overridden=[qvtcore::Mapping|UnrestrictedName])? '{' ownedDomains+=NamedDomainCS* ('where' // ownedMiddle=UnnamedDomainCS)? ownedComposedMappings+=MappingCS* '}'; public MappingCSElements getMappingCSAccess() { return pMappingCS; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtext b/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtext index 79e12adde..559000d09 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtext +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtext @@ -66,7 +66,7 @@ ImportCS returns base::ImportCS: MappingCS: {MappingCS} isAbstract?='abstract'? 'map' name=UnrestrictedName? ('in' ownedInPathName=PathNameCS)? ('refines' refines+=[qvtcore::Mapping|UnrestrictedName] (',' refines+=[qvtcore::Mapping|UnrestrictedName])*)? - ('overrides' overrides=[qvtcore::Mapping|UnrestrictedName])? + ('overrides' overridden=[qvtcore::Mapping|UnrestrictedName])? '{' ownedDomains+=NamedDomainCS* ('where' ownedMiddle=UnnamedDomainCS)? ownedComposedMappings+=MappingCS* '}'; NamedDomainCS returns DomainCS: isCheck?='check'? isEnforce?='enforce'? direction=[qvtbase::TypedModel|UnrestrictedName] diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/as2cs/QVTcoreDeclarationVisitor.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/as2cs/QVTcoreDeclarationVisitor.java index a441b1c33..711bfb06c 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/as2cs/QVTcoreDeclarationVisitor.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/as2cs/QVTcoreDeclarationVisitor.java @@ -455,6 +455,10 @@ public class QVTcoreDeclarationVisitor extends QVTbaseDeclarationVisitor impleme csDomain.setOwnedBottomPattern(context.visitDeclaration(BottomPatternCS.class, asMapping.getBottomPattern())); csDomain.setOwnedGuardPattern(context.visitDeclaration(GuardPatternCS.class, asMapping.getGuardPattern())); csMapping.setOwnedMiddle(csDomain); + Rule asOverridden = asMapping.getOverridden(); + if (asOverridden instanceof Mapping) { + csMapping.setOverridden((Mapping)asOverridden); + } context.refreshList(csMapping.getOwnedComposedMappings(), context.visitDeclarations(MappingCS.class, asMapping.getLocal(), null)); PivotUtilInternal.refreshList(csMapping.getRefines(), asMapping.getSpecification()); return csMapping; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/cs2as/QVTcoreCSPreOrderVisitor.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/cs2as/QVTcoreCSPreOrderVisitor.java index e78168958..50f2a4612 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/cs2as/QVTcoreCSPreOrderVisitor.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/cs2as/QVTcoreCSPreOrderVisitor.java @@ -123,6 +123,7 @@ public class QVTcoreCSPreOrderVisitor extends AbstractQVTcoreCSPreOrderVisitor Mapping pMapping = PivotUtil.getPivot(Mapping.class, csElement); if (pMapping != null) { PivotUtilInternal.refreshList(pMapping.getSpecification(), csElement.getRefines()); + pMapping.setOverridden(csElement.getOverridden()); } return null; } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtextbin b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtextbin Binary files differindex ed092fe35..cad20691d 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtextbin +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtextbin diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/serializer/AbstractQVTimperativeSemanticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/serializer/AbstractQVTimperativeSemanticSequencer.java index 2f925d6ed..543aae6a9 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/serializer/AbstractQVTimperativeSemanticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/serializer/AbstractQVTimperativeSemanticSequencer.java @@ -549,8 +549,8 @@ public abstract class AbstractQVTimperativeSemanticSequencer extends QVTbaseSema errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, QVTimperativeCSPackage.Literals.APPEND_PARAMETER_BINDING_CS__VALUE)); } SequenceFeeder feeder = createSequencerFeeder(context, semanticObject); - feeder.accept(grammarAccess.getAppendParameterBindingCSAccess().getReferredVariableAppendParameterUnrestrictedNameParserRuleCall_0_0_1(), semanticObject.getReferredVariable()); - feeder.accept(grammarAccess.getAppendParameterBindingCSAccess().getValueConnectionVariableUnrestrictedNameParserRuleCall_2_0_1(), semanticObject.getValue()); + feeder.accept(grammarAccess.getAppendParameterBindingCSAccess().getReferredVariableAppendParameterUnrestrictedNameParserRuleCall_0_0_1(), semanticObject.eGet(QVTimperativeCSPackage.Literals.APPEND_PARAMETER_BINDING_CS__REFERRED_VARIABLE, false)); + feeder.accept(grammarAccess.getAppendParameterBindingCSAccess().getValueConnectionVariableUnrestrictedNameParserRuleCall_2_0_1(), semanticObject.eGet(QVTimperativeCSPackage.Literals.APPEND_PARAMETER_BINDING_CS__VALUE, false)); feeder.finish(); } @@ -675,7 +675,7 @@ public abstract class AbstractQVTimperativeSemanticSequencer extends QVTbaseSema errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, BaseCSPackage.Literals.TYPED_ELEMENT_CS__OWNED_TYPE)); } SequenceFeeder feeder = createSequencerFeeder(context, semanticObject); - feeder.accept(grammarAccess.getGuardParameterCSAccess().getReferredTypedModelImperativeTypedModelUnrestrictedNameParserRuleCall_2_0_1(), semanticObject.getReferredTypedModel()); + feeder.accept(grammarAccess.getGuardParameterCSAccess().getReferredTypedModelImperativeTypedModelUnrestrictedNameParserRuleCall_2_0_1(), semanticObject.eGet(QVTimperativeCSPackage.Literals.GUARD_PARAMETER_CS__REFERRED_TYPED_MODEL, false)); feeder.accept(grammarAccess.getGuardParameterCSAccess().getNameUnrestrictedNameParserRuleCall_3_0(), semanticObject.getName()); feeder.accept(grammarAccess.getGuardParameterCSAccess().getOwnedTypeTypeExpCSParserRuleCall_5_0(), semanticObject.getOwnedType()); feeder.finish(); @@ -911,7 +911,7 @@ public abstract class AbstractQVTimperativeSemanticSequencer extends QVTbaseSema errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, BaseCSPackage.Literals.TYPED_ELEMENT_CS__OWNED_TYPE)); } SequenceFeeder feeder = createSequencerFeeder(context, semanticObject); - feeder.accept(grammarAccess.getSimpleParameterCSAccess().getReferredTypedModelImperativeTypedModelUnrestrictedNameParserRuleCall_2_0_1(), semanticObject.getReferredTypedModel()); + feeder.accept(grammarAccess.getSimpleParameterCSAccess().getReferredTypedModelImperativeTypedModelUnrestrictedNameParserRuleCall_2_0_1(), semanticObject.eGet(QVTimperativeCSPackage.Literals.SIMPLE_PARAMETER_CS__REFERRED_TYPED_MODEL, false)); feeder.accept(grammarAccess.getSimpleParameterCSAccess().getNameUnrestrictedNameParserRuleCall_3_0(), semanticObject.getName()); feeder.accept(grammarAccess.getSimpleParameterCSAccess().getOwnedTypeTypeExpCSParserRuleCall_5_0(), semanticObject.getOwnedType()); feeder.finish(); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/serializer/AbstractQVTimperativeSyntacticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/serializer/AbstractQVTimperativeSyntacticSequencer.java index 9bd3ceafa..02c4b6df7 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/serializer/AbstractQVTimperativeSyntacticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/serializer/AbstractQVTimperativeSyntacticSequencer.java @@ -638,7 +638,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * (';' ('initial' UnrestrictedName? ':' ';')* 'derivation' UnrestrictedName? ':')* * ownedDefaultExpressions+=SpecificationCS * ) - * qualifiers+='!derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!derived' (ambiguity) qualifiers+='!derived' * qualifiers+='!derived' (ambiguity) qualifiers+='!id' @@ -656,7 +655,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!derived' (ambiguity) qualifiers+='unique' * qualifiers+='!derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='!derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='!id' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!id' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!id' (ambiguity) qualifiers+='!derived' * qualifiers+='!id' (ambiguity) qualifiers+='!id' @@ -674,7 +672,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!id' (ambiguity) qualifiers+='unique' * qualifiers+='!id' (ambiguity) qualifiers+='unsettable' * qualifiers+='!id' (ambiguity) qualifiers+='volatile' - * qualifiers+='!ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!ordered' (ambiguity) qualifiers+='!derived' * qualifiers+='!ordered' (ambiguity) qualifiers+='!id' @@ -692,7 +689,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!ordered' (ambiguity) qualifiers+='unique' * qualifiers+='!ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='!ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='!readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!readonly' (ambiguity) qualifiers+='!derived' * qualifiers+='!readonly' (ambiguity) qualifiers+='!id' @@ -710,7 +706,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!readonly' (ambiguity) qualifiers+='unique' * qualifiers+='!readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='!readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='!transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!transient' (ambiguity) qualifiers+='!derived' * qualifiers+='!transient' (ambiguity) qualifiers+='!id' @@ -728,7 +723,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!transient' (ambiguity) qualifiers+='unique' * qualifiers+='!transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='!transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unique' (ambiguity) qualifiers+='!derived' * qualifiers+='!unique' (ambiguity) qualifiers+='!id' @@ -746,7 +740,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!unique' (ambiguity) qualifiers+='unique' * qualifiers+='!unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unsettable' (ambiguity) qualifiers+='!derived' * qualifiers+='!unsettable' (ambiguity) qualifiers+='!id' @@ -764,7 +757,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='!unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='!volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!volatile' (ambiguity) qualifiers+='!derived' * qualifiers+='!volatile' (ambiguity) qualifiers+='!id' @@ -782,7 +774,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!volatile' (ambiguity) qualifiers+='unique' * qualifiers+='!volatile' (ambiguity) qualifiers+='unsettable' * qualifiers+='!volatile' (ambiguity) qualifiers+='volatile' - * qualifiers+='derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='derived' (ambiguity) qualifiers+='!derived' * qualifiers+='derived' (ambiguity) qualifiers+='!id' @@ -800,7 +791,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='derived' (ambiguity) qualifiers+='unique' * qualifiers+='derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='id' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='id' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='id' (ambiguity) qualifiers+='!derived' * qualifiers+='id' (ambiguity) qualifiers+='!id' @@ -818,7 +808,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='id' (ambiguity) qualifiers+='unique' * qualifiers+='id' (ambiguity) qualifiers+='unsettable' * qualifiers+='id' (ambiguity) qualifiers+='volatile' - * qualifiers+='ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='ordered' (ambiguity) qualifiers+='!derived' * qualifiers+='ordered' (ambiguity) qualifiers+='!id' @@ -836,7 +825,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='ordered' (ambiguity) qualifiers+='unique' * qualifiers+='ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='readonly' (ambiguity) qualifiers+='!derived' * qualifiers+='readonly' (ambiguity) qualifiers+='!id' @@ -854,7 +842,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='readonly' (ambiguity) qualifiers+='unique' * qualifiers+='readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='transient' (ambiguity) qualifiers+='!derived' * qualifiers+='transient' (ambiguity) qualifiers+='!id' @@ -872,7 +859,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='transient' (ambiguity) qualifiers+='unique' * qualifiers+='transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unique' (ambiguity) qualifiers+='!derived' * qualifiers+='unique' (ambiguity) qualifiers+='!id' @@ -890,7 +876,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='unique' (ambiguity) qualifiers+='unique' * qualifiers+='unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unsettable' (ambiguity) qualifiers+='!derived' * qualifiers+='unsettable' (ambiguity) qualifiers+='!id' @@ -908,7 +893,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='volatile' (ambiguity) qualifiers+='!derived' * qualifiers+='volatile' (ambiguity) qualifiers+='!id' @@ -1664,11 +1648,8 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * * This ambiguous syntax occurs at: * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (';' | ('{' '}')) (rule end) - * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (('{' '}') | ';') (rule end) * name=UnrestrictedName (ambiguity) (';' | ('{' '}')) (rule end) - * name=UnrestrictedName (ambiguity) (('{' '}') | ';') (rule end) * ownedSignature=TemplateSignatureCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSignature=TemplateSignatureCS (ambiguity) (('{' '}') | ';') (rule end) */ protected void emit_DataTypeCS___LeftCurlyBracketKeyword_5_0_SerializableKeyword_5_1_1_q_RightCurlyBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) { acceptNodes(transition, nodes); @@ -1695,13 +1676,10 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * This ambiguous syntax occurs at: * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) '{' ownedLiterals+=EnumerationLiteralCS * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (';' | ('{' '}')) (rule end) - * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (('{' '}') | ';') (rule end) * name=UnrestrictedName (ambiguity) '{' ownedLiterals+=EnumerationLiteralCS * name=UnrestrictedName (ambiguity) (';' | ('{' '}')) (rule end) - * name=UnrestrictedName (ambiguity) (('{' '}') | ';') (rule end) * ownedSignature=TemplateSignatureCS (ambiguity) '{' ownedLiterals+=EnumerationLiteralCS * ownedSignature=TemplateSignatureCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSignature=TemplateSignatureCS (ambiguity) (('{' '}') | ';') (rule end) */ protected void emit_EnumerationCS___LeftCurlyBracketKeyword_4_0_SerializableKeyword_4_1_1_q_RightCurlyBracketKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) { acceptNodes(transition, nodes); @@ -2371,7 +2349,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * (';' ('initial' UnrestrictedName? ':' ';')* 'derivation' UnrestrictedName? ':')* * ownedDefaultExpressions+=SpecificationCS * ) - * qualifiers+='!composes' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!composes' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!composes' (ambiguity) qualifiers+='!composes' * qualifiers+='!composes' (ambiguity) qualifiers+='!derived' @@ -2391,7 +2368,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!composes' (ambiguity) qualifiers+='unique' * qualifiers+='!composes' (ambiguity) qualifiers+='unsettable' * qualifiers+='!composes' (ambiguity) qualifiers+='volatile' - * qualifiers+='!derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!derived' (ambiguity) qualifiers+='!composes' * qualifiers+='!derived' (ambiguity) qualifiers+='!derived' @@ -2411,7 +2387,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!derived' (ambiguity) qualifiers+='unique' * qualifiers+='!derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='!derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='!ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!ordered' (ambiguity) qualifiers+='!composes' * qualifiers+='!ordered' (ambiguity) qualifiers+='!derived' @@ -2431,7 +2406,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!ordered' (ambiguity) qualifiers+='unique' * qualifiers+='!ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='!ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='!readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!readonly' (ambiguity) qualifiers+='!composes' * qualifiers+='!readonly' (ambiguity) qualifiers+='!derived' @@ -2451,7 +2425,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!readonly' (ambiguity) qualifiers+='unique' * qualifiers+='!readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='!readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='!resolve' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!resolve' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!resolve' (ambiguity) qualifiers+='!composes' * qualifiers+='!resolve' (ambiguity) qualifiers+='!derived' @@ -2471,7 +2444,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!resolve' (ambiguity) qualifiers+='unique' * qualifiers+='!resolve' (ambiguity) qualifiers+='unsettable' * qualifiers+='!resolve' (ambiguity) qualifiers+='volatile' - * qualifiers+='!transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!transient' (ambiguity) qualifiers+='!composes' * qualifiers+='!transient' (ambiguity) qualifiers+='!derived' @@ -2491,7 +2463,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!transient' (ambiguity) qualifiers+='unique' * qualifiers+='!transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='!transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unique' (ambiguity) qualifiers+='!composes' * qualifiers+='!unique' (ambiguity) qualifiers+='!derived' @@ -2511,7 +2482,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!unique' (ambiguity) qualifiers+='unique' * qualifiers+='!unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unsettable' (ambiguity) qualifiers+='!composes' * qualifiers+='!unsettable' (ambiguity) qualifiers+='!derived' @@ -2531,7 +2501,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='!unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='!volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!volatile' (ambiguity) qualifiers+='!composes' * qualifiers+='!volatile' (ambiguity) qualifiers+='!derived' @@ -2551,7 +2520,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='!volatile' (ambiguity) qualifiers+='unique' * qualifiers+='!volatile' (ambiguity) qualifiers+='unsettable' * qualifiers+='!volatile' (ambiguity) qualifiers+='volatile' - * qualifiers+='composes' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='composes' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='composes' (ambiguity) qualifiers+='!composes' * qualifiers+='composes' (ambiguity) qualifiers+='!derived' @@ -2571,7 +2539,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='composes' (ambiguity) qualifiers+='unique' * qualifiers+='composes' (ambiguity) qualifiers+='unsettable' * qualifiers+='composes' (ambiguity) qualifiers+='volatile' - * qualifiers+='derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='derived' (ambiguity) qualifiers+='!composes' * qualifiers+='derived' (ambiguity) qualifiers+='!derived' @@ -2591,7 +2558,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='derived' (ambiguity) qualifiers+='unique' * qualifiers+='derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='ordered' (ambiguity) qualifiers+='!composes' * qualifiers+='ordered' (ambiguity) qualifiers+='!derived' @@ -2611,7 +2577,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='ordered' (ambiguity) qualifiers+='unique' * qualifiers+='ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='readonly' (ambiguity) qualifiers+='!composes' * qualifiers+='readonly' (ambiguity) qualifiers+='!derived' @@ -2631,7 +2596,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='readonly' (ambiguity) qualifiers+='unique' * qualifiers+='readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='resolve' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='resolve' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='resolve' (ambiguity) qualifiers+='!composes' * qualifiers+='resolve' (ambiguity) qualifiers+='!derived' @@ -2651,7 +2615,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='resolve' (ambiguity) qualifiers+='unique' * qualifiers+='resolve' (ambiguity) qualifiers+='unsettable' * qualifiers+='resolve' (ambiguity) qualifiers+='volatile' - * qualifiers+='transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='transient' (ambiguity) qualifiers+='!composes' * qualifiers+='transient' (ambiguity) qualifiers+='!derived' @@ -2671,7 +2634,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='transient' (ambiguity) qualifiers+='unique' * qualifiers+='transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unique' (ambiguity) qualifiers+='!composes' * qualifiers+='unique' (ambiguity) qualifiers+='!derived' @@ -2691,7 +2653,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='unique' (ambiguity) qualifiers+='unique' * qualifiers+='unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unsettable' (ambiguity) qualifiers+='!composes' * qualifiers+='unsettable' (ambiguity) qualifiers+='!derived' @@ -2711,7 +2672,6 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * qualifiers+='unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='volatile' (ambiguity) qualifiers+='!composes' * qualifiers+='volatile' (ambiguity) qualifiers+='!derived' @@ -3555,19 +3515,15 @@ public abstract class AbstractQVTimperativeSyntacticSequencer extends AbstractSy * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) '{' ownedOperations+=OperationCS * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) '{' ownedProperties+=StructuralFeatureCS * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (';' | ('{' '}')) (rule end) - * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (('{' '}') | ';') (rule end) * name=UnrestrictedName (ambiguity) '{' ownedOperations+=OperationCS * name=UnrestrictedName (ambiguity) '{' ownedProperties+=StructuralFeatureCS * name=UnrestrictedName (ambiguity) (';' | ('{' '}')) (rule end) - * name=UnrestrictedName (ambiguity) (('{' '}') | ';') (rule end) * ownedSignature=TemplateSignatureCS (ambiguity) '{' ownedOperations+=OperationCS * ownedSignature=TemplateSignatureCS (ambiguity) '{' ownedProperties+=StructuralFeatureCS * ownedSignature=TemplateSignatureCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSignature=TemplateSignatureCS (ambiguity) (('{' '}') | ';') (rule end) * ownedSuperTypes+=TypedRefCS (ambiguity) '{' ownedOperations+=OperationCS * ownedSuperTypes+=TypedRefCS (ambiguity) '{' ownedProperties+=StructuralFeatureCS * ownedSuperTypes+=TypedRefCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSuperTypes+=TypedRefCS (ambiguity) (('{' '}') | ';') (rule end) */ protected void emit_StructuredClassCS___LeftCurlyBracketKeyword_6_0_RightCurlyBracketKeyword_6_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) { acceptNodes(transition, nodes); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/services/QVTimperativeGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/services/QVTimperativeGrammarAccess.java index 3bdd9f935..9acaabba1 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/services/QVTimperativeGrammarAccess.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/services/QVTimperativeGrammarAccess.java @@ -325,7 +325,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cSetStatementCSParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); //CommitStatementCS StatementCS: - // NewStatementCS | SetStatementCS + // NewStatementCS | SetStatementCS; @Override public ParserRule getRule() { return rule; } //NewStatementCS | SetStatementCS @@ -374,7 +374,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cMappingLoopCSParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); //ControlStatementCS MappingStatementCS: - // AddStatementCS | MappingCallCS | MappingLoopCS + // AddStatementCS | MappingCallCS | MappingLoopCS; @Override public ParserRule getRule() { return rule; } //AddStatementCS | MappingCallCS | MappingLoopCS @@ -695,7 +695,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cCheckStatementCSParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3); //GuardStatementCS StatementCS: - // BufferStatementCS | DeclareStatementCS | DeclareStatementCS | CheckStatementCS + // BufferStatementCS | DeclareStatementCS | DeclareStatementCS | CheckStatementCS; @Override public ParserRule getRule() { return rule; } //BufferStatementCS | DeclareStatementCS | DeclareStatementCS | CheckStatementCS @@ -731,7 +731,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cSemicolonKeyword_4 = (Keyword)cGroup.eContents().get(4); //ImportCS base::ImportCS: - // 'import' (name=Identifier ':')? ownedPathName=URIPathNameCS (isAll?='::' '*')? ';' + // 'import' (name=Identifier ':')? ownedPathName=URIPathNameCS (isAll?='::' '*')? ';'; @Override public ParserRule getRule() { return rule; } //'import' (name=Identifier ':')? ownedPathName=URIPathNameCS (isAll?='::' '*')? ';' @@ -953,7 +953,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //{MappingCallCS} public Action getMappingCallCSAction_0() { return cMappingCallCSAction_0; } - //('call' | isInstall?='install' | isInvoke?='invoke') + //'call' | isInstall?='install' | isInvoke?='invoke' public Alternatives getAlternatives_1() { return cAlternatives_1; } //'call' @@ -1087,7 +1087,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cOwnedTypeTypeExpCSParserRuleCall_1_1_0 = (RuleCall)cOwnedTypeAssignment_1_1.eContents().get(0); //MappingIteratorCS essentialocl::VariableCS: - // name=UnrestrictedName (':' ownedType=TypeExpCS)? + // name=UnrestrictedName (':' ownedType=TypeExpCS)?; @Override public ParserRule getRule() { return rule; } //name=UnrestrictedName (':' ownedType=TypeExpCS)? @@ -1343,7 +1343,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //QualifiedPackageCS qvtbasecs::QualifiedPackageCS: // 'package' ownedPathName=ScopeNameCS? name=UnrestrictedName (':' nsPrefix=UnrestrictedName)? ('=' nsURI=URI)? ('{' - // (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';') + // (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';'); @Override public ParserRule getRule() { return rule; } //'package' ownedPathName=ScopeNameCS? name=UnrestrictedName (':' nsPrefix=UnrestrictedName)? ('=' nsURI=URI)? ('{' @@ -1389,7 +1389,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //URI public RuleCall getNsURIURIParserRuleCall_4_1_0() { return cNsURIURIParserRuleCall_4_1_0; } - //('{' (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';') + //'{' (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';' public Alternatives getAlternatives_5() { return cAlternatives_5; } //'{' (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' @@ -1401,7 +1401,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //(ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* public Alternatives getAlternatives_5_0_1() { return cAlternatives_5_0_1; } - /// * ownedAnnotations+=AnnotationElementCS | * / ownedPackages+=QualifiedPackageCS + ///* ownedAnnotations+=AnnotationElementCS | */ ownedPackages+=QualifiedPackageCS public Assignment getOwnedPackagesAssignment_5_0_1_0() { return cOwnedPackagesAssignment_5_0_1_0; } //QualifiedPackageCS @@ -1524,7 +1524,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //TypeExpCS public RuleCall getOwnedTypeTypeExpCSParserRuleCall_8_0() { return cOwnedTypeTypeExpCSParserRuleCall_8_0; } - //(';' | '{' ownedExpression=ExpCS '}') + //';' | '{' ownedExpression=ExpCS '}' public Alternatives getAlternatives_9() { return cAlternatives_9; } //';' @@ -1558,7 +1558,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cColonColonKeyword_2_1 = (Keyword)cGroup_2.eContents().get(1); //ScopeNameCS base::PathNameCS: - // ownedPathElements+=FirstPathElementCS '::' (ownedPathElements+=NextPathElementCS '::')* + // ownedPathElements+=FirstPathElementCS '::' (ownedPathElements+=NextPathElementCS '::')*; @Override public ParserRule getRule() { return rule; } //ownedPathElements+=FirstPathElementCS '::' (ownedPathElements+=NextPathElementCS '::')* @@ -1680,7 +1680,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //UnrestrictedName public RuleCall getReferredPropertyPropertyUnrestrictedNameParserRuleCall_5_0_1() { return cReferredPropertyPropertyUnrestrictedNameParserRuleCall_5_0_1; } - //(':=' | isPartial?='+=') + //':=' | isPartial?='+=' public Alternatives getAlternatives_6() { return cAlternatives_6; } //':=' @@ -2180,7 +2180,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //CommitStatementCS StatementCS: - // NewStatementCS | SetStatementCS + // NewStatementCS | SetStatementCS; public CommitStatementCSElements getCommitStatementCSAccess() { return pCommitStatementCS; } @@ -2200,7 +2200,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //ControlStatementCS MappingStatementCS: - // AddStatementCS | MappingCallCS | MappingLoopCS + // AddStatementCS | MappingCallCS | MappingLoopCS; public ControlStatementCSElements getControlStatementCSAccess() { return pControlStatementCS; } @@ -2254,7 +2254,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //GuardStatementCS StatementCS: - // BufferStatementCS | DeclareStatementCS | DeclareStatementCS | CheckStatementCS + // BufferStatementCS | DeclareStatementCS | DeclareStatementCS | CheckStatementCS; public GuardStatementCSElements getGuardStatementCSAccess() { return pGuardStatementCS; } @@ -2264,7 +2264,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //ImportCS base::ImportCS: - // 'import' (name=Identifier ':')? ownedPathName=URIPathNameCS (isAll?='::' '*')? ';' + // 'import' (name=Identifier ':')? ownedPathName=URIPathNameCS (isAll?='::' '*')? ';'; public ImportCSElements getImportCSAccess() { return pImportCS; } @@ -2319,7 +2319,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //MappingIteratorCS essentialocl::VariableCS: - // name=UnrestrictedName (':' ownedType=TypeExpCS)? + // name=UnrestrictedName (':' ownedType=TypeExpCS)?; public MappingIteratorCSElements getMappingIteratorCSAccess() { return pMappingIteratorCS; } @@ -2372,7 +2372,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //QualifiedPackageCS qvtbasecs::QualifiedPackageCS: // 'package' ownedPathName=ScopeNameCS? name=UnrestrictedName (':' nsPrefix=UnrestrictedName)? ('=' nsURI=URI)? ('{' - // (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';') + // (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';'); public QualifiedPackageCSElements getQualifiedPackageCSAccess() { return pQualifiedPackageCS; } @@ -2394,7 +2394,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //ScopeNameCS base::PathNameCS: - // ownedPathElements+=FirstPathElementCS '::' (ownedPathElements+=NextPathElementCS '::')* + // ownedPathElements+=FirstPathElementCS '::' (ownedPathElements+=NextPathElementCS '::')*; public ScopeNameCSElements getScopeNameCSAccess() { return pScopeNameCS; } @@ -2477,7 +2477,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { // qualifiers+='!transient' | qualifiers+='unique' | qualifiers+='!unique' | qualifiers+='unsettable' | // qualifiers+='!unsettable' | qualifiers+='volatile' | qualifiers+='!volatile') ','?)+ '}')? ('{' ('initial' // super::UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' super::UnrestrictedName? - // ':' ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';') + // ':' ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';'); public QVTbaseGrammarAccess.AttributeCSElements getAttributeCSAccess() { return gaQVTbase.getAttributeCSAccess(); } @@ -2487,7 +2487,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //ClassCS base::ClassCS: - // StructuredClassCS | DataTypeCS | EnumerationCS + // StructuredClassCS | DataTypeCS | EnumerationCS; public QVTbaseGrammarAccess.ClassCSElements getClassCSAccess() { return gaQVTbase.getClassCSAccess(); } @@ -2499,8 +2499,8 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //DataTypeCS base::DataTypeCS: // isPrimitive?='primitive'? 'datatype' name=super::UnrestrictedName ownedSignature=TemplateSignatureCS? (':' // instanceClassName=SINGLE_QUOTED_STRING)? ('{' (isSerializable?='serializable' | '!serializable')? '}')? ('{' - // / *(ownedAnnotations+=AnnotationElementCS - // | ownedConstraints+=InvariantConstraintCS)* * / '}' | ';') + // /*(ownedAnnotations+=AnnotationElementCS + // | ownedConstraints+=InvariantConstraintCS)* */ '}' | ';'); public QVTbaseGrammarAccess.DataTypeCSElements getDataTypeCSAccess() { return gaQVTbase.getDataTypeCSAccess(); } @@ -2512,7 +2512,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //EnumerationCS base::EnumerationCS: // 'enum' name=super::UnrestrictedName ownedSignature=TemplateSignatureCS? (':' instanceClassName=SINGLE_QUOTED_STRING)? // ('{' (isSerializable?='serializable' | '!serializable')? '}')? ('{' ownedLiterals+=EnumerationLiteralCS - // / *| ownedConstraints+=InvariantConstraintCS* / * '}' | ';') + // /*| ownedConstraints+=InvariantConstraintCS*/* '}' | ';'); public QVTbaseGrammarAccess.EnumerationCSElements getEnumerationCSAccess() { return gaQVTbase.getEnumerationCSAccess(); } @@ -2523,7 +2523,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //EnumerationLiteralCS base::EnumerationLiteralCS: // ('literal' name=super::UnrestrictedName | name=EnumerationLiteralName) ('=' value=SIGNED)? ('{' - // / *ownedAnnotations+=AnnotationElementCS* * / '}' | ';') + // /*ownedAnnotations+=AnnotationElementCS* */ '}' | ';'); public QVTbaseGrammarAccess.EnumerationLiteralCSElements getEnumerationLiteralCSAccess() { return gaQVTbase.getEnumerationLiteralCSAccess(); } @@ -2538,7 +2538,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { // ownedParameters+=ParameterCS)*)? ')' (':' ownedType=TypedMultiplicityRefCS)? ('throws' ownedExceptions+=TypedRefCS // (',' ownedExceptions+=TypedRefCS)*)? ('{' ((qualifiers+='derived' | qualifiers+='!derived' | qualifiers+='ordered' | // qualifiers+='!ordered' | qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' ('body' - // super::UnrestrictedName? ':' ownedBodyExpressions+=SpecificationCS? ';')* '}' | ';') + // super::UnrestrictedName? ':' ownedBodyExpressions+=SpecificationCS? ';')* '}' | ';'); public QVTbaseGrammarAccess.OperationCSElements getOperationCSAccess() { return gaQVTbase.getOperationCSAccess(); } @@ -2550,7 +2550,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //ParameterCS base::ParameterCS: // name=super::UnrestrictedName (':' ownedType=TypedMultiplicityRefCS)? ('{' ((qualifiers+='ordered' | // qualifiers+='!ordered' | qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' - // / *ownedAnnotations+=AnnotationElementCS* * / '}')? + // /*ownedAnnotations+=AnnotationElementCS* */ '}')?; public QVTbaseGrammarAccess.ParameterCSElements getParameterCSAccess() { return gaQVTbase.getParameterCSAccess(); } @@ -2569,7 +2569,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { // qualifiers+='!unique' | qualifiers+='unsettable' | qualifiers+='!unsettable' | qualifiers+='volatile' | // qualifiers+='!volatile') ','?)+ '}')? ('{' ('initial' super::UnrestrictedName? ':' // ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' super::UnrestrictedName? ':' - // ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';') + // ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';'); public QVTbaseGrammarAccess.ReferenceCSElements getReferenceCSAccess() { return gaQVTbase.getReferenceCSAccess(); } @@ -2579,7 +2579,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //SpecificationCS essentialocl::ExpSpecificationCS: - // ownedExpression=ExpCS | exprString=UNQUOTED_STRING + // ownedExpression=ExpCS | exprString=UNQUOTED_STRING; public QVTbaseGrammarAccess.SpecificationCSElements getSpecificationCSAccess() { return gaQVTbase.getSpecificationCSAccess(); } @@ -2592,7 +2592,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { // isAbstract?='abstract'? 'class' name=super::UnrestrictedName ownedSignature=TemplateSignatureCS? ('extends' // ownedSuperTypes+=TypedRefCS (',' ownedSuperTypes+=TypedRefCS)*)? (':' instanceClassName=SINGLE_QUOTED_STRING)? ('{' // isInterface?='interface'? '}')? ('{' (ownedOperations+=OperationCS | ownedProperties+=StructuralFeatureCS - // / *| ownedConstraints+=InvariantConstraintCS* /)* '}' | ';') + // /*| ownedConstraints+=InvariantConstraintCS*/)* '}' | ';'); public QVTbaseGrammarAccess.StructuredClassCSElements getStructuredClassCSAccess() { return gaQVTbase.getStructuredClassCSAccess(); } @@ -2602,7 +2602,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //TypedMultiplicityRefCS base::TypedRefCS: - // TypedRefCS ownedMultiplicity=MultiplicityCS? + // TypedRefCS ownedMultiplicity=MultiplicityCS?; public QVTbaseGrammarAccess.TypedMultiplicityRefCSElements getTypedMultiplicityRefCSAccess() { return gaQVTbase.getTypedMultiplicityRefCSAccess(); } @@ -2612,7 +2612,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //StructuralFeatureCS base::StructuralFeatureCS: - // AttributeCS | ReferenceCS + // AttributeCS | ReferenceCS; public QVTbaseGrammarAccess.StructuralFeatureCSElements getStructuralFeatureCSAccess() { return gaQVTbase.getStructuralFeatureCSAccess(); } @@ -2643,7 +2643,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getQVTbaseUnrestrictedNameAccess().getRule(); } - /// * + ///* //| 'callable' //| 'import' //| 'key' @@ -2653,9 +2653,9 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //| 'postcondition' //| 'precondition' //| 'reference' - // * / + //*/ //SIGNED ecore::EInt: - // '-'? INT + // '-'? INT; public QVTbaseGrammarAccess.SIGNEDElements getSIGNEDAccess() { return gaQVTbase.getSIGNEDAccess(); } @@ -2674,7 +2674,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { ////generate essentialOCLCST "http://www.eclipse.org/ocl/3.0.0/EssentialOCLCST" // Model ContextCS: - // ownedExpression=ExpCS + // ownedExpression=ExpCS; public EssentialOCLGrammarAccess.ModelElements getModelAccess() { return gaEssentialOCL.getModelAccess(); } @@ -2683,7 +2683,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getModelAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLReservedKeyword: // 'and' | 'else' | 'endif' | 'if' | 'implies' | 'in' | 'let' | 'not' | 'or' | 'then' | 'xor'; public EssentialOCLGrammarAccess.EssentialOCLReservedKeywordElements getEssentialOCLReservedKeywordAccess() { @@ -2694,7 +2694,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLReservedKeywordAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLUnaryOperatorName: // '-' | 'not'; public EssentialOCLGrammarAccess.EssentialOCLUnaryOperatorNameElements getEssentialOCLUnaryOperatorNameAccess() { @@ -2705,7 +2705,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLUnaryOperatorNameAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLInfixOperatorName: // '*' | '/' | '+' | '-' | '>' | '<' | '>=' | '<=' | '=' | '<>' | 'and' | 'or' | 'xor' | 'implies'; public EssentialOCLGrammarAccess.EssentialOCLInfixOperatorNameElements getEssentialOCLInfixOperatorNameAccess() { @@ -2716,7 +2716,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLInfixOperatorNameAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLNavigationOperatorName: // '.' | '->' | '?.' | '?->'; public EssentialOCLGrammarAccess.EssentialOCLNavigationOperatorNameElements getEssentialOCLNavigationOperatorNameAccess() { @@ -2772,7 +2772,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { // ////--------------------------------------------------------------------- // - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLUnrestrictedName: // Identifier; public EssentialOCLGrammarAccess.EssentialOCLUnrestrictedNameElements getEssentialOCLUnrestrictedNameAccess() { @@ -2783,7 +2783,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLUnrestrictedNameAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLUnreservedName: // super::UnrestrictedName | CollectionTypeIdentifier | PrimitiveTypeIdentifier | 'Map' | 'Tuple'; public EssentialOCLGrammarAccess.EssentialOCLUnreservedNameElements getEssentialOCLUnreservedNameAccess() { @@ -2805,7 +2805,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //URIPathNameCS base::PathNameCS: - // ownedPathElements+=URIFirstPathElementCS ('::' ownedPathElements+=NextPathElementCS)* + // ownedPathElements+=URIFirstPathElementCS ('::' ownedPathElements+=NextPathElementCS)*; public EssentialOCLGrammarAccess.URIPathNameCSElements getURIPathNameCSAccess() { return gaEssentialOCL.getURIPathNameCSAccess(); } @@ -2816,7 +2816,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //URIFirstPathElementCS base::PathElementCS: // referredElement=[pivot::NamedElement|super::UnrestrictedName] | {base::PathElementWithURICS} - // referredElement=[pivot::Namespace|URI] + // referredElement=[pivot::Namespace|URI]; public EssentialOCLGrammarAccess.URIFirstPathElementCSElements getURIFirstPathElementCSAccess() { return gaEssentialOCL.getURIFirstPathElementCSAccess(); } @@ -2840,7 +2840,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //PrimitiveTypeCS base::PrimitiveTypeRefCS: - // name=PrimitiveTypeIdentifier + // name=PrimitiveTypeIdentifier; public EssentialOCLGrammarAccess.PrimitiveTypeCSElements getPrimitiveTypeCSAccess() { return gaEssentialOCL.getPrimitiveTypeCSAccess(); } @@ -2881,7 +2881,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //TupleTypeCS base::TupleTypeCS: - // name='Tuple' ('(' (ownedParts+=TuplePartCS (',' ownedParts+=TuplePartCS)*)? ')')? + // name='Tuple' ('(' (ownedParts+=TuplePartCS (',' ownedParts+=TuplePartCS)*)? ')')?; public EssentialOCLGrammarAccess.TupleTypeCSElements getTupleTypeCSAccess() { return gaEssentialOCL.getTupleTypeCSAccess(); } @@ -2891,7 +2891,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //TuplePartCS base::TuplePartCS: - // name=super::UnrestrictedName ':' ownedType=TypeExpCS + // name=super::UnrestrictedName ':' ownedType=TypeExpCS; public EssentialOCLGrammarAccess.TuplePartCSElements getTuplePartCSAccess() { return gaEssentialOCL.getTuplePartCSAccess(); } @@ -3078,7 +3078,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //TypeLiteralCS base::TypedRefCS: - // PrimitiveTypeCS | CollectionTypeCS | MapTypeCS | TupleTypeCS + // PrimitiveTypeCS | CollectionTypeCS | MapTypeCS | TupleTypeCS; public EssentialOCLGrammarAccess.TypeLiteralCSElements getTypeLiteralCSAccess() { return gaEssentialOCL.getTypeLiteralCSAccess(); } @@ -3088,7 +3088,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //TypeLiteralWithMultiplicityCS base::TypedRefCS: - // TypeLiteralCS ownedMultiplicity=MultiplicityCS? + // TypeLiteralCS ownedMultiplicity=MultiplicityCS?; public EssentialOCLGrammarAccess.TypeLiteralWithMultiplicityCSElements getTypeLiteralWithMultiplicityCSAccess() { return gaEssentialOCL.getTypeLiteralWithMultiplicityCSAccess(); } @@ -3118,7 +3118,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //TypeExpWithoutMultiplicityCS base::TypedRefCS: - // TypeNameExpCS | TypeLiteralCS | CollectionPatternCS + // TypeNameExpCS | TypeLiteralCS | CollectionPatternCS; public EssentialOCLGrammarAccess.TypeExpWithoutMultiplicityCSElements getTypeExpWithoutMultiplicityCSAccess() { return gaEssentialOCL.getTypeExpWithoutMultiplicityCSAccess(); } @@ -3128,7 +3128,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //TypeExpCS base::TypedRefCS: - // TypeExpWithoutMultiplicityCS ownedMultiplicity=MultiplicityCS? + // TypeExpWithoutMultiplicityCS ownedMultiplicity=MultiplicityCS?; public EssentialOCLGrammarAccess.TypeExpCSElements getTypeExpCSAccess() { return gaEssentialOCL.getTypeExpCSAccess(); } @@ -3151,8 +3151,8 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { // //// a = (64 / 16) / (let b : Integer in 8 / (let c : Integer in 4 )) // - /// * An expression elaborates a prefixed expression with zero or more binary operator and expression suffixes. - // * An optionally prefixed let expression is permitted except when suffixed with further expressions.* / + ///* An expression elaborates a prefixed expression with zero or more binary operator and expression suffixes. + // * An optionally prefixed let expression is permitted except when suffixed with further expressions.*/ //ExpCS: // PrefixedPrimaryExpCS ({InfixExpCS.ownedLeft=current} name=BinaryOperatorName ownedRight=ExpCS)? | PrefixedLetExpCS; public EssentialOCLGrammarAccess.ExpCSElements getExpCSAccess() { @@ -3163,9 +3163,9 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getExpCSAccess().getRule(); } - /// * A prefixed let expression elaborates a let expression with zero or more unary prefix operators. * / PrefixedLetExpCS + ///* A prefixed let expression elaborates a let expression with zero or more unary prefix operators. */ PrefixedLetExpCS //ExpCS: - // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedLetExpCS | LetExpCS + // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedLetExpCS | LetExpCS; public EssentialOCLGrammarAccess.PrefixedLetExpCSElements getPrefixedLetExpCSAccess() { return gaEssentialOCL.getPrefixedLetExpCSAccess(); } @@ -3174,9 +3174,9 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getPrefixedLetExpCSAccess().getRule(); } - /// * A prefixed primary expression elaborates a primary expression with zero or more unary prefix operators. * / + ///* A prefixed primary expression elaborates a primary expression with zero or more unary prefix operators. */ //PrefixedPrimaryExpCS ExpCS: - // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedPrimaryExpCS | PrimaryExpCS + // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedPrimaryExpCS | PrimaryExpCS; public EssentialOCLGrammarAccess.PrefixedPrimaryExpCSElements getPrefixedPrimaryExpCSAccess() { return gaEssentialOCL.getPrefixedPrimaryExpCSAccess(); } @@ -3185,10 +3185,10 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getPrefixedPrimaryExpCSAccess().getRule(); } - /// * A primary expression identifies the basic expressions from which more complex expressions may be constructed. * / + ///* A primary expression identifies the basic expressions from which more complex expressions may be constructed. */ //PrimaryExpCS ExpCS: // NestedExpCS | IfExpCS | SelfExpCS | PrimitiveLiteralExpCS | TupleLiteralExpCS | MapLiteralExpCS | - // CollectionLiteralExpCS | LambdaLiteralExpCS | TypeLiteralExpCS | NameExpCS + // CollectionLiteralExpCS | LambdaLiteralExpCS | TypeLiteralExpCS | NameExpCS; public EssentialOCLGrammarAccess.PrimaryExpCSElements getPrimaryExpCSAccess() { return gaEssentialOCL.getPrimaryExpCSAccess(); } @@ -3197,8 +3197,8 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getPrimaryExpCSAccess().getRule(); } - /// * A name expression is a generalised rule for expressions that start with a name and which may be followed by square, round or - // * curly bracket clauses and optionally an @pre as well.* / + ///* A name expression is a generalised rule for expressions that start with a name and which may be followed by square, round or + // * curly bracket clauses and optionally an @pre as well.*/ //NameExpCS: // ownedPathName=PathNameCS ownedSquareBracketedClauses+=SquareBracketedClauseCS* // ownedRoundBracketedClause=RoundBracketedClauseCS? ownedCurlyBracketedClause=CurlyBracketedClauseCS? (isPre?='@' @@ -3211,7 +3211,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getNameExpCSAccess().getRule(); } - /// * A curly bracket clause is a generalized rule for the literal arguments of collections, maps, tuples and shadows.* / + ///* A curly bracket clause is a generalized rule for the literal arguments of collections, maps, tuples and shadows.*/ //CurlyBracketedClauseCS: // {CurlyBracketedClauseCS} '{' (ownedParts+=ShadowPartCS (',' ownedParts+=ShadowPartCS)*)? '}'; public EssentialOCLGrammarAccess.CurlyBracketedClauseCSElements getCurlyBracketedClauseCSAccess() { @@ -3222,7 +3222,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getCurlyBracketedClauseCSAccess().getRule(); } - /// * A curly bracket clause is a generalized rule for template specialisations and operations arguments.* / + ///* A curly bracket clause is a generalized rule for template specialisations and operations arguments.*/ //RoundBracketedClauseCS: // {RoundBracketedClauseCS} '(' (ownedArguments+=NavigatingArgCS ownedArguments+=NavigatingCommaArgCS* // (ownedArguments+=NavigatingSemiArgCS ownedArguments+=NavigatingCommaArgCS*)? (ownedArguments+=NavigatingBarArgCS @@ -3235,7 +3235,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getRoundBracketedClauseCSAccess().getRule(); } - /// * A square bracket clause is a generalized rule for association class qualifiers and roles.* / SquareBracketedClauseCS: + ///* A square bracket clause is a generalized rule for association class qualifiers and roles.*/ SquareBracketedClauseCS: // '[' ownedTerms+=ExpCS (',' ownedTerms+=ExpCS)* ']'; public EssentialOCLGrammarAccess.SquareBracketedClauseCSElements getSquareBracketedClauseCSAccess() { return gaEssentialOCL.getSquareBracketedClauseCSAccess(); @@ -3245,8 +3245,8 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getSquareBracketedClauseCSAccess().getRule(); } - /// * A navigating argument is a generalized rule for the first argument in a round bracket clause. This is typically the first operation - // * parameter or an iterator. * / + ///* A navigating argument is a generalized rule for the first argument in a round bracket clause. This is typically the first operation + // * parameter or an iterator. */ //NavigatingArgCS: // ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)? | 'in' // ownedInitExpression=ExpCS)? | ':' ownedType=TypeExpCS; @@ -3260,9 +3260,9 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // - /// * A navigating bar argument is a generalized rule for a bar-prefixed argument in a round bracket clause. This is typically the body of an iteration. * / + ///* A navigating bar argument is a generalized rule for a bar-prefixed argument in a round bracket clause. This is typically the body of an iteration. */ //NavigatingBarArgCS NavigatingArgCS: - // prefix='|' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)? + // prefix='|' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)?; public EssentialOCLGrammarAccess.NavigatingBarArgCSElements getNavigatingBarArgCSAccess() { return gaEssentialOCL.getNavigatingBarArgCSAccess(); } @@ -3273,11 +3273,11 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // - /// * A navigating comma argument is a generalized rule for non-first argument in a round bracket clause. These are typically non-first operation - // * parameters or a second iterator. * / + ///* A navigating comma argument is a generalized rule for non-first argument in a round bracket clause. These are typically non-first operation + // * parameters or a second iterator. */ //NavigatingCommaArgCS NavigatingArgCS: // prefix=',' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)? | 'in' - // ownedInitExpression=ExpCS)? + // ownedInitExpression=ExpCS)?; public EssentialOCLGrammarAccess.NavigatingCommaArgCSElements getNavigatingCommaArgCSAccess() { return gaEssentialOCL.getNavigatingCommaArgCSAccess(); } @@ -3288,9 +3288,9 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // - /// * A navigating semi argument is a generalized rule for a semicolon prefixed argument in a round bracket clause. This is typically an iterate accumulator. * / + ///* A navigating semi argument is a generalized rule for a semicolon prefixed argument in a round bracket clause. This is typically an iterate accumulator. */ //NavigatingSemiArgCS NavigatingArgCS: - // prefix=';' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)? + // prefix=';' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)?; public EssentialOCLGrammarAccess.NavigatingSemiArgCSElements getNavigatingSemiArgCSAccess() { return gaEssentialOCL.getNavigatingSemiArgCSAccess(); } @@ -3301,7 +3301,8 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // NavigatingArgExpCS ExpCS: - // ExpCS + // ExpCS // '?' -- defined by Complete OCL + //; public EssentialOCLGrammarAccess.NavigatingArgExpCSElements getNavigatingArgExpCSAccess() { return gaEssentialOCL.getNavigatingArgExpCSAccess(); } @@ -3328,7 +3329,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { // //; // ElseIfThenExpCS //IfThenExpCS: - // 'elseif' ownedCondition=ExpCS 'then' ownedThenExpression=ExpCS + // 'elseif' ownedCondition=ExpCS 'then' ownedThenExpression=ExpCS; public EssentialOCLGrammarAccess.ElseIfThenExpCSElements getElseIfThenExpCSAccess() { return gaEssentialOCL.getElseIfThenExpCSAccess(); } @@ -3419,7 +3420,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //FirstPathElementCS PathElementCS: - // referredElement=[pivot::NamedElement|super::UnrestrictedName] + // referredElement=[pivot::NamedElement|super::UnrestrictedName]; public BaseGrammarAccess.FirstPathElementCSElements getFirstPathElementCSAccess() { return gaBase.getFirstPathElementCSAccess(); } @@ -3429,7 +3430,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //NextPathElementCS PathElementCS: - // referredElement=[pivot::NamedElement|super::UnreservedName] + // referredElement=[pivot::NamedElement|super::UnreservedName]; public BaseGrammarAccess.NextPathElementCSElements getNextPathElementCSAccess() { return gaBase.getNextPathElementCSAccess(); } @@ -3539,9 +3540,9 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getIdentifierAccess().getRule(); } - /// * A lowerbounded integer is used to define the lowerbound of a collection multiplicity. The value may not be the unlimited value. * / + ///* A lowerbounded integer is used to define the lowerbound of a collection multiplicity. The value may not be the unlimited value. */ //LOWER ecore::EInt: - // INT + // INT; public BaseGrammarAccess.LOWERElements getLOWERAccess() { return gaBase.getLOWERAccess(); } @@ -3550,13 +3551,13 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getLOWERAccess().getRule(); } - /// * A number may be an integer or floating point value. The declaration here appears to be that for just an integer. This is to avoid + ///* A number may be an integer or floating point value. The declaration here appears to be that for just an integer. This is to avoid // * lookahead conflicts in simple lexers between a dot within a floating point number and the dot-dot in a CollectionLiteralPartCS. A // * practical implementation should give high priority to a successful parse of INT ('.' INT)? (('e' | 'E') ('+' | '-')? INT)? than // * to the unsuccessful partial parse of INT '..'. The type of the INT terminal is String to allow the floating point syntax to be used. - // * / + // */ //NUMBER_LITERAL BigNumber: - // INT + // INT; public BaseGrammarAccess.NUMBER_LITERALElements getNUMBER_LITERALAccess() { return gaBase.getNUMBER_LITERALAccess(); } @@ -3576,9 +3577,9 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { return getStringLiteralAccess().getRule(); } - /// * An upperbounded integer is used to define the upperbound of a collection multiplicity. The value may be the unlimited value. * / + ///* An upperbounded integer is used to define the upperbound of a collection multiplicity. The value may be the unlimited value. */ //UPPER ecore::EInt: - // INT | '*' + // INT | '*'; public BaseGrammarAccess.UPPERElements getUPPERAccess() { return gaBase.getUPPERAccess(); } @@ -3646,7 +3647,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaBase.getML_COMMENTRule(); } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/AbstractQVTrelationProposalProvider.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/AbstractQVTrelationProposalProvider.java index 3981932cb..eab4d9886 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/AbstractQVTrelationProposalProvider.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/AbstractQVTrelationProposalProvider.java @@ -172,7 +172,7 @@ public class AbstractQVTrelationProposalProvider extends org.eclipse.qvtd.xtext. public void completeRelationCS_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeRelationCS_Overrides(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeRelationCS_Overridden(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor); } public void completeRelationCS_OwnedVarDeclarations(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/QVTrelationParser.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/QVTrelationParser.java index 923e93fbb..6b86bd3c3 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/QVTrelationParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/QVTrelationParser.java @@ -384,7 +384,7 @@ public class QVTrelationParser extends AbstractContentAssistParser { put(grammarAccess.getRelationCSAccess().getIsTopAssignment_0(), "rule__RelationCS__IsTopAssignment_0"); put(grammarAccess.getRelationCSAccess().getIsAbstractAssignment_1(), "rule__RelationCS__IsAbstractAssignment_1"); put(grammarAccess.getRelationCSAccess().getNameAssignment_3(), "rule__RelationCS__NameAssignment_3"); - put(grammarAccess.getRelationCSAccess().getOverridesAssignment_4_1(), "rule__RelationCS__OverridesAssignment_4_1"); + put(grammarAccess.getRelationCSAccess().getOverriddenAssignment_4_1(), "rule__RelationCS__OverriddenAssignment_4_1"); put(grammarAccess.getRelationCSAccess().getOwnedVarDeclarationsAssignment_6(), "rule__RelationCS__OwnedVarDeclarationsAssignment_6"); put(grammarAccess.getRelationCSAccess().getOwnedDomainsAssignment_7_0(), "rule__RelationCS__OwnedDomainsAssignment_7_0"); put(grammarAccess.getRelationCSAccess().getOwnedDomainsAssignment_7_1(), "rule__RelationCS__OwnedDomainsAssignment_7_1"); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g index 57c8bb538..366a329a8 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g @@ -10534,9 +10534,9 @@ rule__RelationCS__Group_4__1__Impl } : ( -{ before(grammarAccess.getRelationCSAccess().getOverridesAssignment_4_1()); } -(rule__RelationCS__OverridesAssignment_4_1) -{ after(grammarAccess.getRelationCSAccess().getOverridesAssignment_4_1()); } +{ before(grammarAccess.getRelationCSAccess().getOverriddenAssignment_4_1()); } +(rule__RelationCS__OverriddenAssignment_4_1) +{ after(grammarAccess.getRelationCSAccess().getOverriddenAssignment_4_1()); } ) ; @@ -27123,18 +27123,18 @@ finally { restoreStackSize(stackSize); } -rule__RelationCS__OverridesAssignment_4_1 +rule__RelationCS__OverriddenAssignment_4_1 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getRelationCSAccess().getOverridesRelationCrossReference_4_1_0()); } +{ before(grammarAccess.getRelationCSAccess().getOverriddenRelationCrossReference_4_1_0()); } ( -{ before(grammarAccess.getRelationCSAccess().getOverridesRelationUnrestrictedNameParserRuleCall_4_1_0_1()); } - ruleUnrestrictedName{ after(grammarAccess.getRelationCSAccess().getOverridesRelationUnrestrictedNameParserRuleCall_4_1_0_1()); } +{ before(grammarAccess.getRelationCSAccess().getOverriddenRelationUnrestrictedNameParserRuleCall_4_1_0_1()); } + ruleUnrestrictedName{ after(grammarAccess.getRelationCSAccess().getOverriddenRelationUnrestrictedNameParserRuleCall_4_1_0_1()); } ) -{ after(grammarAccess.getRelationCSAccess().getOverridesRelationCrossReference_4_1_0()); } +{ after(grammarAccess.getRelationCSAccess().getOverriddenRelationCrossReference_4_1_0()); } ) ; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelationParser.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelationParser.java index 1dc4decf5..4873d5921 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelationParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelationParser.java @@ -33410,26 +33410,26 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars // $ANTLR start "rule__RelationCS__Group_4__1__Impl" - // InternalQVTrelation.g:10531:1: rule__RelationCS__Group_4__1__Impl : ( ( rule__RelationCS__OverridesAssignment_4_1 ) ) ; + // InternalQVTrelation.g:10531:1: rule__RelationCS__Group_4__1__Impl : ( ( rule__RelationCS__OverriddenAssignment_4_1 ) ) ; public final void rule__RelationCS__Group_4__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalQVTrelation.g:10535:1: ( ( ( rule__RelationCS__OverridesAssignment_4_1 ) ) ) - // InternalQVTrelation.g:10536:1: ( ( rule__RelationCS__OverridesAssignment_4_1 ) ) + // InternalQVTrelation.g:10535:1: ( ( ( rule__RelationCS__OverriddenAssignment_4_1 ) ) ) + // InternalQVTrelation.g:10536:1: ( ( rule__RelationCS__OverriddenAssignment_4_1 ) ) { - // InternalQVTrelation.g:10536:1: ( ( rule__RelationCS__OverridesAssignment_4_1 ) ) - // InternalQVTrelation.g:10537:1: ( rule__RelationCS__OverridesAssignment_4_1 ) + // InternalQVTrelation.g:10536:1: ( ( rule__RelationCS__OverriddenAssignment_4_1 ) ) + // InternalQVTrelation.g:10537:1: ( rule__RelationCS__OverriddenAssignment_4_1 ) { if ( state.backtracking==0 ) { - before(grammarAccess.getRelationCSAccess().getOverridesAssignment_4_1()); + before(grammarAccess.getRelationCSAccess().getOverriddenAssignment_4_1()); } - // InternalQVTrelation.g:10538:1: ( rule__RelationCS__OverridesAssignment_4_1 ) - // InternalQVTrelation.g:10538:2: rule__RelationCS__OverridesAssignment_4_1 + // InternalQVTrelation.g:10538:1: ( rule__RelationCS__OverriddenAssignment_4_1 ) + // InternalQVTrelation.g:10538:2: rule__RelationCS__OverriddenAssignment_4_1 { pushFollow(FollowSets000.FOLLOW_2); - rule__RelationCS__OverridesAssignment_4_1(); + rule__RelationCS__OverriddenAssignment_4_1(); state._fsp--; if (state.failed) return ; @@ -33437,7 +33437,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars } if ( state.backtracking==0 ) { - after(grammarAccess.getRelationCSAccess().getOverridesAssignment_4_1()); + after(grammarAccess.getRelationCSAccess().getOverriddenAssignment_4_1()); } } @@ -79471,9 +79471,9 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars // $ANTLR end "rule__RelationCS__NameAssignment_3" - // $ANTLR start "rule__RelationCS__OverridesAssignment_4_1" - // InternalQVTrelation.g:27126:1: rule__RelationCS__OverridesAssignment_4_1 : ( ( ruleUnrestrictedName ) ) ; - public final void rule__RelationCS__OverridesAssignment_4_1() throws RecognitionException { + // $ANTLR start "rule__RelationCS__OverriddenAssignment_4_1" + // InternalQVTrelation.g:27126:1: rule__RelationCS__OverriddenAssignment_4_1 : ( ( ruleUnrestrictedName ) ) ; + public final void rule__RelationCS__OverriddenAssignment_4_1() throws RecognitionException { int stackSize = keepStackSize(); @@ -79485,13 +79485,13 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars // InternalQVTrelation.g:27132:1: ( ruleUnrestrictedName ) { if ( state.backtracking==0 ) { - before(grammarAccess.getRelationCSAccess().getOverridesRelationCrossReference_4_1_0()); + before(grammarAccess.getRelationCSAccess().getOverriddenRelationCrossReference_4_1_0()); } // InternalQVTrelation.g:27133:1: ( ruleUnrestrictedName ) // InternalQVTrelation.g:27134:1: ruleUnrestrictedName { if ( state.backtracking==0 ) { - before(grammarAccess.getRelationCSAccess().getOverridesRelationUnrestrictedNameParserRuleCall_4_1_0_1()); + before(grammarAccess.getRelationCSAccess().getOverriddenRelationUnrestrictedNameParserRuleCall_4_1_0_1()); } pushFollow(FollowSets000.FOLLOW_2); ruleUnrestrictedName(); @@ -79499,13 +79499,13 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars state._fsp--; if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getRelationCSAccess().getOverridesRelationUnrestrictedNameParserRuleCall_4_1_0_1()); + after(grammarAccess.getRelationCSAccess().getOverriddenRelationUnrestrictedNameParserRuleCall_4_1_0_1()); } } if ( state.backtracking==0 ) { - after(grammarAccess.getRelationCSAccess().getOverridesRelationCrossReference_4_1_0()); + after(grammarAccess.getRelationCSAccess().getOverriddenRelationCrossReference_4_1_0()); } } @@ -79525,7 +79525,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars } return ; } - // $ANTLR end "rule__RelationCS__OverridesAssignment_4_1" + // $ANTLR end "rule__RelationCS__OverriddenAssignment_4_1" // $ANTLR start "rule__RelationCS__OwnedVarDeclarationsAssignment_6" diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/QVTrelationCSPackage.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/QVTrelationCSPackage.java index 71bb4a162..62bcce2b9 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/QVTrelationCSPackage.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/QVTrelationCSPackage.java @@ -2033,13 +2033,13 @@ public interface QVTrelationCSPackage extends EPackage { int RELATION_CS__IS_TOP = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Overrides</b></em>' reference. + * The feature id for the '<em><b>Overridden</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int RELATION_CS__OVERRIDES = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 2; + int RELATION_CS__OVERRIDDEN = BaseCSPackage.NAMED_ELEMENT_CS_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Owned Var Declarations</b></em>' containment reference list. @@ -2988,15 +2988,15 @@ public interface QVTrelationCSPackage extends EPackage { EAttribute getRelationCS_IsTop(); /** - * Returns the meta object for the reference '{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOverrides <em>Overrides</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOverridden <em>Overridden</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Overrides</em>'. - * @see org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOverrides() + * @return the meta object for the reference '<em>Overridden</em>'. + * @see org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOverridden() * @see #getRelationCS() * @generated */ - EReference getRelationCS_Overrides(); + EReference getRelationCS_Overridden(); /** * Returns the meta object for the containment reference list '{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOwnedVarDeclarations <em>Owned Var Declarations</em>}'. @@ -3680,12 +3680,12 @@ public interface QVTrelationCSPackage extends EPackage { EAttribute RELATION_CS__IS_TOP = eINSTANCE.getRelationCS_IsTop(); /** - * The meta object literal for the '<em><b>Overrides</b></em>' reference feature. + * The meta object literal for the '<em><b>Overridden</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference RELATION_CS__OVERRIDES = eINSTANCE.getRelationCS_Overrides(); + EReference RELATION_CS__OVERRIDDEN = eINSTANCE.getRelationCS_Overridden(); /** * The meta object literal for the '<em><b>Owned Var Declarations</b></em>' containment reference list feature. diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/RelationCS.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/RelationCS.java index 86fa25459..32f4e7500 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/RelationCS.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/RelationCS.java @@ -25,7 +25,7 @@ import org.eclipse.qvtd.pivot.qvtrelation.Relation; * <ul> * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#isIsAbstract <em>Is Abstract</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#isIsTop <em>Is Top</em>}</li> - * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOverrides <em>Overrides</em>}</li> + * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOverridden <em>Overridden</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOwnedVarDeclarations <em>Owned Var Declarations</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOwnedDomains <em>Owned Domains</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOwnedWhen <em>Owned When</em>}</li> @@ -92,30 +92,30 @@ public interface RelationCS extends NamedElementCS { void setIsTop(boolean value); /** - * Returns the value of the '<em><b>Overrides</b></em>' reference. + * Returns the value of the '<em><b>Overridden</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Overrides</em>' reference isn't clear, + * If the meaning of the '<em>Overridden</em>' reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Overrides</em>' reference. - * @see #setOverrides(Relation) - * @see org.eclipse.qvtd.xtext.qvtrelationcs.QVTrelationCSPackage#getRelationCS_Overrides() + * @return the value of the '<em>Overridden</em>' reference. + * @see #setOverridden(Relation) + * @see org.eclipse.qvtd.xtext.qvtrelationcs.QVTrelationCSPackage#getRelationCS_Overridden() * @model * @generated */ - Relation getOverrides(); + Relation getOverridden(); /** - * Sets the value of the '{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOverrides <em>Overrides</em>}' reference. + * Sets the value of the '{@link org.eclipse.qvtd.xtext.qvtrelationcs.RelationCS#getOverridden <em>Overridden</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Overrides</em>' reference. - * @see #getOverrides() + * @param value the new value of the '<em>Overridden</em>' reference. + * @see #getOverridden() * @generated */ - void setOverrides(Relation value); + void setOverridden(Relation value); /** * Returns the value of the '<em><b>Owned Var Declarations</b></em>' containment reference list. diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/QVTrelationCSPackageImpl.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/QVTrelationCSPackageImpl.java index 59e03d273..82d812e09 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/QVTrelationCSPackageImpl.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/QVTrelationCSPackageImpl.java @@ -244,7 +244,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * + * * <p>This method is used to initialize {@link QVTrelationCSPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> @@ -281,7 +281,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio // Mark meta-data to indicate it can't be changed theQVTrelationCSPackage.freeze(); - + // Update the registry and return the package EPackage.Registry.INSTANCE.put(QVTrelationCSPackage.eNS_URI, theQVTrelationCSPackage); return theQVTrelationCSPackage; @@ -783,7 +783,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio * @generated */ @Override - public EReference getRelationCS_Overrides() { + public EReference getRelationCS_Overridden() { return (EReference)relationCSEClass.getEStructuralFeatures().get(2); } @@ -1102,7 +1102,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio relationCSEClass = createEClass(RELATION_CS); createEAttribute(relationCSEClass, RELATION_CS__IS_ABSTRACT); createEAttribute(relationCSEClass, RELATION_CS__IS_TOP); - createEReference(relationCSEClass, RELATION_CS__OVERRIDES); + createEReference(relationCSEClass, RELATION_CS__OVERRIDDEN); createEReference(relationCSEClass, RELATION_CS__OWNED_VAR_DECLARATIONS); createEReference(relationCSEClass, RELATION_CS__OWNED_DOMAINS); createEReference(relationCSEClass, RELATION_CS__OWNED_WHEN); @@ -1261,7 +1261,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio initEClass(relationCSEClass, RelationCS.class, "RelationCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getRelationCS_IsAbstract(), ecorePackage.getEBoolean(), "isAbstract", "false", 0, 1, RelationCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getRelationCS_IsTop(), ecorePackage.getEBoolean(), "isTop", "false", 0, 1, RelationCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRelationCS_Overrides(), theQVTrelationPackage.getRelation(), null, "overrides", null, 0, 1, RelationCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRelationCS_Overridden(), theQVTrelationPackage.getRelation(), null, "overridden", null, 0, 1, RelationCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getRelationCS_OwnedVarDeclarations(), this.getVarDeclarationCS(), null, "ownedVarDeclarations", null, 0, -1, RelationCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getRelationCS_OwnedDomains(), this.getAbstractDomainCS(), null, "ownedDomains", null, 0, -1, RelationCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getRelationCS_OwnedWhen(), this.getPatternCS(), null, "ownedWhen", null, 0, 1, RelationCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/RelationCSImpl.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/RelationCSImpl.java index befd6bed5..4902a66e0 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/RelationCSImpl.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/RelationCSImpl.java @@ -41,7 +41,7 @@ import org.eclipse.qvtd.xtext.qvtrelationcs.util.QVTrelationCSVisitor; * <ul> * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.RelationCSImpl#isIsAbstract <em>Is Abstract</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.RelationCSImpl#isIsTop <em>Is Top</em>}</li> - * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.RelationCSImpl#getOverrides <em>Overrides</em>}</li> + * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.RelationCSImpl#getOverridden <em>Overridden</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.RelationCSImpl#getOwnedVarDeclarations <em>Owned Var Declarations</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.RelationCSImpl#getOwnedDomains <em>Owned Domains</em>}</li> * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.RelationCSImpl#getOwnedWhen <em>Owned When</em>}</li> @@ -92,14 +92,14 @@ public class RelationCSImpl extends NamedElementCSImpl implements RelationCS { protected boolean isTop = IS_TOP_EDEFAULT; /** - * The cached value of the '{@link #getOverrides() <em>Overrides</em>}' reference. + * The cached value of the '{@link #getOverridden() <em>Overridden</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getOverrides() + * @see #getOverridden() * @generated * @ordered */ - protected Relation overrides; + protected Relation overridden; /** * The cached value of the '{@link #getOwnedVarDeclarations() <em>Owned Var Declarations</em>}' containment reference list. @@ -212,16 +212,16 @@ public class RelationCSImpl extends NamedElementCSImpl implements RelationCS { * @generated */ @Override - public Relation getOverrides() { - if (overrides != null && overrides.eIsProxy()) { - InternalEObject oldOverrides = (InternalEObject)overrides; - overrides = (Relation)eResolveProxy(oldOverrides); - if (overrides != oldOverrides) { + public Relation getOverridden() { + if (overridden != null && overridden.eIsProxy()) { + InternalEObject oldOverridden = (InternalEObject)overridden; + overridden = (Relation)eResolveProxy(oldOverridden); + if (overridden != oldOverridden) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTrelationCSPackage.RELATION_CS__OVERRIDES, oldOverrides, overrides)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTrelationCSPackage.RELATION_CS__OVERRIDDEN, oldOverridden, overridden)); } } - return overrides; + return overridden; } /** @@ -229,8 +229,8 @@ public class RelationCSImpl extends NamedElementCSImpl implements RelationCS { * <!-- end-user-doc --> * @generated */ - public Relation basicGetOverrides() { - return overrides; + public Relation basicGetOverridden() { + return overridden; } /** @@ -239,11 +239,11 @@ public class RelationCSImpl extends NamedElementCSImpl implements RelationCS { * @generated */ @Override - public void setOverrides(Relation newOverrides) { - Relation oldOverrides = overrides; - overrides = newOverrides; + public void setOverridden(Relation newOverridden) { + Relation oldOverridden = overridden; + overridden = newOverridden; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, QVTrelationCSPackage.RELATION_CS__OVERRIDES, oldOverrides, overrides)); + eNotify(new ENotificationImpl(this, Notification.SET, QVTrelationCSPackage.RELATION_CS__OVERRIDDEN, oldOverridden, overridden)); } /** @@ -404,9 +404,9 @@ public class RelationCSImpl extends NamedElementCSImpl implements RelationCS { return isIsAbstract(); case QVTrelationCSPackage.RELATION_CS__IS_TOP: return isIsTop(); - case QVTrelationCSPackage.RELATION_CS__OVERRIDES: - if (resolve) return getOverrides(); - return basicGetOverrides(); + case QVTrelationCSPackage.RELATION_CS__OVERRIDDEN: + if (resolve) return getOverridden(); + return basicGetOverridden(); case QVTrelationCSPackage.RELATION_CS__OWNED_VAR_DECLARATIONS: return getOwnedVarDeclarations(); case QVTrelationCSPackage.RELATION_CS__OWNED_DOMAINS: @@ -434,8 +434,8 @@ public class RelationCSImpl extends NamedElementCSImpl implements RelationCS { case QVTrelationCSPackage.RELATION_CS__IS_TOP: setIsTop((Boolean)newValue); return; - case QVTrelationCSPackage.RELATION_CS__OVERRIDES: - setOverrides((Relation)newValue); + case QVTrelationCSPackage.RELATION_CS__OVERRIDDEN: + setOverridden((Relation)newValue); return; case QVTrelationCSPackage.RELATION_CS__OWNED_VAR_DECLARATIONS: getOwnedVarDeclarations().clear(); @@ -469,8 +469,8 @@ public class RelationCSImpl extends NamedElementCSImpl implements RelationCS { case QVTrelationCSPackage.RELATION_CS__IS_TOP: setIsTop(IS_TOP_EDEFAULT); return; - case QVTrelationCSPackage.RELATION_CS__OVERRIDES: - setOverrides((Relation)null); + case QVTrelationCSPackage.RELATION_CS__OVERRIDDEN: + setOverridden((Relation)null); return; case QVTrelationCSPackage.RELATION_CS__OWNED_VAR_DECLARATIONS: getOwnedVarDeclarations().clear(); @@ -500,8 +500,8 @@ public class RelationCSImpl extends NamedElementCSImpl implements RelationCS { return isAbstract != IS_ABSTRACT_EDEFAULT; case QVTrelationCSPackage.RELATION_CS__IS_TOP: return isTop != IS_TOP_EDEFAULT; - case QVTrelationCSPackage.RELATION_CS__OVERRIDES: - return overrides != null; + case QVTrelationCSPackage.RELATION_CS__OVERRIDDEN: + return overridden != null; case QVTrelationCSPackage.RELATION_CS__OWNED_VAR_DECLARATIONS: return ownedVarDeclarations != null && !ownedVarDeclarations.isEmpty(); case QVTrelationCSPackage.RELATION_CS__OWNED_DOMAINS: diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore b/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore index 9ff5949c9..2c2b6b4c6 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore @@ -95,7 +95,7 @@ defaultValueLiteral="false"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isTop" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="overrides" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore#T-qvtrelation-Relation"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="overridden" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore#T-qvtrelation-Relation"/> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedVarDeclarations" upperBound="-1" eType="#//VarDeclarationCS" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedDomains" upperBound="-1" diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.genmodel b/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.genmodel index 7f6600db5..12882413e 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.genmodel +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.genmodel @@ -78,7 +78,7 @@ <genClasses ecoreClass="QVTrelationCS.ecore#//RelationCS"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute QVTrelationCS.ecore#//RelationCS/isAbstract"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute QVTrelationCS.ecore#//RelationCS/isTop"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTrelationCS.ecore#//RelationCS/overrides"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTrelationCS.ecore#//RelationCS/overridden"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTrelationCS.ecore#//RelationCS/ownedVarDeclarations"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTrelationCS.ecore#//RelationCS/ownedDomains"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTrelationCS.ecore#//RelationCS/ownedWhen"/> diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtextbin b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtextbin Binary files differindex d2eb4dc72..c46637ba6 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtextbin +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtextbin diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelationGrammarResource.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelationGrammarResource.java index 1051e7104..0b8f8516d 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelationGrammarResource.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelationGrammarResource.java @@ -150,7 +150,7 @@ public class QVTrelationGrammarResource extends AbstractGrammarResource PR_QVTrelationUnrestrictedName.setAlternatives(createAlternatives(createKeyword("abstract"), createKeyword("checkonly"), createKeyword("default_values"), createKeyword("domain"), createKeyword("enforce"), createKeyword("extends"), createKeyword("implementedby"), createKeyword("import"), createKeyword("library"), createKeyword("key"), createKeyword("opposite"), createKeyword("overrides"), createKeyword("package"), createKeyword("primitive"), createKeyword("query"), createKeyword("relation"), createKeyword("replace"), createKeyword("top"), createKeyword("transformation"), createKeyword("uses"), createKeyword("when"), createKeyword("where"))); PR_QualifiedPackageCS.setAlternatives(createGroup(createKeyword("package"), setCardinality("?", createAssignment("ownedPathName", "=", createRuleCall(PR_ScopeNameCS))), createAssignment("name", "=", createRuleCall(PR_UnrestrictedName)), setCardinality("?", createGroup(createKeyword(":"), createAssignment("nsPrefix", "=", createRuleCall(PR_UnrestrictedName)))), setCardinality("?", createGroup(createKeyword("="), createAssignment("nsURI", "=", createRuleCall(_Base.PR_URI)))), createAlternatives(createGroup(createKeyword("{"), setCardinality("*", createAlternatives(createAssignment("ownedPackages", "+=", createRuleCall(PR_QualifiedPackageCS)), createAssignment("ownedClasses", "+=", createAlternatives(createRuleCall(_QVTbase.PR_ClassCS), createRuleCall(PR_TransformationCS))))), createKeyword("}")), createKeyword(";")))); PR_QueryCS.setAlternatives(createGroup(setCardinality("?", createAssignment("isTransient", "?=", createKeyword("transient"))), createKeyword("query"), createAssignment("name", "=", createRuleCall(PR_UnrestrictedName)), createKeyword("("), setCardinality("?", createGroup(createAssignment("ownedParameters", "+=", createRuleCall(PR_ParamDeclarationCS)), setCardinality("*", createGroup(createKeyword(","), createAssignment("ownedParameters", "+=", createRuleCall(PR_ParamDeclarationCS)))))), createKeyword(")"), createKeyword(":"), createAssignment("ownedType", "=", createRuleCall(_EssentialOCL.PR_TypeExpCS)), createAlternatives(createKeyword(";"), createGroup(createKeyword("{"), createAssignment("ownedExpression", "=", createRuleCall(_EssentialOCL.PR_ExpCS)), createKeyword("}"))))); - PR_RelationCS.setAlternatives(createGroup(setCardinality("?", createAssignment("isTop", "?=", createKeyword("top"))), setCardinality("?", createAssignment("isAbstract", "?=", createKeyword("abstract"))), createKeyword("relation"), createAssignment("name", "=", createRuleCall(PR_UnrestrictedName)), setCardinality("?", createGroup(createKeyword("overrides"), createAssignment("overrides", "=", createCrossReference(createTypeRef(MM_qvtrelation, org.eclipse.qvtd.pivot.qvtrelation.QVTrelationPackage.Literals.RELATION), createRuleCall(PR_UnrestrictedName))))), createKeyword("{"), setCardinality("*", createAssignment("ownedVarDeclarations", "+=", createRuleCall(PR_VarDeclarationCS))), setCardinality("+", createAlternatives(createAssignment("ownedDomains", "+=", createRuleCall(PR_DomainCS)), createAssignment("ownedDomains", "+=", createRuleCall(PR_PrimitiveTypeDomainCS)))), setCardinality("?", createAssignment("ownedWhen", "=", createRuleCall(PR_WhenCS))), setCardinality("?", createAssignment("ownedWhere", "=", createRuleCall(PR_WhereCS))), createKeyword("}"))); + PR_RelationCS.setAlternatives(createGroup(setCardinality("?", createAssignment("isTop", "?=", createKeyword("top"))), setCardinality("?", createAssignment("isAbstract", "?=", createKeyword("abstract"))), createKeyword("relation"), createAssignment("name", "=", createRuleCall(PR_UnrestrictedName)), setCardinality("?", createGroup(createKeyword("overrides"), createAssignment("overridden", "=", createCrossReference(createTypeRef(MM_qvtrelation, org.eclipse.qvtd.pivot.qvtrelation.QVTrelationPackage.Literals.RELATION), createRuleCall(PR_UnrestrictedName))))), createKeyword("{"), setCardinality("*", createAssignment("ownedVarDeclarations", "+=", createRuleCall(PR_VarDeclarationCS))), setCardinality("+", createAlternatives(createAssignment("ownedDomains", "+=", createRuleCall(PR_DomainCS)), createAssignment("ownedDomains", "+=", createRuleCall(PR_PrimitiveTypeDomainCS)))), setCardinality("?", createAssignment("ownedWhen", "=", createRuleCall(PR_WhenCS))), setCardinality("?", createAssignment("ownedWhere", "=", createRuleCall(PR_WhereCS))), createKeyword("}"))); PR_ScopeNameCS.setAlternatives(createGroup(createAssignment("ownedPathElements", "+=", createRuleCall(_Base.PR_FirstPathElementCS)), createKeyword("::"), setCardinality("*", createGroup(createAssignment("ownedPathElements", "+=", createRuleCall(_Base.PR_NextPathElementCS)), createKeyword("::"))))); PR_TemplateCS.setAlternatives(createGroup(createAlternatives(createRuleCall(PR_CollectionTemplateCS), createRuleCall(PR_ObjectTemplateCS)), setCardinality("?", createGroup(createKeyword("{"), createAssignment("ownedGuardExpression", "=", createRuleCall(_EssentialOCL.PR_ExpCS)), createKeyword("}"))))); PR_TopLevelCS.setAlternatives(createGroup(setCardinality("*", createAssignment("ownedImports", "+=", createRuleCall(PR_UnitCS))), setCardinality("*", createAlternatives(createAssignment("ownedPackages", "+=", createRuleCall(PR_QualifiedPackageCS)), createAssignment("ownedTransformations", "+=", createRuleCall(PR_TransformationCS)))))); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g index 72cb40ca2..1dc48e23d 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g @@ -1800,7 +1800,7 @@ ruleRelationCS returns [EObject current=null] } } { - newCompositeNode(grammarAccess.getRelationCSAccess().getOverridesRelationCrossReference_4_1_0()); + newCompositeNode(grammarAccess.getRelationCSAccess().getOverriddenRelationCrossReference_4_1_0()); } ruleUnrestrictedName { afterParserOrEnumRuleCall(); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelationParser.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelationParser.java index 58336e648..9ba8237e7 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelationParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelationParser.java @@ -5087,7 +5087,7 @@ public class InternalQVTrelationParser extends AbstractInternalAntlrParser { } if ( state.backtracking==0 ) { - newCompositeNode(grammarAccess.getRelationCSAccess().getOverridesRelationCrossReference_4_1_0()); + newCompositeNode(grammarAccess.getRelationCSAccess().getOverriddenRelationCrossReference_4_1_0()); } pushFollow(FollowSets000.FOLLOW_13); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSemanticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSemanticSequencer.java index b53bd5c70..27fb5dfcb 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSemanticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSemanticSequencer.java @@ -589,8 +589,8 @@ public abstract class AbstractQVTrelationSemanticSequencer extends QVTbaseSemant * ownedType=CollectionTypeCS * ( * (ownedMemberIdentifiers+=TemplateCS | ownedMemberIdentifiers+=ElementTemplateCS) - * ownedMemberIdentifiers+=TemplateCS? - * (ownedMemberIdentifiers+=ElementTemplateCS? ownedMemberIdentifiers+=TemplateCS?)* + * ownedMemberIdentifiers+=ElementTemplateCS? + * (ownedMemberIdentifiers+=TemplateCS? ownedMemberIdentifiers+=ElementTemplateCS?)* * ownedRestIdentifier=ElementTemplateCS * )? * ownedGuardExpression=ExpCS? @@ -650,7 +650,7 @@ public abstract class AbstractQVTrelationSemanticSequencer extends QVTbaseSemant errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, QVTrelationCSPackage.Literals.DEFAULT_VALUE_CS__OWNED_INIT_EXPRESSION)); } SequenceFeeder feeder = createSequencerFeeder(context, semanticObject); - feeder.accept(grammarAccess.getDefaultValueCSAccess().getPropertyIdSharedVariableUnrestrictedNameParserRuleCall_0_0_1(), semanticObject.getPropertyId()); + feeder.accept(grammarAccess.getDefaultValueCSAccess().getPropertyIdSharedVariableUnrestrictedNameParserRuleCall_0_0_1(), semanticObject.eGet(QVTrelationCSPackage.Literals.DEFAULT_VALUE_CS__PROPERTY_ID, false)); feeder.accept(grammarAccess.getDefaultValueCSAccess().getOwnedInitExpressionExpCSParserRuleCall_2_0(), semanticObject.getOwnedInitExpression()); feeder.finish(); } @@ -706,7 +706,7 @@ public abstract class AbstractQVTrelationSemanticSequencer extends QVTbaseSemant errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, QVTrelationCSPackage.Literals.ELEMENT_TEMPLATE_CS__IDENTIFIER)); } SequenceFeeder feeder = createSequencerFeeder(context, semanticObject); - feeder.accept(grammarAccess.getElementTemplateCSAccess().getIdentifierSharedVariableUnrestrictedNameParserRuleCall_0_1(), semanticObject.getIdentifier()); + feeder.accept(grammarAccess.getElementTemplateCSAccess().getIdentifierSharedVariableUnrestrictedNameParserRuleCall_0_1(), semanticObject.eGet(QVTrelationCSPackage.Literals.ELEMENT_TEMPLATE_CS__IDENTIFIER, false)); feeder.finish(); } @@ -928,7 +928,7 @@ public abstract class AbstractQVTrelationSemanticSequencer extends QVTbaseSemant * isTop?='top'? * isAbstract?='abstract'? * name=UnrestrictedName - * overrides=[Relation|UnrestrictedName]? + * overridden=[Relation|UnrestrictedName]? * ownedVarDeclarations+=VarDeclarationCS* * (ownedDomains+=DomainCS | ownedDomains+=PrimitiveTypeDomainCS)+ * ownedWhen=WhenCS? diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSyntacticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSyntacticSequencer.java index 9f194b82d..845be6f6e 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSyntacticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSyntacticSequencer.java @@ -642,7 +642,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * (';' ('initial' UnrestrictedName? ':' ';')* 'derivation' UnrestrictedName? ':')* * ownedDefaultExpressions+=SpecificationCS * ) - * qualifiers+='!derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!derived' (ambiguity) qualifiers+='!derived' * qualifiers+='!derived' (ambiguity) qualifiers+='!id' @@ -660,7 +659,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!derived' (ambiguity) qualifiers+='unique' * qualifiers+='!derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='!derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='!id' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!id' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!id' (ambiguity) qualifiers+='!derived' * qualifiers+='!id' (ambiguity) qualifiers+='!id' @@ -678,7 +676,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!id' (ambiguity) qualifiers+='unique' * qualifiers+='!id' (ambiguity) qualifiers+='unsettable' * qualifiers+='!id' (ambiguity) qualifiers+='volatile' - * qualifiers+='!ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!ordered' (ambiguity) qualifiers+='!derived' * qualifiers+='!ordered' (ambiguity) qualifiers+='!id' @@ -696,7 +693,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!ordered' (ambiguity) qualifiers+='unique' * qualifiers+='!ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='!ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='!readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!readonly' (ambiguity) qualifiers+='!derived' * qualifiers+='!readonly' (ambiguity) qualifiers+='!id' @@ -714,7 +710,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!readonly' (ambiguity) qualifiers+='unique' * qualifiers+='!readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='!readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='!transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!transient' (ambiguity) qualifiers+='!derived' * qualifiers+='!transient' (ambiguity) qualifiers+='!id' @@ -732,7 +727,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!transient' (ambiguity) qualifiers+='unique' * qualifiers+='!transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='!transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unique' (ambiguity) qualifiers+='!derived' * qualifiers+='!unique' (ambiguity) qualifiers+='!id' @@ -750,7 +744,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!unique' (ambiguity) qualifiers+='unique' * qualifiers+='!unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unsettable' (ambiguity) qualifiers+='!derived' * qualifiers+='!unsettable' (ambiguity) qualifiers+='!id' @@ -768,7 +761,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='!unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='!volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!volatile' (ambiguity) qualifiers+='!derived' * qualifiers+='!volatile' (ambiguity) qualifiers+='!id' @@ -786,7 +778,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!volatile' (ambiguity) qualifiers+='unique' * qualifiers+='!volatile' (ambiguity) qualifiers+='unsettable' * qualifiers+='!volatile' (ambiguity) qualifiers+='volatile' - * qualifiers+='derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='derived' (ambiguity) qualifiers+='!derived' * qualifiers+='derived' (ambiguity) qualifiers+='!id' @@ -804,7 +795,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='derived' (ambiguity) qualifiers+='unique' * qualifiers+='derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='id' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='id' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='id' (ambiguity) qualifiers+='!derived' * qualifiers+='id' (ambiguity) qualifiers+='!id' @@ -822,7 +812,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='id' (ambiguity) qualifiers+='unique' * qualifiers+='id' (ambiguity) qualifiers+='unsettable' * qualifiers+='id' (ambiguity) qualifiers+='volatile' - * qualifiers+='ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='ordered' (ambiguity) qualifiers+='!derived' * qualifiers+='ordered' (ambiguity) qualifiers+='!id' @@ -840,7 +829,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='ordered' (ambiguity) qualifiers+='unique' * qualifiers+='ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='readonly' (ambiguity) qualifiers+='!derived' * qualifiers+='readonly' (ambiguity) qualifiers+='!id' @@ -858,7 +846,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='readonly' (ambiguity) qualifiers+='unique' * qualifiers+='readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='transient' (ambiguity) qualifiers+='!derived' * qualifiers+='transient' (ambiguity) qualifiers+='!id' @@ -876,7 +863,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='transient' (ambiguity) qualifiers+='unique' * qualifiers+='transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unique' (ambiguity) qualifiers+='!derived' * qualifiers+='unique' (ambiguity) qualifiers+='!id' @@ -894,7 +880,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='unique' (ambiguity) qualifiers+='unique' * qualifiers+='unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unsettable' (ambiguity) qualifiers+='!derived' * qualifiers+='unsettable' (ambiguity) qualifiers+='!id' @@ -912,7 +897,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='volatile' (ambiguity) qualifiers+='!derived' * qualifiers+='volatile' (ambiguity) qualifiers+='!id' @@ -1668,11 +1652,8 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * * This ambiguous syntax occurs at: * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (';' | ('{' '}')) (rule end) - * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (('{' '}') | ';') (rule end) * name=UnrestrictedName (ambiguity) (';' | ('{' '}')) (rule end) - * name=UnrestrictedName (ambiguity) (('{' '}') | ';') (rule end) * ownedSignature=TemplateSignatureCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSignature=TemplateSignatureCS (ambiguity) (('{' '}') | ';') (rule end) */ protected void emit_DataTypeCS___LeftCurlyBracketKeyword_5_0_SerializableKeyword_5_1_1_q_RightCurlyBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) { acceptNodes(transition, nodes); @@ -1710,13 +1691,10 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * This ambiguous syntax occurs at: * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) '{' ownedLiterals+=EnumerationLiteralCS * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (';' | ('{' '}')) (rule end) - * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (('{' '}') | ';') (rule end) * name=UnrestrictedName (ambiguity) '{' ownedLiterals+=EnumerationLiteralCS * name=UnrestrictedName (ambiguity) (';' | ('{' '}')) (rule end) - * name=UnrestrictedName (ambiguity) (('{' '}') | ';') (rule end) * ownedSignature=TemplateSignatureCS (ambiguity) '{' ownedLiterals+=EnumerationLiteralCS * ownedSignature=TemplateSignatureCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSignature=TemplateSignatureCS (ambiguity) (('{' '}') | ';') (rule end) */ protected void emit_EnumerationCS___LeftCurlyBracketKeyword_4_0_SerializableKeyword_4_1_1_q_RightCurlyBracketKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) { acceptNodes(transition, nodes); @@ -2386,7 +2364,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * (';' ('initial' UnrestrictedName? ':' ';')* 'derivation' UnrestrictedName? ':')* * ownedDefaultExpressions+=SpecificationCS * ) - * qualifiers+='!composes' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!composes' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!composes' (ambiguity) qualifiers+='!composes' * qualifiers+='!composes' (ambiguity) qualifiers+='!derived' @@ -2406,7 +2383,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!composes' (ambiguity) qualifiers+='unique' * qualifiers+='!composes' (ambiguity) qualifiers+='unsettable' * qualifiers+='!composes' (ambiguity) qualifiers+='volatile' - * qualifiers+='!derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!derived' (ambiguity) qualifiers+='!composes' * qualifiers+='!derived' (ambiguity) qualifiers+='!derived' @@ -2426,7 +2402,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!derived' (ambiguity) qualifiers+='unique' * qualifiers+='!derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='!derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='!ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!ordered' (ambiguity) qualifiers+='!composes' * qualifiers+='!ordered' (ambiguity) qualifiers+='!derived' @@ -2446,7 +2421,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!ordered' (ambiguity) qualifiers+='unique' * qualifiers+='!ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='!ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='!readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!readonly' (ambiguity) qualifiers+='!composes' * qualifiers+='!readonly' (ambiguity) qualifiers+='!derived' @@ -2466,7 +2440,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!readonly' (ambiguity) qualifiers+='unique' * qualifiers+='!readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='!readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='!resolve' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!resolve' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!resolve' (ambiguity) qualifiers+='!composes' * qualifiers+='!resolve' (ambiguity) qualifiers+='!derived' @@ -2486,7 +2459,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!resolve' (ambiguity) qualifiers+='unique' * qualifiers+='!resolve' (ambiguity) qualifiers+='unsettable' * qualifiers+='!resolve' (ambiguity) qualifiers+='volatile' - * qualifiers+='!transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!transient' (ambiguity) qualifiers+='!composes' * qualifiers+='!transient' (ambiguity) qualifiers+='!derived' @@ -2506,7 +2478,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!transient' (ambiguity) qualifiers+='unique' * qualifiers+='!transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='!transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unique' (ambiguity) qualifiers+='!composes' * qualifiers+='!unique' (ambiguity) qualifiers+='!derived' @@ -2526,7 +2497,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!unique' (ambiguity) qualifiers+='unique' * qualifiers+='!unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='!unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!unsettable' (ambiguity) qualifiers+='!composes' * qualifiers+='!unsettable' (ambiguity) qualifiers+='!derived' @@ -2546,7 +2516,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='!unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='!unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='!volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='!volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='!volatile' (ambiguity) qualifiers+='!composes' * qualifiers+='!volatile' (ambiguity) qualifiers+='!derived' @@ -2566,7 +2535,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='!volatile' (ambiguity) qualifiers+='unique' * qualifiers+='!volatile' (ambiguity) qualifiers+='unsettable' * qualifiers+='!volatile' (ambiguity) qualifiers+='volatile' - * qualifiers+='composes' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='composes' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='composes' (ambiguity) qualifiers+='!composes' * qualifiers+='composes' (ambiguity) qualifiers+='!derived' @@ -2586,7 +2554,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='composes' (ambiguity) qualifiers+='unique' * qualifiers+='composes' (ambiguity) qualifiers+='unsettable' * qualifiers+='composes' (ambiguity) qualifiers+='volatile' - * qualifiers+='derived' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='derived' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='derived' (ambiguity) qualifiers+='!composes' * qualifiers+='derived' (ambiguity) qualifiers+='!derived' @@ -2606,7 +2573,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='derived' (ambiguity) qualifiers+='unique' * qualifiers+='derived' (ambiguity) qualifiers+='unsettable' * qualifiers+='derived' (ambiguity) qualifiers+='volatile' - * qualifiers+='ordered' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='ordered' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='ordered' (ambiguity) qualifiers+='!composes' * qualifiers+='ordered' (ambiguity) qualifiers+='!derived' @@ -2626,7 +2592,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='ordered' (ambiguity) qualifiers+='unique' * qualifiers+='ordered' (ambiguity) qualifiers+='unsettable' * qualifiers+='ordered' (ambiguity) qualifiers+='volatile' - * qualifiers+='readonly' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='readonly' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='readonly' (ambiguity) qualifiers+='!composes' * qualifiers+='readonly' (ambiguity) qualifiers+='!derived' @@ -2646,7 +2611,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='readonly' (ambiguity) qualifiers+='unique' * qualifiers+='readonly' (ambiguity) qualifiers+='unsettable' * qualifiers+='readonly' (ambiguity) qualifiers+='volatile' - * qualifiers+='resolve' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='resolve' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='resolve' (ambiguity) qualifiers+='!composes' * qualifiers+='resolve' (ambiguity) qualifiers+='!derived' @@ -2666,7 +2630,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='resolve' (ambiguity) qualifiers+='unique' * qualifiers+='resolve' (ambiguity) qualifiers+='unsettable' * qualifiers+='resolve' (ambiguity) qualifiers+='volatile' - * qualifiers+='transient' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='transient' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='transient' (ambiguity) qualifiers+='!composes' * qualifiers+='transient' (ambiguity) qualifiers+='!derived' @@ -2686,7 +2649,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='transient' (ambiguity) qualifiers+='unique' * qualifiers+='transient' (ambiguity) qualifiers+='unsettable' * qualifiers+='transient' (ambiguity) qualifiers+='volatile' - * qualifiers+='unique' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unique' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unique' (ambiguity) qualifiers+='!composes' * qualifiers+='unique' (ambiguity) qualifiers+='!derived' @@ -2706,7 +2668,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='unique' (ambiguity) qualifiers+='unique' * qualifiers+='unique' (ambiguity) qualifiers+='unsettable' * qualifiers+='unique' (ambiguity) qualifiers+='volatile' - * qualifiers+='unsettable' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='unsettable' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='unsettable' (ambiguity) qualifiers+='!composes' * qualifiers+='unsettable' (ambiguity) qualifiers+='!derived' @@ -2726,7 +2687,6 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * qualifiers+='unsettable' (ambiguity) qualifiers+='unique' * qualifiers+='unsettable' (ambiguity) qualifiers+='unsettable' * qualifiers+='unsettable' (ambiguity) qualifiers+='volatile' - * qualifiers+='volatile' (ambiguity) '}' (';' | ('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}')) (rule end) * qualifiers+='volatile' (ambiguity) '}' (('{' (('initial' UnrestrictedName? ':' ';') | ('derivation' UnrestrictedName? ':' ';'))* '}') | ';') (rule end) * qualifiers+='volatile' (ambiguity) qualifiers+='!composes' * qualifiers+='volatile' (ambiguity) qualifiers+='!derived' @@ -3570,19 +3530,15 @@ public abstract class AbstractQVTrelationSyntacticSequencer extends AbstractSynt * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) '{' ownedOperations+=OperationCS * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) '{' ownedProperties+=StructuralFeatureCS * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (';' | ('{' '}')) (rule end) - * instanceClassName=SINGLE_QUOTED_STRING (ambiguity) (('{' '}') | ';') (rule end) * name=UnrestrictedName (ambiguity) '{' ownedOperations+=OperationCS * name=UnrestrictedName (ambiguity) '{' ownedProperties+=StructuralFeatureCS * name=UnrestrictedName (ambiguity) (';' | ('{' '}')) (rule end) - * name=UnrestrictedName (ambiguity) (('{' '}') | ';') (rule end) * ownedSignature=TemplateSignatureCS (ambiguity) '{' ownedOperations+=OperationCS * ownedSignature=TemplateSignatureCS (ambiguity) '{' ownedProperties+=StructuralFeatureCS * ownedSignature=TemplateSignatureCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSignature=TemplateSignatureCS (ambiguity) (('{' '}') | ';') (rule end) * ownedSuperTypes+=TypedRefCS (ambiguity) '{' ownedOperations+=OperationCS * ownedSuperTypes+=TypedRefCS (ambiguity) '{' ownedProperties+=StructuralFeatureCS * ownedSuperTypes+=TypedRefCS (ambiguity) (';' | ('{' '}')) (rule end) - * ownedSuperTypes+=TypedRefCS (ambiguity) (('{' '}') | ';') (rule end) */ protected void emit_StructuredClassCS___LeftCurlyBracketKeyword_6_0_RightCurlyBracketKeyword_6_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) { acceptNodes(transition, nodes); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java index 4de9694b0..24177430d 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java @@ -98,7 +98,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //QualifiedPackageCS qvtbasecs::QualifiedPackageCS: // 'package' ownedPathName=ScopeNameCS? name=UnrestrictedName (':' nsPrefix=UnrestrictedName)? ('=' nsURI=URI)? ('{' - // (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';') + // (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';'); @Override public ParserRule getRule() { return rule; } //'package' ownedPathName=ScopeNameCS? name=UnrestrictedName (':' nsPrefix=UnrestrictedName)? ('=' nsURI=URI)? ('{' @@ -144,7 +144,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //URI public RuleCall getNsURIURIParserRuleCall_4_1_0() { return cNsURIURIParserRuleCall_4_1_0; } - //('{' (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';') + //'{' (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';' public Alternatives getAlternatives_5() { return cAlternatives_5; } //'{' (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' @@ -156,7 +156,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //(ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* public Alternatives getAlternatives_5_0_1() { return cAlternatives_5_0_1; } - /// * ownedAnnotations+=AnnotationElementCS | * / ownedPackages+=QualifiedPackageCS + ///* ownedAnnotations+=AnnotationElementCS | */ ownedPackages+=QualifiedPackageCS public Assignment getOwnedPackagesAssignment_5_0_1_0() { return cOwnedPackagesAssignment_5_0_1_0; } //QualifiedPackageCS @@ -538,7 +538,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //'{' public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; } - //(propertyIds+=[pivot::Property|UnrestrictedName] | 'opposite' '(' ownedOppositePropertyIds+=PathNameCS ')') + //propertyIds+=[pivot::Property|UnrestrictedName] | 'opposite' '(' ownedOppositePropertyIds+=PathNameCS ')' public Alternatives getAlternatives_3() { return cAlternatives_3; } //propertyIds+=[pivot::Property|UnrestrictedName] @@ -574,7 +574,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //',' public Keyword getCommaKeyword_4_0() { return cCommaKeyword_4_0; } - //(propertyIds+=[pivot::Property|UnrestrictedName] | 'opposite' '(' ownedOppositePropertyIds+=PathNameCS ')') + //propertyIds+=[pivot::Property|UnrestrictedName] | 'opposite' '(' ownedOppositePropertyIds+=PathNameCS ')' public Alternatives getAlternatives_4_1() { return cAlternatives_4_1; } //propertyIds+=[pivot::Property|UnrestrictedName] @@ -663,8 +663,8 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //':' public Keyword getColonKeyword_1() { return cColonKeyword_1; } - //(metamodelIds+=[pivot::Namespace|UnrestrictedName] | '{' metamodelIds+=[pivot::Namespace|UnrestrictedName] (',' - //metamodelIds+=[pivot::Namespace|UnrestrictedName])* '}') + //metamodelIds+=[pivot::Namespace|UnrestrictedName] | '{' metamodelIds+=[pivot::Namespace|UnrestrictedName] (',' + //metamodelIds+=[pivot::Namespace|UnrestrictedName])* '}' public Alternatives getAlternatives_2() { return cAlternatives_2; } //metamodelIds+=[pivot::Namespace|UnrestrictedName] @@ -973,7 +973,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //ownedExpression=ExpCSOrTemplateCS public Group getGroup() { return cGroup; } - //(propertyId=[pivot::Property|UnrestrictedName] | 'opposite' '(' ownedOppositePropertyId=PathNameCS ')') + //propertyId=[pivot::Property|UnrestrictedName] | 'opposite' '(' ownedOppositePropertyId=PathNameCS ')' public Alternatives getAlternatives_0() { return cAlternatives_0; } //propertyId=[pivot::Property|UnrestrictedName] @@ -1101,7 +1101,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //TypeExpCS public RuleCall getOwnedTypeTypeExpCSParserRuleCall_7_0() { return cOwnedTypeTypeExpCSParserRuleCall_7_0; } - //(';' | '{' ownedExpression=ExpCS '}') + //';' | '{' ownedExpression=ExpCS '}' public Alternatives getAlternatives_8() { return cAlternatives_8; } //';' @@ -1135,9 +1135,9 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cNameUnrestrictedNameParserRuleCall_3_0 = (RuleCall)cNameAssignment_3.eContents().get(0); private final Group cGroup_4 = (Group)cGroup.eContents().get(4); private final Keyword cOverridesKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0); - private final Assignment cOverridesAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1); - private final CrossReference cOverridesRelationCrossReference_4_1_0 = (CrossReference)cOverridesAssignment_4_1.eContents().get(0); - private final RuleCall cOverridesRelationUnrestrictedNameParserRuleCall_4_1_0_1 = (RuleCall)cOverridesRelationCrossReference_4_1_0.eContents().get(1); + private final Assignment cOverriddenAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1); + private final CrossReference cOverriddenRelationCrossReference_4_1_0 = (CrossReference)cOverriddenAssignment_4_1.eContents().get(0); + private final RuleCall cOverriddenRelationUnrestrictedNameParserRuleCall_4_1_0_1 = (RuleCall)cOverriddenRelationCrossReference_4_1_0.eContents().get(1); private final Keyword cLeftCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5); private final Assignment cOwnedVarDeclarationsAssignment_6 = (Assignment)cGroup.eContents().get(6); private final RuleCall cOwnedVarDeclarationsVarDeclarationCSParserRuleCall_6_0 = (RuleCall)cOwnedVarDeclarationsAssignment_6.eContents().get(0); @@ -1154,12 +1154,12 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //RelationCS: // isTop?='top'? isAbstract?='abstract'? 'relation' name=UnrestrictedName ('overrides' - // overrides=[qvtrelation::Relation|UnrestrictedName])? '{' ownedVarDeclarations+=VarDeclarationCS* + // overridden=[qvtrelation::Relation|UnrestrictedName])? '{' ownedVarDeclarations+=VarDeclarationCS* // (ownedDomains+=DomainCS | ownedDomains+=PrimitiveTypeDomainCS)+ ownedWhen=WhenCS? ownedWhere=WhereCS? '}'; @Override public ParserRule getRule() { return rule; } //isTop?='top'? isAbstract?='abstract'? 'relation' name=UnrestrictedName ('overrides' - //overrides=[qvtrelation::Relation|UnrestrictedName])? '{' ownedVarDeclarations+=VarDeclarationCS* + //overridden=[qvtrelation::Relation|UnrestrictedName])? '{' ownedVarDeclarations+=VarDeclarationCS* //(ownedDomains+=DomainCS | ownedDomains+=PrimitiveTypeDomainCS)+ ownedWhen=WhenCS? ownedWhere=WhereCS? '}' public Group getGroup() { return cGroup; } @@ -1184,20 +1184,20 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //UnrestrictedName public RuleCall getNameUnrestrictedNameParserRuleCall_3_0() { return cNameUnrestrictedNameParserRuleCall_3_0; } - //('overrides' overrides=[qvtrelation::Relation|UnrestrictedName])? + //('overrides' overridden=[qvtrelation::Relation|UnrestrictedName])? public Group getGroup_4() { return cGroup_4; } //'overrides' public Keyword getOverridesKeyword_4_0() { return cOverridesKeyword_4_0; } - //overrides=[qvtrelation::Relation|UnrestrictedName] - public Assignment getOverridesAssignment_4_1() { return cOverridesAssignment_4_1; } + //overridden=[qvtrelation::Relation|UnrestrictedName] + public Assignment getOverriddenAssignment_4_1() { return cOverriddenAssignment_4_1; } //[qvtrelation::Relation|UnrestrictedName] - public CrossReference getOverridesRelationCrossReference_4_1_0() { return cOverridesRelationCrossReference_4_1_0; } + public CrossReference getOverriddenRelationCrossReference_4_1_0() { return cOverriddenRelationCrossReference_4_1_0; } //UnrestrictedName - public RuleCall getOverridesRelationUnrestrictedNameParserRuleCall_4_1_0_1() { return cOverridesRelationUnrestrictedNameParserRuleCall_4_1_0_1; } + public RuleCall getOverriddenRelationUnrestrictedNameParserRuleCall_4_1_0_1() { return cOverriddenRelationUnrestrictedNameParserRuleCall_4_1_0_1; } //'{' public Keyword getLeftCurlyBracketKeyword_5() { return cLeftCurlyBracketKeyword_5; } @@ -1251,7 +1251,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cColonColonKeyword_2_1 = (Keyword)cGroup_2.eContents().get(1); //ScopeNameCS base::PathNameCS: - // ownedPathElements+=FirstPathElementCS '::' (ownedPathElements+=NextPathElementCS '::')* + // ownedPathElements+=FirstPathElementCS '::' (ownedPathElements+=NextPathElementCS '::')*; @Override public ParserRule getRule() { return rule; } //ownedPathElements+=FirstPathElementCS '::' (ownedPathElements+=NextPathElementCS '::')* @@ -1298,7 +1298,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //(CollectionTemplateCS | ObjectTemplateCS) ('{' ownedGuardExpression=ExpCS '}')? public Group getGroup() { return cGroup; } - //(CollectionTemplateCS | ObjectTemplateCS) + //CollectionTemplateCS | ObjectTemplateCS public Alternatives getAlternatives_0() { return cAlternatives_0; } //CollectionTemplateCS @@ -1487,7 +1487,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cSemicolonKeyword_4 = (Keyword)cGroup.eContents().get(4); //UnitCS base::ImportCS: - // 'import' (name=UnrestrictedName ':')? ownedPathName=URIPathNameCS ('::' isAll?='*')? ';' + // 'import' (name=UnrestrictedName ':')? ownedPathName=URIPathNameCS ('::' isAll?='*')? ';'; @Override public ParserRule getRule() { return rule; } //'import' (name=UnrestrictedName ':')? ownedPathName=URIPathNameCS ('::' isAll?='*')? ';' @@ -1631,7 +1631,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); //WhenCS PatternCS: - // {PatternCS} 'when' '{' ownedPredicates+=PredicateCS* '}' + // {PatternCS} 'when' '{' ownedPredicates+=PredicateCS* '}'; @Override public ParserRule getRule() { return rule; } //{PatternCS} 'when' '{' ownedPredicates+=PredicateCS* '}' @@ -1667,7 +1667,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4); //WhereCS PatternCS: - // {PatternCS} 'where' '{' ownedPredicates+=PredicateCS* '}' + // {PatternCS} 'where' '{' ownedPredicates+=PredicateCS* '}'; @Override public ParserRule getRule() { return rule; } //{PatternCS} 'where' '{' ownedPredicates+=PredicateCS* '}' @@ -1710,7 +1710,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { // //// notNameExpressionCS -> templateCS // ExpCSOrTemplateCS essentialocl::ExpCS: - // ExpCS | TemplateCS + // ExpCS | TemplateCS; @Override public ParserRule getRule() { return rule; } //ExpCS | TemplateCS @@ -1729,7 +1729,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cOwnedPathNamePathNameCSParserRuleCall_0 = (RuleCall)cOwnedPathNameAssignment.eContents().get(0); //TypedTypeRefCS base::TypedTypeRefCS: - // ownedPathName=PathNameCS + // ownedPathName=PathNameCS; @Override public ParserRule getRule() { return rule; } //ownedPathName=PathNameCS @@ -1757,7 +1757,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //TypedRefCS base::TypedRefCS: // PrimitiveTypeCS ownedMultiplicity=MultiplicityCS? | CollectionTypeCS ownedMultiplicity=MultiplicityCS? | - // TypedTypeRefCS ownedMultiplicity=MultiplicityCS? + // TypedTypeRefCS ownedMultiplicity=MultiplicityCS?; @Override public ParserRule getRule() { return rule; } //PrimitiveTypeCS ownedMultiplicity=MultiplicityCS? | CollectionTypeCS ownedMultiplicity=MultiplicityCS? | TypedTypeRefCS @@ -1915,14 +1915,14 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cQVTbaseUnrestrictedNameParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); private final RuleCall cQVTrelationUnrestrictedNameParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); - /// * + ///* //| 'callable' //| 'module' //| 'package' //| 'postcondition' //| 'precondition' //| 'reference' - // * / UnrestrictedName: + //*/ UnrestrictedName: // EssentialOCLUnrestrictedName | QVTbaseUnrestrictedName | QVTrelationUnrestrictedName; @Override public ParserRule getRule() { return rule; } @@ -2067,7 +2067,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //QualifiedPackageCS qvtbasecs::QualifiedPackageCS: // 'package' ownedPathName=ScopeNameCS? name=UnrestrictedName (':' nsPrefix=UnrestrictedName)? ('=' nsURI=URI)? ('{' - // (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';') + // (ownedPackages+=QualifiedPackageCS | ownedClasses+=(ClassCS | TransformationCS))* '}' | ';'); public QualifiedPackageCSElements getQualifiedPackageCSAccess() { return pQualifiedPackageCS; } @@ -2232,7 +2232,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //RelationCS: // isTop?='top'? isAbstract?='abstract'? 'relation' name=UnrestrictedName ('overrides' - // overrides=[qvtrelation::Relation|UnrestrictedName])? '{' ownedVarDeclarations+=VarDeclarationCS* + // overridden=[qvtrelation::Relation|UnrestrictedName])? '{' ownedVarDeclarations+=VarDeclarationCS* // (ownedDomains+=DomainCS | ownedDomains+=PrimitiveTypeDomainCS)+ ownedWhen=WhenCS? ownedWhere=WhereCS? '}'; public RelationCSElements getRelationCSAccess() { return pRelationCS; @@ -2243,7 +2243,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //ScopeNameCS base::PathNameCS: - // ownedPathElements+=FirstPathElementCS '::' (ownedPathElements+=NextPathElementCS '::')* + // ownedPathElements+=FirstPathElementCS '::' (ownedPathElements+=NextPathElementCS '::')*; public ScopeNameCSElements getScopeNameCSAccess() { return pScopeNameCS; } @@ -2276,7 +2276,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //UnitCS base::ImportCS: - // 'import' (name=UnrestrictedName ':')? ownedPathName=URIPathNameCS ('::' isAll?='*')? ';' + // 'import' (name=UnrestrictedName ':')? ownedPathName=URIPathNameCS ('::' isAll?='*')? ';'; public UnitCSElements getUnitCSAccess() { return pUnitCS; } @@ -2307,7 +2307,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //WhenCS PatternCS: - // {PatternCS} 'when' '{' ownedPredicates+=PredicateCS* '}' + // {PatternCS} 'when' '{' ownedPredicates+=PredicateCS* '}'; public WhenCSElements getWhenCSAccess() { return pWhenCS; } @@ -2317,7 +2317,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //WhereCS PatternCS: - // {PatternCS} 'where' '{' ownedPredicates+=PredicateCS* '}' + // {PatternCS} 'where' '{' ownedPredicates+=PredicateCS* '}'; public WhereCSElements getWhereCSAccess() { return pWhereCS; } @@ -2338,7 +2338,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { // //// notNameExpressionCS -> templateCS // ExpCSOrTemplateCS essentialocl::ExpCS: - // ExpCS | TemplateCS + // ExpCS | TemplateCS; public ExpCSOrTemplateCSElements getExpCSOrTemplateCSAccess() { return pExpCSOrTemplateCS; } @@ -2348,7 +2348,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //TypedTypeRefCS base::TypedTypeRefCS: - // ownedPathName=PathNameCS + // ownedPathName=PathNameCS; public TypedTypeRefCSElements getTypedTypeRefCSAccess() { return pTypedTypeRefCS; } @@ -2359,7 +2359,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //TypedRefCS base::TypedRefCS: // PrimitiveTypeCS ownedMultiplicity=MultiplicityCS? | CollectionTypeCS ownedMultiplicity=MultiplicityCS? | - // TypedTypeRefCS ownedMultiplicity=MultiplicityCS? + // TypedTypeRefCS ownedMultiplicity=MultiplicityCS?; public TypedRefCSElements getTypedRefCSAccess() { return pTypedRefCS; } @@ -2383,14 +2383,14 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getQVTrelationUnrestrictedNameAccess().getRule(); } - /// * + ///* //| 'callable' //| 'module' //| 'package' //| 'postcondition' //| 'precondition' //| 'reference' - // * / UnrestrictedName: + //*/ UnrestrictedName: // EssentialOCLUnrestrictedName | QVTbaseUnrestrictedName | QVTrelationUnrestrictedName; public UnrestrictedNameElements getUnrestrictedNameAccess() { return pUnrestrictedName; @@ -2408,7 +2408,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { // qualifiers+='!transient' | qualifiers+='unique' | qualifiers+='!unique' | qualifiers+='unsettable' | // qualifiers+='!unsettable' | qualifiers+='volatile' | qualifiers+='!volatile') ','?)+ '}')? ('{' ('initial' // super::UnrestrictedName? ':' ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' super::UnrestrictedName? - // ':' ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';') + // ':' ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';'); public QVTbaseGrammarAccess.AttributeCSElements getAttributeCSAccess() { return gaQVTbase.getAttributeCSAccess(); } @@ -2418,7 +2418,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //ClassCS base::ClassCS: - // StructuredClassCS | DataTypeCS | EnumerationCS + // StructuredClassCS | DataTypeCS | EnumerationCS; public QVTbaseGrammarAccess.ClassCSElements getClassCSAccess() { return gaQVTbase.getClassCSAccess(); } @@ -2430,8 +2430,8 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //DataTypeCS base::DataTypeCS: // isPrimitive?='primitive'? 'datatype' name=super::UnrestrictedName ownedSignature=TemplateSignatureCS? (':' // instanceClassName=SINGLE_QUOTED_STRING)? ('{' (isSerializable?='serializable' | '!serializable')? '}')? ('{' - // / *(ownedAnnotations+=AnnotationElementCS - // | ownedConstraints+=InvariantConstraintCS)* * / '}' | ';') + // /*(ownedAnnotations+=AnnotationElementCS + // | ownedConstraints+=InvariantConstraintCS)* */ '}' | ';'); public QVTbaseGrammarAccess.DataTypeCSElements getDataTypeCSAccess() { return gaQVTbase.getDataTypeCSAccess(); } @@ -2443,7 +2443,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //EnumerationCS base::EnumerationCS: // 'enum' name=super::UnrestrictedName ownedSignature=TemplateSignatureCS? (':' instanceClassName=SINGLE_QUOTED_STRING)? // ('{' (isSerializable?='serializable' | '!serializable')? '}')? ('{' ownedLiterals+=EnumerationLiteralCS - // / *| ownedConstraints+=InvariantConstraintCS* / * '}' | ';') + // /*| ownedConstraints+=InvariantConstraintCS*/* '}' | ';'); public QVTbaseGrammarAccess.EnumerationCSElements getEnumerationCSAccess() { return gaQVTbase.getEnumerationCSAccess(); } @@ -2454,7 +2454,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //EnumerationLiteralCS base::EnumerationLiteralCS: // ('literal' name=super::UnrestrictedName | name=EnumerationLiteralName) ('=' value=SIGNED)? ('{' - // / *ownedAnnotations+=AnnotationElementCS* * / '}' | ';') + // /*ownedAnnotations+=AnnotationElementCS* */ '}' | ';'); public QVTbaseGrammarAccess.EnumerationLiteralCSElements getEnumerationLiteralCSAccess() { return gaQVTbase.getEnumerationLiteralCSAccess(); } @@ -2470,7 +2470,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { // ownedExceptions+=super::TypedRefCS (',' ownedExceptions+=super::TypedRefCS)*)? ('{' ((qualifiers+='derived' | // qualifiers+='!derived' | qualifiers+='ordered' | qualifiers+='!ordered' | qualifiers+='unique' | // qualifiers+='!unique') ','?)+ '}')? ('{' ('body' super::UnrestrictedName? ':' ownedBodyExpressions+=SpecificationCS? - // ';')* '}' | ';') + // ';')* '}' | ';'); public QVTbaseGrammarAccess.OperationCSElements getOperationCSAccess() { return gaQVTbase.getOperationCSAccess(); } @@ -2482,7 +2482,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //ParameterCS base::ParameterCS: // name=super::UnrestrictedName (':' ownedType=TypedMultiplicityRefCS)? ('{' ((qualifiers+='ordered' | // qualifiers+='!ordered' | qualifiers+='unique' | qualifiers+='!unique') ','?)+ '}')? ('{' - // / *ownedAnnotations+=AnnotationElementCS* * / '}')? + // /*ownedAnnotations+=AnnotationElementCS* */ '}')?; public QVTbaseGrammarAccess.ParameterCSElements getParameterCSAccess() { return gaQVTbase.getParameterCSAccess(); } @@ -2501,7 +2501,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { // qualifiers+='!unique' | qualifiers+='unsettable' | qualifiers+='!unsettable' | qualifiers+='volatile' | // qualifiers+='!volatile') ','?)+ '}')? ('{' ('initial' super::UnrestrictedName? ':' // ownedDefaultExpressions+=SpecificationCS? ';' | 'derivation' super::UnrestrictedName? ':' - // ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';') + // ownedDefaultExpressions+=SpecificationCS? ';')* '}' | ';'); public QVTbaseGrammarAccess.ReferenceCSElements getReferenceCSAccess() { return gaQVTbase.getReferenceCSAccess(); } @@ -2511,7 +2511,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //SpecificationCS essentialocl::ExpSpecificationCS: - // ownedExpression=ExpCS | exprString=UNQUOTED_STRING + // ownedExpression=ExpCS | exprString=UNQUOTED_STRING; public QVTbaseGrammarAccess.SpecificationCSElements getSpecificationCSAccess() { return gaQVTbase.getSpecificationCSAccess(); } @@ -2524,7 +2524,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { // isAbstract?='abstract'? 'class' name=super::UnrestrictedName ownedSignature=TemplateSignatureCS? ('extends' // ownedSuperTypes+=super::TypedRefCS (',' ownedSuperTypes+=super::TypedRefCS)*)? (':' // instanceClassName=SINGLE_QUOTED_STRING)? ('{' isInterface?='interface'? '}')? ('{' (ownedOperations+=OperationCS | - // ownedProperties+=StructuralFeatureCS / *| ownedConstraints+=InvariantConstraintCS* /)* '}' | ';') + // ownedProperties+=StructuralFeatureCS /*| ownedConstraints+=InvariantConstraintCS*/)* '}' | ';'); public QVTbaseGrammarAccess.StructuredClassCSElements getStructuredClassCSAccess() { return gaQVTbase.getStructuredClassCSAccess(); } @@ -2534,7 +2534,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //TypedMultiplicityRefCS base::TypedRefCS: - // super::TypedRefCS ownedMultiplicity=MultiplicityCS? + // super::TypedRefCS ownedMultiplicity=MultiplicityCS?; public QVTbaseGrammarAccess.TypedMultiplicityRefCSElements getTypedMultiplicityRefCSAccess() { return gaQVTbase.getTypedMultiplicityRefCSAccess(); } @@ -2544,7 +2544,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //StructuralFeatureCS base::StructuralFeatureCS: - // AttributeCS | ReferenceCS + // AttributeCS | ReferenceCS; public QVTbaseGrammarAccess.StructuralFeatureCSElements getStructuralFeatureCSAccess() { return gaQVTbase.getStructuralFeatureCSAccess(); } @@ -2575,7 +2575,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getQVTbaseUnrestrictedNameAccess().getRule(); } - /// * + ///* //| 'callable' //| 'import' //| 'key' @@ -2585,9 +2585,9 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //| 'postcondition' //| 'precondition' //| 'reference' - // * / + //*/ //SIGNED ecore::EInt: - // '-'? INT + // '-'? INT; public QVTbaseGrammarAccess.SIGNEDElements getSIGNEDAccess() { return gaQVTbase.getSIGNEDAccess(); } @@ -2606,7 +2606,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { ////generate essentialOCLCST "http://www.eclipse.org/ocl/3.0.0/EssentialOCLCST" // Model ContextCS: - // ownedExpression=ExpCS + // ownedExpression=ExpCS; public EssentialOCLGrammarAccess.ModelElements getModelAccess() { return gaEssentialOCL.getModelAccess(); } @@ -2615,7 +2615,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getModelAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLReservedKeyword: // 'and' | 'else' | 'endif' | 'if' | 'implies' | 'in' | 'let' | 'not' | 'or' | 'then' | 'xor'; public EssentialOCLGrammarAccess.EssentialOCLReservedKeywordElements getEssentialOCLReservedKeywordAccess() { @@ -2626,7 +2626,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLReservedKeywordAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLUnaryOperatorName: // '-' | 'not'; public EssentialOCLGrammarAccess.EssentialOCLUnaryOperatorNameElements getEssentialOCLUnaryOperatorNameAccess() { @@ -2637,7 +2637,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLUnaryOperatorNameAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLInfixOperatorName: // '*' | '/' | '+' | '-' | '>' | '<' | '>=' | '<=' | '=' | '<>' | 'and' | 'or' | 'xor' | 'implies'; public EssentialOCLGrammarAccess.EssentialOCLInfixOperatorNameElements getEssentialOCLInfixOperatorNameAccess() { @@ -2648,7 +2648,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLInfixOperatorNameAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLNavigationOperatorName: // '.' | '->' | '?.' | '?->'; public EssentialOCLGrammarAccess.EssentialOCLNavigationOperatorNameElements getEssentialOCLNavigationOperatorNameAccess() { @@ -2704,7 +2704,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { // ////--------------------------------------------------------------------- // - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLUnrestrictedName: // Identifier; public EssentialOCLGrammarAccess.EssentialOCLUnrestrictedNameElements getEssentialOCLUnrestrictedNameAccess() { @@ -2715,7 +2715,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getEssentialOCLUnrestrictedNameAccess().getRule(); } - /// ** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> * / + ///** <<<This is a join point for derived grammars - replace with a more disciplined grammar extensibility>>> */ //EssentialOCLUnreservedName: // super::UnrestrictedName | CollectionTypeIdentifier | PrimitiveTypeIdentifier | 'Map' | 'Tuple'; public EssentialOCLGrammarAccess.EssentialOCLUnreservedNameElements getEssentialOCLUnreservedNameAccess() { @@ -2737,7 +2737,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //URIPathNameCS base::PathNameCS: - // ownedPathElements+=URIFirstPathElementCS ('::' ownedPathElements+=NextPathElementCS)* + // ownedPathElements+=URIFirstPathElementCS ('::' ownedPathElements+=NextPathElementCS)*; public EssentialOCLGrammarAccess.URIPathNameCSElements getURIPathNameCSAccess() { return gaEssentialOCL.getURIPathNameCSAccess(); } @@ -2748,7 +2748,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //URIFirstPathElementCS base::PathElementCS: // referredElement=[pivot::NamedElement|super::UnrestrictedName] | {base::PathElementWithURICS} - // referredElement=[pivot::Namespace|URI] + // referredElement=[pivot::Namespace|URI]; public EssentialOCLGrammarAccess.URIFirstPathElementCSElements getURIFirstPathElementCSAccess() { return gaEssentialOCL.getURIFirstPathElementCSAccess(); } @@ -2772,7 +2772,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //PrimitiveTypeCS base::PrimitiveTypeRefCS: - // name=PrimitiveTypeIdentifier + // name=PrimitiveTypeIdentifier; public EssentialOCLGrammarAccess.PrimitiveTypeCSElements getPrimitiveTypeCSAccess() { return gaEssentialOCL.getPrimitiveTypeCSAccess(); } @@ -2813,7 +2813,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //TupleTypeCS base::TupleTypeCS: - // name='Tuple' ('(' (ownedParts+=TuplePartCS (',' ownedParts+=TuplePartCS)*)? ')')? + // name='Tuple' ('(' (ownedParts+=TuplePartCS (',' ownedParts+=TuplePartCS)*)? ')')?; public EssentialOCLGrammarAccess.TupleTypeCSElements getTupleTypeCSAccess() { return gaEssentialOCL.getTupleTypeCSAccess(); } @@ -2823,7 +2823,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //TuplePartCS base::TuplePartCS: - // name=super::UnrestrictedName ':' ownedType=TypeExpCS + // name=super::UnrestrictedName ':' ownedType=TypeExpCS; public EssentialOCLGrammarAccess.TuplePartCSElements getTuplePartCSAccess() { return gaEssentialOCL.getTuplePartCSAccess(); } @@ -3010,7 +3010,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //TypeLiteralCS base::TypedRefCS: - // PrimitiveTypeCS | CollectionTypeCS | MapTypeCS | TupleTypeCS + // PrimitiveTypeCS | CollectionTypeCS | MapTypeCS | TupleTypeCS; public EssentialOCLGrammarAccess.TypeLiteralCSElements getTypeLiteralCSAccess() { return gaEssentialOCL.getTypeLiteralCSAccess(); } @@ -3020,7 +3020,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //TypeLiteralWithMultiplicityCS base::TypedRefCS: - // TypeLiteralCS ownedMultiplicity=MultiplicityCS? + // TypeLiteralCS ownedMultiplicity=MultiplicityCS?; public EssentialOCLGrammarAccess.TypeLiteralWithMultiplicityCSElements getTypeLiteralWithMultiplicityCSAccess() { return gaEssentialOCL.getTypeLiteralWithMultiplicityCSAccess(); } @@ -3050,7 +3050,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //TypeExpWithoutMultiplicityCS base::TypedRefCS: - // TypeNameExpCS | TypeLiteralCS | CollectionPatternCS + // TypeNameExpCS | TypeLiteralCS | CollectionPatternCS; public EssentialOCLGrammarAccess.TypeExpWithoutMultiplicityCSElements getTypeExpWithoutMultiplicityCSAccess() { return gaEssentialOCL.getTypeExpWithoutMultiplicityCSAccess(); } @@ -3060,7 +3060,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //TypeExpCS base::TypedRefCS: - // TypeExpWithoutMultiplicityCS ownedMultiplicity=MultiplicityCS? + // TypeExpWithoutMultiplicityCS ownedMultiplicity=MultiplicityCS?; public EssentialOCLGrammarAccess.TypeExpCSElements getTypeExpCSAccess() { return gaEssentialOCL.getTypeExpCSAccess(); } @@ -3083,8 +3083,8 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { // //// a = (64 / 16) / (let b : Integer in 8 / (let c : Integer in 4 )) // - /// * An expression elaborates a prefixed expression with zero or more binary operator and expression suffixes. - // * An optionally prefixed let expression is permitted except when suffixed with further expressions.* / + ///* An expression elaborates a prefixed expression with zero or more binary operator and expression suffixes. + // * An optionally prefixed let expression is permitted except when suffixed with further expressions.*/ //ExpCS: // PrefixedPrimaryExpCS ({InfixExpCS.ownedLeft=current} name=BinaryOperatorName ownedRight=ExpCS)? | PrefixedLetExpCS; public EssentialOCLGrammarAccess.ExpCSElements getExpCSAccess() { @@ -3095,9 +3095,9 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getExpCSAccess().getRule(); } - /// * A prefixed let expression elaborates a let expression with zero or more unary prefix operators. * / PrefixedLetExpCS + ///* A prefixed let expression elaborates a let expression with zero or more unary prefix operators. */ PrefixedLetExpCS //ExpCS: - // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedLetExpCS | LetExpCS + // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedLetExpCS | LetExpCS; public EssentialOCLGrammarAccess.PrefixedLetExpCSElements getPrefixedLetExpCSAccess() { return gaEssentialOCL.getPrefixedLetExpCSAccess(); } @@ -3106,9 +3106,9 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getPrefixedLetExpCSAccess().getRule(); } - /// * A prefixed primary expression elaborates a primary expression with zero or more unary prefix operators. * / + ///* A prefixed primary expression elaborates a primary expression with zero or more unary prefix operators. */ //PrefixedPrimaryExpCS ExpCS: - // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedPrimaryExpCS | PrimaryExpCS + // {PrefixExpCS} name=UnaryOperatorName ownedRight=PrefixedPrimaryExpCS | PrimaryExpCS; public EssentialOCLGrammarAccess.PrefixedPrimaryExpCSElements getPrefixedPrimaryExpCSAccess() { return gaEssentialOCL.getPrefixedPrimaryExpCSAccess(); } @@ -3117,10 +3117,10 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getPrefixedPrimaryExpCSAccess().getRule(); } - /// * A primary expression identifies the basic expressions from which more complex expressions may be constructed. * / + ///* A primary expression identifies the basic expressions from which more complex expressions may be constructed. */ //PrimaryExpCS ExpCS: // NestedExpCS | IfExpCS | SelfExpCS | PrimitiveLiteralExpCS | TupleLiteralExpCS | MapLiteralExpCS | - // CollectionLiteralExpCS | LambdaLiteralExpCS | TypeLiteralExpCS | NameExpCS + // CollectionLiteralExpCS | LambdaLiteralExpCS | TypeLiteralExpCS | NameExpCS; public EssentialOCLGrammarAccess.PrimaryExpCSElements getPrimaryExpCSAccess() { return gaEssentialOCL.getPrimaryExpCSAccess(); } @@ -3129,8 +3129,8 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getPrimaryExpCSAccess().getRule(); } - /// * A name expression is a generalised rule for expressions that start with a name and which may be followed by square, round or - // * curly bracket clauses and optionally an @pre as well.* / + ///* A name expression is a generalised rule for expressions that start with a name and which may be followed by square, round or + // * curly bracket clauses and optionally an @pre as well.*/ //NameExpCS: // ownedPathName=PathNameCS ownedSquareBracketedClauses+=SquareBracketedClauseCS* // ownedRoundBracketedClause=RoundBracketedClauseCS? ownedCurlyBracketedClause=CurlyBracketedClauseCS? (isPre?='@' @@ -3143,7 +3143,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getNameExpCSAccess().getRule(); } - /// * A curly bracket clause is a generalized rule for the literal arguments of collections, maps, tuples and shadows.* / + ///* A curly bracket clause is a generalized rule for the literal arguments of collections, maps, tuples and shadows.*/ //CurlyBracketedClauseCS: // {CurlyBracketedClauseCS} '{' (ownedParts+=ShadowPartCS (',' ownedParts+=ShadowPartCS)*)? '}'; public EssentialOCLGrammarAccess.CurlyBracketedClauseCSElements getCurlyBracketedClauseCSAccess() { @@ -3154,7 +3154,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getCurlyBracketedClauseCSAccess().getRule(); } - /// * A curly bracket clause is a generalized rule for template specialisations and operations arguments.* / + ///* A curly bracket clause is a generalized rule for template specialisations and operations arguments.*/ //RoundBracketedClauseCS: // {RoundBracketedClauseCS} '(' (ownedArguments+=NavigatingArgCS ownedArguments+=NavigatingCommaArgCS* // (ownedArguments+=NavigatingSemiArgCS ownedArguments+=NavigatingCommaArgCS*)? (ownedArguments+=NavigatingBarArgCS @@ -3167,7 +3167,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getRoundBracketedClauseCSAccess().getRule(); } - /// * A square bracket clause is a generalized rule for association class qualifiers and roles.* / SquareBracketedClauseCS: + ///* A square bracket clause is a generalized rule for association class qualifiers and roles.*/ SquareBracketedClauseCS: // '[' ownedTerms+=ExpCS (',' ownedTerms+=ExpCS)* ']'; public EssentialOCLGrammarAccess.SquareBracketedClauseCSElements getSquareBracketedClauseCSAccess() { return gaEssentialOCL.getSquareBracketedClauseCSAccess(); @@ -3177,8 +3177,8 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getSquareBracketedClauseCSAccess().getRule(); } - /// * A navigating argument is a generalized rule for the first argument in a round bracket clause. This is typically the first operation - // * parameter or an iterator. * / + ///* A navigating argument is a generalized rule for the first argument in a round bracket clause. This is typically the first operation + // * parameter or an iterator. */ //NavigatingArgCS: // ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)? | 'in' // ownedInitExpression=ExpCS)? | ':' ownedType=TypeExpCS; @@ -3192,9 +3192,9 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // - /// * A navigating bar argument is a generalized rule for a bar-prefixed argument in a round bracket clause. This is typically the body of an iteration. * / + ///* A navigating bar argument is a generalized rule for a bar-prefixed argument in a round bracket clause. This is typically the body of an iteration. */ //NavigatingBarArgCS NavigatingArgCS: - // prefix='|' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)? + // prefix='|' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)?; public EssentialOCLGrammarAccess.NavigatingBarArgCSElements getNavigatingBarArgCSAccess() { return gaEssentialOCL.getNavigatingBarArgCSAccess(); } @@ -3205,11 +3205,11 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // - /// * A navigating comma argument is a generalized rule for non-first argument in a round bracket clause. These are typically non-first operation - // * parameters or a second iterator. * / + ///* A navigating comma argument is a generalized rule for non-first argument in a round bracket clause. These are typically non-first operation + // * parameters or a second iterator. */ //NavigatingCommaArgCS NavigatingArgCS: // prefix=',' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)? | 'in' - // ownedInitExpression=ExpCS)? + // ownedInitExpression=ExpCS)?; public EssentialOCLGrammarAccess.NavigatingCommaArgCSElements getNavigatingCommaArgCSAccess() { return gaEssentialOCL.getNavigatingCommaArgCSAccess(); } @@ -3220,9 +3220,9 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // - /// * A navigating semi argument is a generalized rule for a semicolon prefixed argument in a round bracket clause. This is typically an iterate accumulator. * / + ///* A navigating semi argument is a generalized rule for a semicolon prefixed argument in a round bracket clause. This is typically an iterate accumulator. */ //NavigatingSemiArgCS NavigatingArgCS: - // prefix=';' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)? + // prefix=';' ownedNameExpression=NavigatingArgExpCS (':' ownedType=TypeExpCS ('=' ownedInitExpression=ExpCS)?)?; public EssentialOCLGrammarAccess.NavigatingSemiArgCSElements getNavigatingSemiArgCSAccess() { return gaEssentialOCL.getNavigatingSemiArgCSAccess(); } @@ -3233,7 +3233,8 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { //// Type-less init is an illegal infix expression // NavigatingArgExpCS ExpCS: - // ExpCS + // ExpCS // '?' -- defined by Complete OCL + //; public EssentialOCLGrammarAccess.NavigatingArgExpCSElements getNavigatingArgExpCSAccess() { return gaEssentialOCL.getNavigatingArgExpCSAccess(); } @@ -3260,7 +3261,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { // //; // ElseIfThenExpCS //IfThenExpCS: - // 'elseif' ownedCondition=ExpCS 'then' ownedThenExpression=ExpCS + // 'elseif' ownedCondition=ExpCS 'then' ownedThenExpression=ExpCS; public EssentialOCLGrammarAccess.ElseIfThenExpCSElements getElseIfThenExpCSAccess() { return gaEssentialOCL.getElseIfThenExpCSAccess(); } @@ -3351,7 +3352,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //FirstPathElementCS PathElementCS: - // referredElement=[pivot::NamedElement|super::UnrestrictedName] + // referredElement=[pivot::NamedElement|super::UnrestrictedName]; public BaseGrammarAccess.FirstPathElementCSElements getFirstPathElementCSAccess() { return gaBase.getFirstPathElementCSAccess(); } @@ -3361,7 +3362,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //NextPathElementCS PathElementCS: - // referredElement=[pivot::NamedElement|super::UnreservedName] + // referredElement=[pivot::NamedElement|super::UnreservedName]; public BaseGrammarAccess.NextPathElementCSElements getNextPathElementCSAccess() { return gaBase.getNextPathElementCSAccess(); } @@ -3451,9 +3452,9 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getIdentifierAccess().getRule(); } - /// * A lowerbounded integer is used to define the lowerbound of a collection multiplicity. The value may not be the unlimited value. * / + ///* A lowerbounded integer is used to define the lowerbound of a collection multiplicity. The value may not be the unlimited value. */ //LOWER ecore::EInt: - // INT + // INT; public BaseGrammarAccess.LOWERElements getLOWERAccess() { return gaBase.getLOWERAccess(); } @@ -3462,13 +3463,13 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getLOWERAccess().getRule(); } - /// * A number may be an integer or floating point value. The declaration here appears to be that for just an integer. This is to avoid + ///* A number may be an integer or floating point value. The declaration here appears to be that for just an integer. This is to avoid // * lookahead conflicts in simple lexers between a dot within a floating point number and the dot-dot in a CollectionLiteralPartCS. A // * practical implementation should give high priority to a successful parse of INT ('.' INT)? (('e' | 'E') ('+' | '-')? INT)? than // * to the unsuccessful partial parse of INT '..'. The type of the INT terminal is String to allow the floating point syntax to be used. - // * / + // */ //NUMBER_LITERAL BigNumber: - // INT + // INT; public BaseGrammarAccess.NUMBER_LITERALElements getNUMBER_LITERALAccess() { return gaBase.getNUMBER_LITERALAccess(); } @@ -3488,9 +3489,9 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { return getStringLiteralAccess().getRule(); } - /// * An upperbounded integer is used to define the upperbound of a collection multiplicity. The value may be the unlimited value. * / + ///* An upperbounded integer is used to define the upperbound of a collection multiplicity. The value may be the unlimited value. */ //UPPER ecore::EInt: - // INT | '*' + // INT | '*'; public BaseGrammarAccess.UPPERElements getUPPERAccess() { return gaBase.getUPPERAccess(); } @@ -3558,7 +3559,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/ *'->'* /'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return gaBase.getML_COMMENTRule(); } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext index c3c8ab667..7d6468c74 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext @@ -86,7 +86,7 @@ QueryCS: isTransient?='transient'? 'query' name=UnrestrictedName (';' | '{' ownedExpression=ExpCS '}'); RelationCS: isTop?='top'? isAbstract?='abstract'? 'relation' name=UnrestrictedName - ('overrides' overrides=[qvtrelation::Relation|UnrestrictedName])? + ('overrides' overridden=[qvtrelation::Relation|UnrestrictedName])? '{' ownedVarDeclarations+=VarDeclarationCS* (ownedDomains+=DomainCS | ownedDomains+=PrimitiveTypeDomainCS)+ diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationDeclarationVisitor.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationDeclarationVisitor.java index 8ee63a9cb..ed9816ce6 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationDeclarationVisitor.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/as2cs/QVTrelationDeclarationVisitor.java @@ -514,7 +514,7 @@ public class QVTrelationDeclarationVisitor extends QVTbaseDeclarationVisitor imp csRelation.setPivot(asRelation); csRelation.setIsAbstract(asRelation.isIsAbstract()); csRelation.setIsTop(asRelation.isIsTopLevel()); - csRelation.setOverrides((Relation) asRelation.getOverrides()); + csRelation.setOverridden((Relation) asRelation.getOverridden()); context.refreshList(csRelation.getOwnedDomains(), context.visitDeclarations(DomainCS.class, asRelation.getDomain(), null)); List<@NonNull Variable> asSharedVariables = new ArrayList<>(); for (Variable asVariable : asRelation.getVariable()) { diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/cs2as/QVTrelationCSPreOrderVisitor.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/cs2as/QVTrelationCSPreOrderVisitor.java index b2c4dc182..485167628 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/cs2as/QVTrelationCSPreOrderVisitor.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/cs2as/QVTrelationCSPreOrderVisitor.java @@ -275,7 +275,7 @@ public class QVTrelationCSPreOrderVisitor extends AbstractQVTrelationCSPreOrderV public Continuation<?> visitRelationCS(@NonNull RelationCS csElement) { Relation pivotElement = PivotUtil.getPivot(Relation.class, csElement); if (pivotElement != null) { - pivotElement.setOverrides(csElement.getOverrides()); + pivotElement.setOverridden(csElement.getOverridden()); } return null; } |