diff options
author | AdolfoSBH | 2016-12-23 11:38:41 +0000 |
---|---|---|
committer | AdolfoSBH | 2017-01-03 14:53:12 +0000 |
commit | a921ea99616ec99241310c6abae8ed5bf09c0f4d (patch) | |
tree | 678b71ae0956d87a6b4da9be9b008bf5b82c802c | |
parent | 12ed38ccc7b551ddf9347404085115d6d68f5557 (diff) | |
download | org.eclipse.ocl-asanchez/revampingPathNameCS.tar.gz org.eclipse.ocl-asanchez/revampingPathNameCS.tar.xz org.eclipse.ocl-asanchez/revampingPathNameCS.zip |
[397429] - Also removing the cross-reference from ShadowPartsasanchez/revampingPathNameCS
- To regenerate: Eclipse OCL CS Models + Eclipse OCL All Editors
-rw-r--r-- | plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.ecore | 1 | ||||
-rw-r--r-- | plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.xtext | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.ecore b/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.ecore index b41e478ecc..d833899a7a 100644 --- a/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.ecore +++ b/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.ecore @@ -257,6 +257,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="owningCurlyBracketClause" eType="#//CurlyBracketedClauseCS" eOpposite="#//CurlyBracketedClauseCS/ownedParts"/> <eStructuralFeatures xsi:type="ecore:EReference" name="referredProperty" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="propName" eType="ecore:EDataType ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-String"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="SquareBracketedClauseCS" eSuperTypes="../../org.eclipse.ocl.xtext.base/model/BaseCS.ecore#//ContextLessElementCS"> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedTerms" lowerBound="1" diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.xtext b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.xtext index 1e8ce7a079..bec602a8ee 100644 --- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.xtext +++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.xtext @@ -138,7 +138,7 @@ CollectionPatternCS returns CollectionPatternCS: '}'; ShadowPartCS returns ShadowPartCS: // PatternPartCS - (referredProperty=[pivot::Property|UnrestrictedName] '='ownedInitExpression=(ExpCS|PatternExpCS)) + (propName = UnrestrictedName '='ownedInitExpression=(ExpCS|PatternExpCS)) | ownedInitExpression=StringLiteralExpCS; PatternExpCS: |