Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl7
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl268
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl22
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl13
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl19
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl17
6 files changed, 222 insertions, 124 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
index a82c773b1e5..5e5fa6f0ac2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
@@ -233,12 +233,11 @@
<parameter name="classifier">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
</parameter>
- <post xsi:type="ocl.ecore:OperationCallExp">
+ <post xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/trim">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</source>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/trim"/>
</post>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="CppClassHeader" visibility="Public">
@@ -573,6 +572,10 @@
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</eAnnotations>
+ <eOperations name="trim">
+ <eAnnotations source="MTL non-standard"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eOperations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl
index 8810a83d0be..00dc5ae5ffc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl
@@ -369,13 +369,38 @@
</source>
<referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface/ownedAttribute"/>
</thenExpression>
- <elseExpression xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclVoid)" kind="Sequence"/>
+ <elseExpression xsi:type="ocl.ecore:IfExp" eType="/3/Collection(Property)">
+ <condition xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/getOwnedAttributes/cl">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
+ </source>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/26/Signal">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
+ </condition>
+ <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Property)">
+ <source xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
+ </source>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/26/Signal">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
+ </source>
+ <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal/ownedAttribute"/>
+ </thenExpression>
+ <elseExpression xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(OclVoid)" kind="Sequence"/>
+ </elseExpression>
</elseExpression>
</elseExpression>
</expression>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="1865" endPosition="2004" value="&#xA;Loop over attributes. Check that the attribute is not a static const.&#xA;Constant static attributes are declared within the class declaration"/>
+ <body startPosition="1952" endPosition="2091" value="&#xA;Loop over attributes. Check that the attribute is not a static const.&#xA;Constant static attributes are declared within the class declaration"/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="CppStaticAttributes" visibility="Public">
<body xsi:type="mtl:TemplateInvocation">
@@ -803,6 +828,9 @@
<eClassifiers xsi:type="ocl.ecore:TypeType" name="Interface">
<referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
</eClassifiers>
+ <eClassifiers xsi:type="ocl.ecore:TypeType" name="Signal">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
+ </eClassifiers>
</ecore:EPackage>
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
@@ -1397,7 +1425,7 @@
</eAnnotations>
<eAnnotations source="positions.94" references="/0/getOwnedAttributes">
<details key="start" value="1498"/>
- <details key="end" value="1854"/>
+ <details key="end" value="1941"/>
<details key="line" value="38"/>
</eAnnotations>
<eAnnotations source="positions.95" references="/0/getOwnedAttributes/cl">
@@ -1407,32 +1435,32 @@
</eAnnotations>
<eAnnotations source="positions.96" references="/0/getOwnedAttributes/%">
<details key="start" value="1572"/>
- <details key="end" value="1851"/>
+ <details key="end" value="1938"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.97" references="/0/getOwnedAttributes/%/%">
<details key="start" value="1575"/>
- <details key="end" value="1598"/>
+ <details key="end" value="1596"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.98" references="/0/getOwnedAttributes/%/%/cl">
- <details key="start" value="1576"/>
- <details key="end" value="1578"/>
+ <details key="start" value="1575"/>
+ <details key="end" value="1577"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.99" references="/0/getOwnedAttributes/%/%/%">
- <details key="start" value="1591"/>
- <details key="end" value="1596"/>
+ <details key="start" value="1590"/>
+ <details key="end" value="1595"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.100" references="/0/getOwnedAttributes/%/%.1">
- <details key="start" value="1606"/>
- <details key="end" value="1637"/>
+ <details key="start" value="1604"/>
+ <details key="end" value="1635"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.101" references="/0/getOwnedAttributes/%/%.1/%">
- <details key="start" value="1606"/>
- <details key="end" value="1622"/>
+ <details key="start" value="1604"/>
+ <details key="end" value="1620"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.102" references="/0/getOwnedAttributes/%/%.1/%/self">
@@ -1441,38 +1469,38 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.103" references="/0/getOwnedAttributes/%/%.1/%/%">
- <details key="start" value="1616"/>
- <details key="end" value="1621"/>
+ <details key="start" value="1614"/>
+ <details key="end" value="1619"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.104" references="/0/getOwnedAttributes/%/%.2">
- <details key="start" value="1646"/>
- <details key="end" value="1844"/>
+ <details key="start" value="1644"/>
+ <details key="end" value="1931"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.105" references="/0/getOwnedAttributes/%/%.2/%">
- <details key="start" value="1649"/>
- <details key="end" value="1675"/>
+ <details key="start" value="1647"/>
+ <details key="end" value="1671"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.106" references="/0/getOwnedAttributes/%/%.2/%/cl">
- <details key="start" value="1650"/>
- <details key="end" value="1652"/>
+ <details key="start" value="1647"/>
+ <details key="end" value="1649"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.107" references="/0/getOwnedAttributes/%/%.2/%/%">
- <details key="start" value="1665"/>
- <details key="end" value="1673"/>
+ <details key="start" value="1662"/>
+ <details key="end" value="1670"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.108" references="/0/getOwnedAttributes/%/%.2/%.1">
- <details key="start" value="1684"/>
- <details key="end" value="1718"/>
+ <details key="start" value="1680"/>
+ <details key="end" value="1714"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.109" references="/0/getOwnedAttributes/%/%.2/%.1/%">
- <details key="start" value="1684"/>
- <details key="end" value="1703"/>
+ <details key="start" value="1680"/>
+ <details key="end" value="1699"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.110" references="/0/getOwnedAttributes/%/%.2/%.1/%/self">
@@ -1481,38 +1509,38 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.111" references="/0/getOwnedAttributes/%/%.2/%.1/%/%">
- <details key="start" value="1694"/>
- <details key="end" value="1702"/>
+ <details key="start" value="1690"/>
+ <details key="end" value="1698"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.112" references="/0/getOwnedAttributes/%/%.2/%.2">
- <details key="start" value="1729"/>
- <details key="end" value="1836"/>
+ <details key="start" value="1725"/>
+ <details key="end" value="1923"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.113" references="/0/getOwnedAttributes/%/%.2/%.2/%">
- <details key="start" value="1732"/>
- <details key="end" value="1759"/>
+ <details key="start" value="1728"/>
+ <details key="end" value="1753"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.114" references="/0/getOwnedAttributes/%/%.2/%.2/%/cl">
- <details key="start" value="1733"/>
- <details key="end" value="1735"/>
+ <details key="start" value="1728"/>
+ <details key="end" value="1730"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.115" references="/0/getOwnedAttributes/%/%.2/%.2/%/%">
- <details key="start" value="1748"/>
- <details key="end" value="1757"/>
+ <details key="start" value="1743"/>
+ <details key="end" value="1752"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.116" references="/0/getOwnedAttributes/%/%.2/%.2/%.1">
- <details key="start" value="1769"/>
- <details key="end" value="1804"/>
+ <details key="start" value="1763"/>
+ <details key="end" value="1798"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.117" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%">
- <details key="start" value="1769"/>
- <details key="end" value="1789"/>
+ <details key="start" value="1763"/>
+ <details key="end" value="1783"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.118" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%/self">
@@ -1521,114 +1549,154 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.119" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%/%">
- <details key="start" value="1779"/>
- <details key="end" value="1788"/>
+ <details key="start" value="1773"/>
+ <details key="end" value="1782"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.120" references="/0/getOwnedAttributes/%/%.2/%.2/%.2">
- <details key="start" value="1817"/>
- <details key="end" value="1827"/>
+ <details key="start" value="1811"/>
+ <details key="end" value="1914"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.121" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%">
+ <details key="start" value="1814"/>
+ <details key="end" value="1836"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.122" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%/cl">
+ <details key="start" value="1814"/>
+ <details key="end" value="1816"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.123" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%/%">
+ <details key="start" value="1829"/>
+ <details key="end" value="1835"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.121" references="/0/%.1">
+ <eAnnotations source="positions.124" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1">
+ <details key="start" value="1847"/>
+ <details key="end" value="1879"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.125" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1/%">
+ <details key="start" value="1847"/>
+ <details key="end" value="1864"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.126" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1/%/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.127" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1/%/%">
<details key="start" value="1857"/>
- <details key="end" value="2006"/>
+ <details key="end" value="1863"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.122" references="/0/CppStaticAttributes">
- <details key="start" value="2008"/>
- <details key="end" value="2245"/>
- <details key="line" value="58"/>
+ <eAnnotations source="positions.128" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.2">
+ <details key="start" value="1894"/>
+ <details key="end" value="1904"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.129" references="/0/%.1">
+ <details key="start" value="1944"/>
+ <details key="end" value="2093"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.130" references="/0/CppStaticAttributes">
+ <details key="start" value="2095"/>
+ <details key="end" value="2332"/>
+ <details key="line" value="62"/>
</eAnnotations>
- <eAnnotations source="positions.123" references="/0/CppStaticAttributes/%">
- <details key="start" value="2072"/>
- <details key="end" value="2095"/>
+ <eAnnotations source="positions.131" references="/0/CppStaticAttributes/%">
+ <details key="start" value="2159"/>
+ <details key="end" value="2182"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.124" references="/0/CppStaticAttributes/%/self">
+ <eAnnotations source="positions.132" references="/0/CppStaticAttributes/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.125" references="/0/CppStaticAttributes/%.1">
- <details key="start" value="2097"/>
- <details key="end" value="2098"/>
- <details key="line" value="60"/>
+ <eAnnotations source="positions.133" references="/0/CppStaticAttributes/%.1">
+ <details key="start" value="2184"/>
+ <details key="end" value="2185"/>
+ <details key="line" value="64"/>
</eAnnotations>
- <eAnnotations source="positions.126" references="/0/CppStaticAttributes/%.2">
- <details key="start" value="2098"/>
- <details key="end" value="2233"/>
- <details key="line" value="60"/>
+ <eAnnotations source="positions.134" references="/0/CppStaticAttributes/%.2">
+ <details key="start" value="2185"/>
+ <details key="end" value="2320"/>
+ <details key="line" value="64"/>
</eAnnotations>
- <eAnnotations source="positions.127" references="/0/CppStaticAttributes/%.2/%">
- <details key="start" value="2128"/>
- <details key="end" value="2226"/>
- <details key="line" value="61"/>
+ <eAnnotations source="positions.135" references="/0/CppStaticAttributes/%.2/%">
+ <details key="start" value="2215"/>
+ <details key="end" value="2313"/>
+ <details key="line" value="65"/>
</eAnnotations>
- <eAnnotations source="positions.128" references="/0/CppStaticAttributes/%.2/%/%">
- <details key="start" value="2182"/>
- <details key="end" value="2216"/>
+ <eAnnotations source="positions.136" references="/0/CppStaticAttributes/%.2/%/%">
+ <details key="start" value="2269"/>
+ <details key="end" value="2303"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.129" references="/0/CppStaticAttributes/%.2/%/%/self">
+ <eAnnotations source="positions.137" references="/0/CppStaticAttributes/%.2/%/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.130" references="/0/CppStaticAttributes/%.2/%/%.1">
- <details key="start" value="2218"/>
- <details key="end" value="2220"/>
- <details key="line" value="63"/>
+ <eAnnotations source="positions.138" references="/0/CppStaticAttributes/%.2/%/%.1">
+ <details key="start" value="2305"/>
+ <details key="end" value="2307"/>
+ <details key="line" value="67"/>
</eAnnotations>
- <eAnnotations source="positions.131" references="/0/CppStaticAttributes/%.2/%/%.2">
- <details key="start" value="2131"/>
- <details key="end" value="2179"/>
+ <eAnnotations source="positions.139" references="/0/CppStaticAttributes/%.2/%/%.2">
+ <details key="start" value="2218"/>
+ <details key="end" value="2266"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.132" references="/0/CppStaticAttributes/%.2/%/%.2/%">
- <details key="start" value="2132"/>
- <details key="end" value="2140"/>
+ <eAnnotations source="positions.140" references="/0/CppStaticAttributes/%.2/%/%.2/%">
+ <details key="start" value="2219"/>
+ <details key="end" value="2227"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.133" references="/0/CppStaticAttributes/%.2/%/%.2/%/self">
+ <eAnnotations source="positions.141" references="/0/CppStaticAttributes/%.2/%/%.2/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.134" references="/0/CppStaticAttributes/%.2/%/%.2/%.1">
- <details key="start" value="2145"/>
- <details key="end" value="2178"/>
+ <eAnnotations source="positions.142" references="/0/CppStaticAttributes/%.2/%/%.2/%.1">
+ <details key="start" value="2232"/>
+ <details key="end" value="2265"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.135" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%">
- <details key="start" value="2150"/>
- <details key="end" value="2177"/>
+ <eAnnotations source="positions.143" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%">
+ <details key="start" value="2237"/>
+ <details key="end" value="2264"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.136" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%/self">
+ <eAnnotations source="positions.144" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.137" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%/%">
- <details key="start" value="2164"/>
- <details key="end" value="2176"/>
+ <eAnnotations source="positions.145" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%/%">
+ <details key="start" value="2251"/>
+ <details key="end" value="2263"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.138" references="/0/CppStaticAttributes/%.2/%.1">
- <details key="start" value="2104"/>
- <details key="end" value="2124"/>
+ <eAnnotations source="positions.146" references="/0/CppStaticAttributes/%.2/%.1">
+ <details key="start" value="2191"/>
+ <details key="end" value="2211"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.139" references="/0/CppStaticAttributes/%.2/%.1/self">
+ <eAnnotations source="positions.147" references="/0/CppStaticAttributes/%.2/%.1/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.140" references="/0/CppStaticAttributes/classifier">
- <details key="start" value="2045"/>
- <details key="end" value="2068"/>
- <details key="line" value="58"/>
+ <eAnnotations source="positions.148" references="/0/CppStaticAttributes/classifier">
+ <details key="start" value="2132"/>
+ <details key="end" value="2155"/>
+ <details key="line" value="62"/>
</eAnnotations>
</ecore:EAnnotation>
</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
index 5b331857943..6dad5303306 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
@@ -7,7 +7,7 @@
<imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
<ownedModuleElement xsi:type="mtl:Template" name="CppElementDoc" visibility="Public">
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/**&#xA; * "/>
- <body xsi:type="ocl.ecore:OperationCallExp">
+ <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -22,7 +22,6 @@
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * ">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/replaceAll"/>
</body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; */"/>
<parameter name="argument">
@@ -31,7 +30,7 @@
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="CppOperationDoc" visibility="Public">
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/**&#xA; * "/>
- <body xsi:type="ocl.ecore:OperationCallExp">
+ <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -46,7 +45,6 @@
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * ">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/replaceAll"/>
</body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * "/>
<body xsi:type="mtl:ForBlock">
@@ -70,7 +68,7 @@
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="CppBehaviorDoc" visibility="Public">
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/**&#xA; * "/>
- <body xsi:type="ocl.ecore:OperationCallExp">
+ <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -85,7 +83,6 @@
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * ">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/replaceAll"/>
</body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * "/>
<body xsi:type="mtl:ForBlock">
@@ -117,7 +114,7 @@
<referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
</body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
- <body xsi:type="ocl.ecore:OperationCallExp">
+ <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -132,7 +129,6 @@
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA; * ">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/replaceAll"/>
</body>
<parameter name="parameter">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
@@ -144,6 +140,16 @@
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</eAnnotations>
+ <eOperations name="replaceAll">
+ <eAnnotations source="MTL non-standard"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <eParameters name="substring">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eParameters>
+ <eParameters name="replacement">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eParameters>
+ </eOperations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl
index da7d17226dc..f347149afb0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl
@@ -24,7 +24,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
<body xsi:type="mtl:IfBlock">
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="typedef "/>
- <body xsi:type="ocl.ecore:OperationCallExp">
+ <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="ocl.ecore:PropertyCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -57,7 +57,6 @@
</source>
<referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/replaceAll"/>
</body>
<body xsi:type="mtl:IfBlock">
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
@@ -132,6 +131,16 @@
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</eAnnotations>
+ <eOperations name="replaceAll">
+ <eAnnotations source="MTL non-standard"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <eParameters name="substring">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eParameters>
+ <eParameters name="replacement">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eParameters>
+ </eOperations>
<eOperations name="contains">
<eAnnotations source="MTL non-standard"/>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
index 8431c80f360..4a8bb6965dd 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
@@ -79,13 +79,13 @@
</source>
<referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External/name"/>
</thenExpression>
- <elseExpression xsi:type="ocl.ecore:OperationCallExp">
+ <elseExpression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <source xsi:type="ocl.ecore:OperationCallExp">
+ <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <source xsi:type="ocl.ecore:OperationCallExp">
+ <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <source xsi:type="ocl.ecore:OperationCallExp">
+ <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/+">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -101,7 +101,6 @@
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/+"/>
</source>
<argument xsi:type="ocl.ecore:PropertyCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -110,12 +109,10 @@
</source>
<referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/+"/>
</source>
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/+"/>
</source>
<argument xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -124,7 +121,6 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
</argument>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/+"/>
</elseExpression>
</elseExpression>
</expression>
@@ -196,6 +192,13 @@
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</eAnnotations>
+ <eOperations name="+">
+ <eAnnotations source="MTL non-standard"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <eParameters name="other">
+ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ </eParameters>
+ </eOperations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
index 12ada4e50f1..defb56ec5e7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
@@ -251,7 +251,7 @@
</source>
<argument xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <source xsi:type="ocl.ecore:OperationCallExp">
+ <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/startsWith">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<source xsi:type="ocl.ecore:PropertyCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -263,7 +263,6 @@
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="~">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/startsWith"/>
</source>
<referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
</argument>
@@ -676,7 +675,7 @@
<body startPosition="3141" endPosition="3211" value=" wrapper for native query (otherwise Acceleo does not indent properly)"/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="getBodyInTemplate" visibility="Public">
- <body xsi:type="ocl.ecore:OperationCallExp">
+ <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/trim">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -688,7 +687,6 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</argument>
</source>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/trim"/>
</body>
<parameter name="operation">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
@@ -983,6 +981,17 @@
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</eAnnotations>
+ <eOperations name="startsWith">
+ <eAnnotations source="MTL non-standard"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <eParameters name="substring">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eParameters>
+ </eOperations>
+ <eOperations name="trim">
+ <eAnnotations source="MTL non-standard"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eOperations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

Back to the top