[515327] Add overrides to QVTc CS and grammar
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore
index 2c4064d..8933c38 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.ecore
@@ -46,6 +46,7 @@
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 9854528..8ea09ff 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.genmodel
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.genmodel
@@ -46,6 +46,7 @@
<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/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtext b/plugins/org.eclipse.qvtd.xtext.qvtcore/src/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtext
index 05d1746..79e12ad 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,6 +66,7 @@
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' ownedMiddle=UnnamedDomainCS)? ownedComposedMappings+=MappingCS* '}';
NamedDomainCS returns DomainCS: isCheck?='check'? isEnforce?='enforce'? direction=[qvtbase::TypedModel|UnrestrictedName]
@@ -132,7 +133,6 @@
//| 'include'
//| 'library'
-
UnrestrictedName returns ecore::EString:
EssentialOCLUnrestrictedName
| QVTbaseUnrestrictedName
