diff options
| author | Ed Seidewitz | 2015-04-28 21:11:47 +0000 |
|---|---|---|
| committer | Arnaud Cuccuru | 2015-04-29 08:59:05 +0000 |
| commit | a41f667849ef2594fe2af0e734fe401db2779c56 (patch) | |
| tree | f8b3cfbf686bba1c7d619de4c2824c96e4434038 /plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen | |
| parent | c5dac60734d576f42e173137aac8cbcaa7ef5b8f (diff) | |
| download | org.eclipse.papyrus-a41f667849ef2594fe2af0e734fe401db2779c56.tar.gz org.eclipse.papyrus-a41f667849ef2594fe2af0e734fe401db2779c56.tar.xz org.eclipse.papyrus-a41f667849ef2594fe2af0e734fe401db2779c56.zip | |
Corrected the derivation of AssignmentExpression::isBitStringConversion.
Change-Id: I4b69e040345bfadc2b21db532942e173bc52390f
Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
Reviewed-on: https://git.eclipse.org/r/46718
Tested-by: Hudson CI
Reviewed-by: Jeremie Tatibouet <jeremie.tatibouet@cea.fr>
Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
Diffstat (limited to 'plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen')
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AssignmentExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AssignmentExpression.java index 8a907133ad0..3d2789ad5ed 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AssignmentExpression.java +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AssignmentExpression.java @@ -473,7 +473,7 @@ public interface AssignmentExpression extends Expression { * @see #setIsBitStringConversion(boolean) * @see org.eclipse.papyrus.uml.alf.AlfPackage#getAssignmentExpression_IsBitStringConversion() * @model transient="true" volatile="true" derived="true" - * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='\n let lhsType = self.leftHandSide.type in\n let rhsType = self.type in -- Note: This works for both simple and compound assignments.assignment.\n rhsType <> null and lhsType <> null and\n (self.isIntegerType(rhsType) or\n self.isCollectionConversion and self.isIntegerCollectionClass(rhsType)\n )'" + * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='\n let lhsType = self.leftHandSide.type in\n let rhsType = self.type in -- Note: This works for both simple and compound assignments.assignment.\n rhsType <> null and lhsType <> null and self.isBitStringType(lhsType) and\n (self.isIntegerType(rhsType) or\n self.isCollectionConversion and self.isIntegerCollectionClass(rhsType)\n )'" * @generated */ boolean isIsBitStringConversion(); diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/ExpressionReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/ExpressionReference.java index a7d4a017fb9..576e9779374 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/ExpressionReference.java +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/ExpressionReference.java @@ -56,7 +56,7 @@ public interface ExpressionReference extends Expression { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.type()'" + * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.type'" * @generated */ ElementReference type(); @@ -65,7 +65,7 @@ public interface ExpressionReference extends Expression { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @model required="true" - * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.lower()'" + * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.lower'" * @generated */ BigInteger lower(); @@ -74,7 +74,7 @@ public interface ExpressionReference extends Expression { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @model required="true" - * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.upper()'" + * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.upper'" * @generated */ BigInteger upper(); diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore index 42af271f7e0..183a8691add 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore @@ -2247,17 +2247,17 @@ <eClassifiers xsi:type="ecore:EClass" name="ExpressionReference" eSuperTypes="#//Expression">
<eOperations name="type" eType="#//ElementReference">
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
- <details key="body" value="self.expression.type()"/>
+ <details key="body" value="self.expression.type"/>
</eAnnotations>
</eOperations>
<eOperations name="lower" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger">
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
- <details key="body" value="self.expression.lower()"/>
+ <details key="body" value="self.expression.lower"/>
</eAnnotations>
</eOperations>
<eOperations name="upper" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger">
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
- <details key="body" value="self.expression.upper()"/>
+ <details key="body" value="self.expression.upper"/>
</eAnnotations>
</eOperations>
<eOperations name="isAddTarget" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -4613,7 +4613,7 @@ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" volatile="true"
transient="true" derived="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
- <details key="derivation" value="
 let lhsType = self.leftHandSide.type in
 let rhsType = self.type in -- Note: This works for both simple and compound assignments.assignment.
 rhsType <> null and lhsType <> null and
 (self.isIntegerType(rhsType) or
 self.isCollectionConversion and self.isIntegerCollectionClass(rhsType)
 )"/>
+ <details key="derivation" value="
 let lhsType = self.leftHandSide.type in
 let rhsType = self.type in -- Note: This works for both simple and compound assignments.assignment.
 rhsType <> null and lhsType <> null and self.isBitStringType(lhsType) and
 (self.isIntegerType(rhsType) or
 self.isCollectionConversion and self.isIntegerCollectionClass(rhsType)
 )"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
|