diff options
| author | Andrew Eidsness | 2014-06-24 12:41:30 +0000 |
|---|---|---|
| committer | Andrew Eidsness | 2014-06-24 12:41:30 +0000 |
| commit | a5f196660d87ec2438d6d0cd7791ac32b5aa3c5b (patch) | |
| tree | f3fedbd81c8910a0b79bc893275847d276e0c440 /extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org | |
| parent | a72d17ac6495c592a4104c7afa3be504c4319680 (diff) | |
| download | org.eclipse.papyrus-a5f196660d87ec2438d6d0cd7791ac32b5aa3c5b.tar.gz org.eclipse.papyrus-a5f196660d87ec2438d6d0cd7791ac32b5aa3c5b.tar.xz org.eclipse.papyrus-a5f196660d87ec2438d6d0cd7791ac32b5aa3c5b.zip | |
Bug 422532: Create Volatile stereotype
This fixes a problem where volatile was included in the EStorageClass
enum. This does not match the C++ language spec and caused problems
(see Bugs 425594, 425597, and 425598) when the StorageClass stereotype
was applied to invalid language elements.
I've removed volatile from that enum and removed the extension from
StorageClass to Parameter and Property. I've also introduced a new
Volatile stereotype and created new extensions that mirror the ones for
Const.
I've updated the code generator to use this stereotype in the same
places that Const is currently checked. I also fixed a problem where
const (and now volatile) was generated for static member functions.
I've updated the TestCDTIntegration model but not the other ones yet. I
would like to make sure this change is OK before making changes to the
other two test models.
When generating the profile I found that uml.ecore and types.ecore were
not found. I've changed the C_Cpp.ecore file to use the platform: URIs
for these references but I'm not convinced that is the right solution.
I've also updated the namespace URI from /1 to /2. This change was
needed to get existing models to reapply the profile. I think that is
the expected method.
Change-Id: Ic572ac6a549d2c2421632a2b66414066d366b608
Signed-off-by: Andrew Eidsness <andrewe@jfront.com>
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org')
9 files changed, 696 insertions, 673 deletions
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 00dc5ae5ffc..03689dcf0f3 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 @@ -88,7 +88,7 @@ </body> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../utils/Modifier.emtl#/0/modConst"/> + <definition href="../../utils/Modifier.emtl#/0/modCVQualifier"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/20"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> </argument> @@ -168,7 +168,7 @@ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
	"/> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../utils/Modifier.emtl#/0/modConst"/> + <definition href="../../utils/Modifier.emtl#/0/modCVQualifier"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> </argument> @@ -291,7 +291,7 @@ </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Comment"> - <body startPosition="1407" endPosition="1495" value="
return a list of owned attributes, since this is not supported directly on a classifier"/> + <body startPosition="1419" endPosition="1507" value="
return a list of owned attributes, since this is not supported directly on a classifier"/> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Query" name="getOwnedAttributes" visibility="Public" type="/3/Sequence(Property)"> <parameter name="cl"> @@ -400,7 +400,7 @@ </expression> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Comment"> - <body startPosition="1952" endPosition="2091" value="
Loop over attributes. Check that the attribute is not a static const.
Constant static attributes are declared within the class declaration"/> + <body startPosition="1964" endPosition="2103" value="
Loop over attributes. Check that the attribute is not a static const.
Constant static attributes are declared within the class declaration"/> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="CppStaticAttributes" visibility="Public"> <body xsi:type="mtl:TemplateInvocation"> @@ -609,12 +609,12 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eParameters> </eOperations> - <eOperations name="modConst"> + <eOperations name="modCVQualifier"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> <contents xsi:type="ocl.ecore:Constraint"/> </eAnnotations> <eAnnotations source="MTL"> - <references href="../../utils/Modifier.emtl#/0/modConst"/> + <references href="../../utils/Modifier.emtl#/0/modCVQualifier"/> </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="propertyOrParameter"> @@ -1055,7 +1055,7 @@ </eAnnotations> <eAnnotations source="positions.20" references="/0/CppAttributeDeclaration"> <details key="start" value="692"/> - <details key="end" value="962"/> + <details key="end" value="968"/> <details key="line" value="19"/> </eAnnotations> <eAnnotations source="positions.21" references="/0/CppAttributeDeclaration/%"> @@ -1085,7 +1085,7 @@ </eAnnotations> <eAnnotations source="positions.26" references="/0/CppAttributeDeclaration/%.3"> <details key="start" value="792"/> - <details key="end" value="802"/> + <details key="end" value="808"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.27" references="/0/CppAttributeDeclaration/%.3/self"> @@ -1094,23 +1094,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.28" references="/0/CppAttributeDeclaration/%.4"> - <details key="start" value="805"/> - <details key="end" value="838"/> + <details key="start" value="811"/> + <details key="end" value="844"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.29" references="/0/CppAttributeDeclaration/%.4/%"> - <details key="start" value="805"/> - <details key="end" value="819"/> + <details key="start" value="811"/> + <details key="end" value="825"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.30" references="/0/CppAttributeDeclaration/%.4/%/attribute"> - <details key="start" value="805"/> - <details key="end" value="814"/> + <details key="start" value="811"/> + <details key="end" value="820"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.31" references="/0/CppAttributeDeclaration/%.5"> - <details key="start" value="841"/> - <details key="end" value="849"/> + <details key="start" value="847"/> + <details key="end" value="855"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.32" references="/0/CppAttributeDeclaration/%.5/self"> @@ -1119,8 +1119,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.33" references="/0/CppAttributeDeclaration/%.6"> - <details key="start" value="852"/> - <details key="end" value="860"/> + <details key="start" value="858"/> + <details key="end" value="866"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.34" references="/0/CppAttributeDeclaration/%.6/self"> @@ -1129,23 +1129,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.35" references="/0/CppAttributeDeclaration/%.7"> - <details key="start" value="862"/> - <details key="end" value="863"/> + <details key="start" value="868"/> + <details key="end" value="869"/> <details key="line" value="21"/> </eAnnotations> <eAnnotations source="positions.36" references="/0/CppAttributeDeclaration/%.8"> - <details key="start" value="864"/> - <details key="end" value="878"/> + <details key="start" value="870"/> + <details key="end" value="884"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.37" references="/0/CppAttributeDeclaration/%.8/attribute"> - <details key="start" value="864"/> - <details key="end" value="873"/> + <details key="start" value="870"/> + <details key="end" value="879"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.38" references="/0/CppAttributeDeclaration/%.9"> - <details key="start" value="881"/> - <details key="end" value="891"/> + <details key="start" value="887"/> + <details key="end" value="897"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.39" references="/0/CppAttributeDeclaration/%.9/self"> @@ -1154,13 +1154,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.40" references="/0/CppAttributeDeclaration/%.10"> - <details key="start" value="893"/> - <details key="end" value="949"/> + <details key="start" value="899"/> + <details key="end" value="955"/> <details key="line" value="21"/> </eAnnotations> <eAnnotations source="positions.41" references="/0/CppAttributeDeclaration/%.10/%"> - <details key="start" value="928"/> - <details key="end" value="942"/> + <details key="start" value="934"/> + <details key="end" value="948"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.42" references="/0/CppAttributeDeclaration/%.10/%/self"> @@ -1169,8 +1169,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.43" references="/0/CppAttributeDeclaration/%.10/%.1"> - <details key="start" value="897"/> - <details key="end" value="926"/> + <details key="start" value="903"/> + <details key="end" value="932"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.44" references="/0/CppAttributeDeclaration/%.10/%.1/self"> @@ -1179,13 +1179,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.45" references="/0/CppAttributeDeclaration/%.10/%.1/%"> - <details key="start" value="912"/> - <details key="end" value="924"/> + <details key="start" value="918"/> + <details key="end" value="930"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.46" references="/0/CppAttributeDeclaration/%.11"> - <details key="start" value="949"/> - <details key="end" value="950"/> + <details key="start" value="955"/> + <details key="end" value="956"/> <details key="line" value="21"/> </eAnnotations> <eAnnotations source="positions.47" references="/0/CppAttributeDeclaration/attribute"> @@ -1194,18 +1194,18 @@ <details key="line" value="19"/> </eAnnotations> <eAnnotations source="positions.48" references="/0/CppAttributeImplementation"> - <details key="start" value="965"/> - <details key="end" value="1168"/> + <details key="start" value="971"/> + <details key="end" value="1180"/> <details key="line" value="25"/> </eAnnotations> <eAnnotations source="positions.49" references="/0/CppAttributeImplementation/%"> - <details key="start" value="1032"/> - <details key="end" value="1033"/> + <details key="start" value="1038"/> + <details key="end" value="1039"/> <details key="line" value="26"/> </eAnnotations> <eAnnotations source="positions.50" references="/0/CppAttributeImplementation/%.1"> - <details key="start" value="1034"/> - <details key="end" value="1049"/> + <details key="start" value="1040"/> + <details key="end" value="1055"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.51" references="/0/CppAttributeImplementation/%.1/self"> @@ -1214,13 +1214,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.52" references="/0/CppAttributeImplementation/%.2"> - <details key="start" value="1051"/> - <details key="end" value="1053"/> + <details key="start" value="1057"/> + <details key="end" value="1059"/> <details key="line" value="27"/> </eAnnotations> <eAnnotations source="positions.53" references="/0/CppAttributeImplementation/%.3"> - <details key="start" value="1054"/> - <details key="end" value="1064"/> + <details key="start" value="1060"/> + <details key="end" value="1076"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.54" references="/0/CppAttributeImplementation/%.3/self"> @@ -1229,23 +1229,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.55" references="/0/CppAttributeImplementation/%.4"> - <details key="start" value="1067"/> - <details key="end" value="1100"/> + <details key="start" value="1079"/> + <details key="end" value="1112"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.56" references="/0/CppAttributeImplementation/%.4/%"> - <details key="start" value="1067"/> - <details key="end" value="1081"/> + <details key="start" value="1079"/> + <details key="end" value="1093"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.57" references="/0/CppAttributeImplementation/%.4/%/attribute"> - <details key="start" value="1067"/> - <details key="end" value="1076"/> + <details key="start" value="1079"/> + <details key="end" value="1088"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.58" references="/0/CppAttributeImplementation/%.5"> - <details key="start" value="1103"/> - <details key="end" value="1111"/> + <details key="start" value="1115"/> + <details key="end" value="1123"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.59" references="/0/CppAttributeImplementation/%.5/self"> @@ -1254,8 +1254,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.60" references="/0/CppAttributeImplementation/%.6"> - <details key="start" value="1114"/> - <details key="end" value="1122"/> + <details key="start" value="1126"/> + <details key="end" value="1134"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.61" references="/0/CppAttributeImplementation/%.6/self"> @@ -1264,23 +1264,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.62" references="/0/CppAttributeImplementation/%.7"> - <details key="start" value="1124"/> - <details key="end" value="1125"/> + <details key="start" value="1136"/> + <details key="end" value="1137"/> <details key="line" value="27"/> </eAnnotations> <eAnnotations source="positions.63" references="/0/CppAttributeImplementation/%.8"> - <details key="start" value="1126"/> - <details key="end" value="1140"/> + <details key="start" value="1138"/> + <details key="end" value="1152"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.64" references="/0/CppAttributeImplementation/%.8/attribute"> - <details key="start" value="1126"/> - <details key="end" value="1135"/> + <details key="start" value="1138"/> + <details key="end" value="1147"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.65" references="/0/CppAttributeImplementation/%.9"> - <details key="start" value="1143"/> - <details key="end" value="1153"/> + <details key="start" value="1155"/> + <details key="end" value="1165"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.66" references="/0/CppAttributeImplementation/%.9/self"> @@ -1289,23 +1289,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.67" references="/0/CppAttributeImplementation/%.10"> - <details key="start" value="1155"/> - <details key="end" value="1156"/> + <details key="start" value="1167"/> + <details key="end" value="1168"/> <details key="line" value="27"/> </eAnnotations> <eAnnotations source="positions.68" references="/0/CppAttributeImplementation/attribute"> - <details key="start" value="1009"/> - <details key="end" value="1029"/> + <details key="start" value="1015"/> + <details key="end" value="1035"/> <details key="line" value="25"/> </eAnnotations> <eAnnotations source="positions.69" references="/0/CppStaticAttributeImplementation"> - <details key="start" value="1170"/> - <details key="end" value="1396"/> + <details key="start" value="1182"/> + <details key="end" value="1408"/> <details key="line" value="30"/> </eAnnotations> <eAnnotations source="positions.70" references="/0/CppStaticAttributeImplementation/%"> - <details key="start" value="1244"/> - <details key="end" value="1259"/> + <details key="start" value="1256"/> + <details key="end" value="1271"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.71" references="/0/CppStaticAttributeImplementation/%/self"> @@ -1314,18 +1314,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.72" references="/0/CppStaticAttributeImplementation/%.1"> - <details key="start" value="1261"/> - <details key="end" value="1262"/> + <details key="start" value="1273"/> + <details key="end" value="1274"/> <details key="line" value="32"/> </eAnnotations> <eAnnotations source="positions.73" references="/0/CppStaticAttributeImplementation/%.2"> - <details key="start" value="1263"/> - <details key="end" value="1286"/> + <details key="start" value="1275"/> + <details key="end" value="1298"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.74" references="/0/CppStaticAttributeImplementation/%.2/%"> - <details key="start" value="1263"/> - <details key="end" value="1267"/> + <details key="start" value="1275"/> + <details key="end" value="1279"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.75" references="/0/CppStaticAttributeImplementation/%.2/%/self"> @@ -1334,8 +1334,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.76" references="/0/CppStaticAttributeImplementation/%.3"> - <details key="start" value="1289"/> - <details key="end" value="1297"/> + <details key="start" value="1301"/> + <details key="end" value="1309"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.77" references="/0/CppStaticAttributeImplementation/%.3/self"> @@ -1344,8 +1344,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.78" references="/0/CppStaticAttributeImplementation/%.4"> - <details key="start" value="1300"/> - <details key="end" value="1308"/> + <details key="start" value="1312"/> + <details key="end" value="1320"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.79" references="/0/CppStaticAttributeImplementation/%.4/self"> @@ -1354,43 +1354,43 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.80" references="/0/CppStaticAttributeImplementation/%.5"> - <details key="start" value="1310"/> - <details key="end" value="1311"/> + <details key="start" value="1322"/> + <details key="end" value="1323"/> <details key="line" value="32"/> </eAnnotations> <eAnnotations source="positions.81" references="/0/CppStaticAttributeImplementation/%.6"> - <details key="start" value="1312"/> - <details key="end" value="1332"/> + <details key="start" value="1324"/> + <details key="end" value="1344"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.82" references="/0/CppStaticAttributeImplementation/%.6/%"> - <details key="start" value="1312"/> - <details key="end" value="1327"/> + <details key="start" value="1324"/> + <details key="end" value="1339"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.83" references="/0/CppStaticAttributeImplementation/%.6/%/attribute"> - <details key="start" value="1312"/> - <details key="end" value="1321"/> + <details key="start" value="1324"/> + <details key="end" value="1333"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.84" references="/0/CppStaticAttributeImplementation/%.7"> - <details key="start" value="1334"/> - <details key="end" value="1336"/> + <details key="start" value="1346"/> + <details key="end" value="1348"/> <details key="line" value="32"/> </eAnnotations> <eAnnotations source="positions.85" references="/0/CppStaticAttributeImplementation/%.8"> - <details key="start" value="1337"/> - <details key="end" value="1351"/> + <details key="start" value="1349"/> + <details key="end" value="1363"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.86" references="/0/CppStaticAttributeImplementation/%.8/attribute"> - <details key="start" value="1337"/> - <details key="end" value="1346"/> + <details key="start" value="1349"/> + <details key="end" value="1358"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.87" references="/0/CppStaticAttributeImplementation/%.9"> - <details key="start" value="1354"/> - <details key="end" value="1364"/> + <details key="start" value="1366"/> + <details key="end" value="1376"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.88" references="/0/CppStaticAttributeImplementation/%.9/self"> @@ -1399,8 +1399,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.89" references="/0/CppStaticAttributeImplementation/%.10"> - <details key="start" value="1367"/> - <details key="end" value="1381"/> + <details key="start" value="1379"/> + <details key="end" value="1393"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.90" references="/0/CppStaticAttributeImplementation/%.10/self"> @@ -1409,58 +1409,58 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.91" references="/0/CppStaticAttributeImplementation/%.11"> - <details key="start" value="1383"/> - <details key="end" value="1384"/> + <details key="start" value="1395"/> + <details key="end" value="1396"/> <details key="line" value="32"/> </eAnnotations> <eAnnotations source="positions.92" references="/0/CppStaticAttributeImplementation/attribute"> - <details key="start" value="1220"/> - <details key="end" value="1240"/> + <details key="start" value="1232"/> + <details key="end" value="1252"/> <details key="line" value="30"/> </eAnnotations> <eAnnotations source="positions.93" references="/0/%"> - <details key="start" value="1399"/> - <details key="end" value="1497"/> + <details key="start" value="1411"/> + <details key="end" value="1509"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.94" references="/0/getOwnedAttributes"> - <details key="start" value="1498"/> - <details key="end" value="1941"/> + <details key="start" value="1510"/> + <details key="end" value="1953"/> <details key="line" value="38"/> </eAnnotations> <eAnnotations source="positions.95" references="/0/getOwnedAttributes/cl"> - <details key="start" value="1531"/> - <details key="end" value="1546"/> + <details key="start" value="1543"/> + <details key="end" value="1558"/> <details key="line" value="38"/> </eAnnotations> <eAnnotations source="positions.96" references="/0/getOwnedAttributes/%"> - <details key="start" value="1572"/> - <details key="end" value="1938"/> + <details key="start" value="1584"/> + <details key="end" value="1950"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.97" references="/0/getOwnedAttributes/%/%"> - <details key="start" value="1575"/> - <details key="end" value="1596"/> + <details key="start" value="1587"/> + <details key="end" value="1608"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.98" references="/0/getOwnedAttributes/%/%/cl"> - <details key="start" value="1575"/> - <details key="end" value="1577"/> + <details key="start" value="1587"/> + <details key="end" value="1589"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.99" references="/0/getOwnedAttributes/%/%/%"> - <details key="start" value="1590"/> - <details key="end" value="1595"/> + <details key="start" value="1602"/> + <details key="end" value="1607"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.100" references="/0/getOwnedAttributes/%/%.1"> - <details key="start" value="1604"/> - <details key="end" value="1635"/> + <details key="start" value="1616"/> + <details key="end" value="1647"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.101" references="/0/getOwnedAttributes/%/%.1/%"> - <details key="start" value="1604"/> - <details key="end" value="1620"/> + <details key="start" value="1616"/> + <details key="end" value="1632"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.102" references="/0/getOwnedAttributes/%/%.1/%/self"> @@ -1469,38 +1469,38 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.103" references="/0/getOwnedAttributes/%/%.1/%/%"> - <details key="start" value="1614"/> - <details key="end" value="1619"/> + <details key="start" value="1626"/> + <details key="end" value="1631"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.104" references="/0/getOwnedAttributes/%/%.2"> - <details key="start" value="1644"/> - <details key="end" value="1931"/> + <details key="start" value="1656"/> + <details key="end" value="1943"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.105" references="/0/getOwnedAttributes/%/%.2/%"> - <details key="start" value="1647"/> - <details key="end" value="1671"/> + <details key="start" value="1659"/> + <details key="end" value="1683"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.106" references="/0/getOwnedAttributes/%/%.2/%/cl"> - <details key="start" value="1647"/> - <details key="end" value="1649"/> + <details key="start" value="1659"/> + <details key="end" value="1661"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.107" references="/0/getOwnedAttributes/%/%.2/%/%"> - <details key="start" value="1662"/> - <details key="end" value="1670"/> + <details key="start" value="1674"/> + <details key="end" value="1682"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.108" references="/0/getOwnedAttributes/%/%.2/%.1"> - <details key="start" value="1680"/> - <details key="end" value="1714"/> + <details key="start" value="1692"/> + <details key="end" value="1726"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.109" references="/0/getOwnedAttributes/%/%.2/%.1/%"> - <details key="start" value="1680"/> - <details key="end" value="1699"/> + <details key="start" value="1692"/> + <details key="end" value="1711"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.110" references="/0/getOwnedAttributes/%/%.2/%.1/%/self"> @@ -1509,38 +1509,38 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.111" references="/0/getOwnedAttributes/%/%.2/%.1/%/%"> - <details key="start" value="1690"/> - <details key="end" value="1698"/> + <details key="start" value="1702"/> + <details key="end" value="1710"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.112" references="/0/getOwnedAttributes/%/%.2/%.2"> - <details key="start" value="1725"/> - <details key="end" value="1923"/> + <details key="start" value="1737"/> + <details key="end" value="1935"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.113" references="/0/getOwnedAttributes/%/%.2/%.2/%"> - <details key="start" value="1728"/> - <details key="end" value="1753"/> + <details key="start" value="1740"/> + <details key="end" value="1765"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.114" references="/0/getOwnedAttributes/%/%.2/%.2/%/cl"> - <details key="start" value="1728"/> - <details key="end" value="1730"/> + <details key="start" value="1740"/> + <details key="end" value="1742"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.115" references="/0/getOwnedAttributes/%/%.2/%.2/%/%"> - <details key="start" value="1743"/> - <details key="end" value="1752"/> + <details key="start" value="1755"/> + <details key="end" value="1764"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.116" references="/0/getOwnedAttributes/%/%.2/%.2/%.1"> - <details key="start" value="1763"/> - <details key="end" value="1798"/> + <details key="start" value="1775"/> + <details key="end" value="1810"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.117" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%"> - <details key="start" value="1763"/> - <details key="end" value="1783"/> + <details key="start" value="1775"/> + <details key="end" value="1795"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.118" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%/self"> @@ -1549,38 +1549,38 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.119" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%/%"> - <details key="start" value="1773"/> - <details key="end" value="1782"/> + <details key="start" value="1785"/> + <details key="end" value="1794"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.120" references="/0/getOwnedAttributes/%/%.2/%.2/%.2"> - <details key="start" value="1811"/> - <details key="end" value="1914"/> + <details key="start" value="1823"/> + <details key="end" value="1926"/> <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="start" value="1826"/> + <details key="end" value="1848"/> <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="start" value="1826"/> + <details key="end" value="1828"/> <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="start" value="1841"/> + <details key="end" value="1847"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.124" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1"> - <details key="start" value="1847"/> - <details key="end" value="1879"/> + <details key="start" value="1859"/> + <details key="end" value="1891"/> <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="start" value="1859"/> + <details key="end" value="1876"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.126" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1/%/self"> @@ -1589,28 +1589,28 @@ <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="1863"/> + <details key="start" value="1869"/> + <details key="end" value="1875"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.128" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.2"> - <details key="start" value="1894"/> - <details key="end" value="1904"/> + <details key="start" value="1906"/> + <details key="end" value="1916"/> <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="start" value="1956"/> + <details key="end" value="2105"/> <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="start" value="2107"/> + <details key="end" value="2344"/> <details key="line" value="62"/> </eAnnotations> <eAnnotations source="positions.131" references="/0/CppStaticAttributes/%"> - <details key="start" value="2159"/> - <details key="end" value="2182"/> + <details key="start" value="2171"/> + <details key="end" value="2194"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.132" references="/0/CppStaticAttributes/%/self"> @@ -1619,23 +1619,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.133" references="/0/CppStaticAttributes/%.1"> - <details key="start" value="2184"/> - <details key="end" value="2185"/> + <details key="start" value="2196"/> + <details key="end" value="2197"/> <details key="line" value="64"/> </eAnnotations> <eAnnotations source="positions.134" references="/0/CppStaticAttributes/%.2"> - <details key="start" value="2185"/> - <details key="end" value="2320"/> + <details key="start" value="2197"/> + <details key="end" value="2332"/> <details key="line" value="64"/> </eAnnotations> <eAnnotations source="positions.135" references="/0/CppStaticAttributes/%.2/%"> - <details key="start" value="2215"/> - <details key="end" value="2313"/> + <details key="start" value="2227"/> + <details key="end" value="2325"/> <details key="line" value="65"/> </eAnnotations> <eAnnotations source="positions.136" references="/0/CppStaticAttributes/%.2/%/%"> - <details key="start" value="2269"/> - <details key="end" value="2303"/> + <details key="start" value="2281"/> + <details key="end" value="2315"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.137" references="/0/CppStaticAttributes/%.2/%/%/self"> @@ -1644,18 +1644,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.138" references="/0/CppStaticAttributes/%.2/%/%.1"> - <details key="start" value="2305"/> - <details key="end" value="2307"/> + <details key="start" value="2317"/> + <details key="end" value="2319"/> <details key="line" value="67"/> </eAnnotations> <eAnnotations source="positions.139" references="/0/CppStaticAttributes/%.2/%/%.2"> - <details key="start" value="2218"/> - <details key="end" value="2266"/> + <details key="start" value="2230"/> + <details key="end" value="2278"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.140" references="/0/CppStaticAttributes/%.2/%/%.2/%"> - <details key="start" value="2219"/> - <details key="end" value="2227"/> + <details key="start" value="2231"/> + <details key="end" value="2239"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.141" references="/0/CppStaticAttributes/%.2/%/%.2/%/self"> @@ -1664,13 +1664,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.142" references="/0/CppStaticAttributes/%.2/%/%.2/%.1"> - <details key="start" value="2232"/> - <details key="end" value="2265"/> + <details key="start" value="2244"/> + <details key="end" value="2277"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.143" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%"> - <details key="start" value="2237"/> - <details key="end" value="2264"/> + <details key="start" value="2249"/> + <details key="end" value="2276"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.144" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%/self"> @@ -1679,13 +1679,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.145" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%/%"> - <details key="start" value="2251"/> - <details key="end" value="2263"/> + <details key="start" value="2263"/> + <details key="end" value="2275"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.146" references="/0/CppStaticAttributes/%.2/%.1"> - <details key="start" value="2191"/> - <details key="end" value="2211"/> + <details key="start" value="2203"/> + <details key="end" value="2223"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.147" references="/0/CppStaticAttributes/%.2/%.1/self"> @@ -1694,8 +1694,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.148" references="/0/CppStaticAttributes/classifier"> - <details key="start" value="2132"/> - <details key="end" value="2155"/> + <details key="start" value="2144"/> + <details key="end" value="2167"/> <details key="line" value="62"/> </eAnnotations> </ecore:EAnnotation> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl index d2b364f1506..d94e14d709b 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl @@ -18,13 +18,13 @@ [template public CppAttributeDeclaration(attribute : Property)] [CppElementDoc()/] -[staticValue()/][modConst()/][attribute.type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/][if (hasStereotype(C_Cpp::Const))][defaultValue()/][/if]; +[staticValue()/][modCVQualifier()/][attribute.type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/][if (hasStereotype(C_Cpp::Const))][defaultValue()/][/if]; [/template] [template public CppAttributeImplementation(attribute : Property)] [CppElementDoc()/] - [modConst()/][attribute.type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/]; + [modCVQualifier()/][attribute.type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/]; [/template] [template public CppStaticAttributeImplementation(attribute : Property)] 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 5a9f2997d9e..151d49fa366 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 @@ -319,7 +319,7 @@ </source> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../utils/Modifier.emtl#/0/modConst"/> + <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/> <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect/temp1"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/> </argument> @@ -403,7 +403,7 @@ <else> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../utils/Modifier.emtl#/0/modConst"/> + <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/> <argument xsi:type="mtl:QueryInvocation"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/> @@ -550,7 +550,7 @@ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../utils/Modifier.emtl#/0/modConst"/> + <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/67"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </argument> @@ -608,7 +608,7 @@ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../utils/Modifier.emtl#/0/modConst"/> + <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </argument> @@ -622,7 +622,7 @@ <body xsi:type="mtl:IfBlock"> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" : "/> <body xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> + <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"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ConstInit"/> <source xsi:type="mtl:QueryInvocation"> @@ -672,7 +672,7 @@ </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Comment"> - <body startPosition="3141" endPosition="3211" value=" wrapper for native query (otherwise Acceleo does not indent properly)"/> + <body startPosition="3165" endPosition="3235" 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" referredOperation="/1/String_Class/trim"> @@ -878,7 +878,7 @@ </body> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../utils/Modifier.emtl#/0/modConst"/> + <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/120"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </argument> @@ -954,7 +954,7 @@ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../utils/Modifier.emtl#/0/modConst"/> + <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/132"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </argument> @@ -1287,12 +1287,12 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eParameters> </eOperations> - <eOperations name="modConst"> + <eOperations name="modCVQualifier"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> <contents xsi:type="ocl.ecore:Constraint"/> </eAnnotations> <eAnnotations source="MTL"> - <references href="../../../utils/Modifier.emtl#/0/modConst"/> + <references href="../../../utils/Modifier.emtl#/0/modCVQualifier"/> </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="propertyOrParameter"> @@ -2332,12 +2332,12 @@ </eAnnotations> <eAnnotations source="positions.84" references="/0/CppReturnSpec"> <details key="start" value="1792"/> - <details key="end" value="2045"/> + <details key="end" value="2051"/> <details key="line" value="57"/> </eAnnotations> <eAnnotations source="positions.85" references="/0/CppReturnSpec/%"> <details key="start" value="1847"/> - <details key="end" value="2033"/> + <details key="end" value="2039"/> <details key="line" value="58"/> </eAnnotations> <eAnnotations source="positions.86" references="/0/CppReturnSpec/%/%"> @@ -2387,12 +2387,12 @@ </eAnnotations> <eAnnotations source="positions.95" references="/0/CppReturnSpec/%/%.2"> <details key="start" value="1914"/> - <details key="end" value="2028"/> + <details key="end" value="2034"/> <details key="line" value="58"/> </eAnnotations> <eAnnotations source="positions.96" references="/0/CppReturnSpec/%/%.2/collect"> <details key="start" value="1921"/> - <details key="end" value="1946"/> + <details key="end" value="1952"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.97" references="/0/CppReturnSpec/%/%.2/collect/%"> @@ -2421,18 +2421,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.102" references="/0/CppReturnSpec/%/%.2/%"> - <details key="start" value="1948"/> - <details key="end" value="1949"/> + <details key="start" value="1954"/> + <details key="end" value="1955"/> <details key="line" value="58"/> </eAnnotations> <eAnnotations source="positions.103" references="/0/CppReturnSpec/%/%.2/%.1"> - <details key="start" value="1950"/> - <details key="end" value="1973"/> + <details key="start" value="1956"/> + <details key="end" value="1979"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.104" references="/0/CppReturnSpec/%/%.2/%.1/%"> - <details key="start" value="1950"/> - <details key="end" value="1954"/> + <details key="start" value="1956"/> + <details key="end" value="1960"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.105" references="/0/CppReturnSpec/%/%.2/%.1/%/self"> @@ -2441,13 +2441,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.106" references="/0/CppReturnSpec/%/%.2/collect.1"> - <details key="start" value="1976"/> - <details key="end" value="1999"/> + <details key="start" value="1982"/> + <details key="end" value="2005"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.107" references="/0/CppReturnSpec/%/%.2/collect.1/%"> - <details key="start" value="1976"/> - <details key="end" value="1990"/> + <details key="start" value="1982"/> + <details key="end" value="1996"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.108" references="/0/CppReturnSpec/%/%.2/collect.1/%/self"> @@ -2471,13 +2471,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.112" references="/0/CppReturnSpec/%/%.2/collect.2"> - <details key="start" value="2002"/> - <details key="end" value="2025"/> + <details key="start" value="2008"/> + <details key="end" value="2031"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.113" references="/0/CppReturnSpec/%/%.2/collect.2/%"> - <details key="start" value="2002"/> - <details key="end" value="2016"/> + <details key="start" value="2008"/> + <details key="end" value="2022"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.114" references="/0/CppReturnSpec/%/%.2/collect.2/%/self"> @@ -2501,8 +2501,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.118" references="/0/CppReturnSpec/%/%.2/%.2"> - <details key="start" value="2027"/> - <details key="end" value="2028"/> + <details key="start" value="2033"/> + <details key="end" value="2034"/> <details key="line" value="58"/> </eAnnotations> <eAnnotations source="positions.119" references="/0/CppReturnSpec/operation"> @@ -2511,28 +2511,28 @@ <details key="line" value="57"/> </eAnnotations> <eAnnotations source="positions.120" references="/0/CppReturnSpec.1"> - <details key="start" value="2048"/> - <details key="end" value="2280"/> + <details key="start" value="2054"/> + <details key="end" value="2292"/> <details key="line" value="62"/> </eAnnotations> <eAnnotations source="positions.121" references="/0/CppReturnSpec.1/%"> - <details key="start" value="2101"/> - <details key="end" value="2268"/> + <details key="start" value="2107"/> + <details key="end" value="2280"/> <details key="line" value="63"/> </eAnnotations> <eAnnotations source="positions.122" references="/0/CppReturnSpec.1/%/%"> - <details key="start" value="2129"/> - <details key="end" value="2134"/> + <details key="start" value="2135"/> + <details key="end" value="2140"/> <details key="line" value="63"/> </eAnnotations> <eAnnotations source="positions.123" references="/0/CppReturnSpec.1/%/%.1"> - <details key="start" value="2105"/> - <details key="end" value="2128"/> + <details key="start" value="2111"/> + <details key="end" value="2134"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.124" references="/0/CppReturnSpec.1/%/%.1/%"> - <details key="start" value="2106"/> - <details key="end" value="2120"/> + <details key="start" value="2112"/> + <details key="end" value="2126"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.125" references="/0/CppReturnSpec.1/%/%.1/%/self"> @@ -2541,23 +2541,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.126" references="/0/CppReturnSpec.1/%/%.1/%.1"> - <details key="start" value="2123"/> - <details key="end" value="2127"/> + <details key="start" value="2129"/> + <details key="end" value="2133"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.127" references="/0/CppReturnSpec.1/%/%.2"> - <details key="start" value="2134"/> - <details key="end" value="2263"/> + <details key="start" value="2140"/> + <details key="end" value="2275"/> <details key="line" value="63"/> </eAnnotations> <eAnnotations source="positions.128" references="/0/CppReturnSpec.1/%/%.2/%"> - <details key="start" value="2141"/> - <details key="end" value="2166"/> + <details key="start" value="2147"/> + <details key="end" value="2178"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.129" references="/0/CppReturnSpec.1/%/%.2/%/%"> - <details key="start" value="2141"/> - <details key="end" value="2155"/> + <details key="start" value="2147"/> + <details key="end" value="2161"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.130" references="/0/CppReturnSpec.1/%/%.2/%/%/self"> @@ -2566,23 +2566,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.131" references="/0/CppReturnSpec.1/%/%.2/%.1"> - <details key="start" value="2168"/> - <details key="end" value="2169"/> + <details key="start" value="2180"/> + <details key="end" value="2181"/> <details key="line" value="63"/> </eAnnotations> <eAnnotations source="positions.132" references="/0/CppReturnSpec.1/%/%.2/%.2"> - <details key="start" value="2170"/> - <details key="end" value="2208"/> + <details key="start" value="2182"/> + <details key="end" value="2220"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.133" references="/0/CppReturnSpec.1/%/%.2/%.2/%"> - <details key="start" value="2170"/> - <details key="end" value="2189"/> + <details key="start" value="2182"/> + <details key="end" value="2201"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.134" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%"> - <details key="start" value="2170"/> - <details key="end" value="2184"/> + <details key="start" value="2182"/> + <details key="end" value="2196"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.135" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%/self"> @@ -2591,13 +2591,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.136" references="/0/CppReturnSpec.1/%/%.2/%.3"> - <details key="start" value="2211"/> - <details key="end" value="2234"/> + <details key="start" value="2223"/> + <details key="end" value="2246"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.137" references="/0/CppReturnSpec.1/%/%.2/%.3/%"> - <details key="start" value="2211"/> - <details key="end" value="2225"/> + <details key="start" value="2223"/> + <details key="end" value="2237"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.138" references="/0/CppReturnSpec.1/%/%.2/%.3/%/self"> @@ -2606,13 +2606,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.139" references="/0/CppReturnSpec.1/%/%.2/%.4"> - <details key="start" value="2237"/> - <details key="end" value="2260"/> + <details key="start" value="2249"/> + <details key="end" value="2272"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.140" references="/0/CppReturnSpec.1/%/%.2/%.4/%"> - <details key="start" value="2237"/> - <details key="end" value="2251"/> + <details key="start" value="2249"/> + <details key="end" value="2263"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.141" references="/0/CppReturnSpec.1/%/%.2/%.4/%/self"> @@ -2621,33 +2621,33 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.142" references="/0/CppReturnSpec.1/%/%.2/%.5"> - <details key="start" value="2262"/> - <details key="end" value="2263"/> + <details key="start" value="2274"/> + <details key="end" value="2275"/> <details key="line" value="63"/> </eAnnotations> <eAnnotations source="positions.143" references="/0/CppReturnSpec.1/behavior"> - <details key="start" value="2079"/> - <details key="end" value="2098"/> + <details key="start" value="2085"/> + <details key="end" value="2104"/> <details key="line" value="62"/> </eAnnotations> <eAnnotations source="positions.144" references="/0/InlineTxt"> - <details key="start" value="2283"/> - <details key="end" value="2382"/> + <details key="start" value="2295"/> + <details key="end" value="2394"/> <details key="line" value="67"/> </eAnnotations> <eAnnotations source="positions.145" references="/0/InlineTxt/%"> - <details key="start" value="2330"/> - <details key="end" value="2370"/> + <details key="start" value="2342"/> + <details key="end" value="2382"/> <details key="line" value="68"/> </eAnnotations> <eAnnotations source="positions.146" references="/0/InlineTxt/%/%"> - <details key="start" value="2358"/> - <details key="end" value="2365"/> + <details key="start" value="2370"/> + <details key="end" value="2377"/> <details key="line" value="68"/> </eAnnotations> <eAnnotations source="positions.147" references="/0/InlineTxt/%/%.1"> - <details key="start" value="2334"/> - <details key="end" value="2357"/> + <details key="start" value="2346"/> + <details key="end" value="2369"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.148" references="/0/InlineTxt/%/%.1/self"> @@ -2656,33 +2656,33 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.149" references="/0/InlineTxt/%/%.1/%"> - <details key="start" value="2349"/> - <details key="end" value="2355"/> + <details key="start" value="2361"/> + <details key="end" value="2367"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.150" references="/0/InlineTxt/element"> - <details key="start" value="2310"/> - <details key="end" value="2327"/> + <details key="start" value="2322"/> + <details key="end" value="2339"/> <details key="line" value="67"/> </eAnnotations> <eAnnotations source="positions.151" references="/0/staticTxt"> - <details key="start" value="2385"/> - <details key="end" value="2475"/> + <details key="start" value="2397"/> + <details key="end" value="2487"/> <details key="line" value="72"/> </eAnnotations> <eAnnotations source="positions.152" references="/0/staticTxt/%"> - <details key="start" value="2436"/> - <details key="end" value="2463"/> + <details key="start" value="2448"/> + <details key="end" value="2475"/> <details key="line" value="73"/> </eAnnotations> <eAnnotations source="positions.153" references="/0/staticTxt/%/%"> - <details key="start" value="2451"/> - <details key="end" value="2458"/> + <details key="start" value="2463"/> + <details key="end" value="2470"/> <details key="line" value="73"/> </eAnnotations> <eAnnotations source="positions.154" references="/0/staticTxt/%/%.1"> - <details key="start" value="2440"/> - <details key="end" value="2450"/> + <details key="start" value="2452"/> + <details key="end" value="2462"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.155" references="/0/staticTxt/%/%.1/self"> @@ -2691,18 +2691,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.156" references="/0/staticTxt/operation"> - <details key="start" value="2412"/> - <details key="end" value="2433"/> + <details key="start" value="2424"/> + <details key="end" value="2445"/> <details key="line" value="72"/> </eAnnotations> <eAnnotations source="positions.157" references="/0/CppOperationDeclaration"> - <details key="start" value="2477"/> - <details key="end" value="2733"/> + <details key="start" value="2489"/> + <details key="end" value="2751"/> <details key="line" value="76"/> </eAnnotations> <eAnnotations source="positions.158" references="/0/CppOperationDeclaration/%"> - <details key="start" value="2543"/> - <details key="end" value="2560"/> + <details key="start" value="2555"/> + <details key="end" value="2572"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.159" references="/0/CppOperationDeclaration/%/self"> @@ -2711,13 +2711,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.160" references="/0/CppOperationDeclaration/%.1"> - <details key="start" value="2562"/> - <details key="end" value="2563"/> + <details key="start" value="2574"/> + <details key="end" value="2575"/> <details key="line" value="78"/> </eAnnotations> <eAnnotations source="positions.161" references="/0/CppOperationDeclaration/%.2"> - <details key="start" value="2564"/> - <details key="end" value="2575"/> + <details key="start" value="2576"/> + <details key="end" value="2587"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.162" references="/0/CppOperationDeclaration/%.2/self"> @@ -2726,8 +2726,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.163" references="/0/CppOperationDeclaration/%.3"> - <details key="start" value="2578"/> - <details key="end" value="2590"/> + <details key="start" value="2590"/> + <details key="end" value="2602"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.164" references="/0/CppOperationDeclaration/%.3/self"> @@ -2736,8 +2736,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.165" references="/0/CppOperationDeclaration/%.4"> - <details key="start" value="2593"/> - <details key="end" value="2604"/> + <details key="start" value="2605"/> + <details key="end" value="2616"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.166" references="/0/CppOperationDeclaration/%.4/self"> @@ -2746,8 +2746,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.167" references="/0/CppOperationDeclaration/%.5"> - <details key="start" value="2607"/> - <details key="end" value="2622"/> + <details key="start" value="2619"/> + <details key="end" value="2634"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.168" references="/0/CppOperationDeclaration/%.5/self"> @@ -2756,8 +2756,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.169" references="/0/CppOperationDeclaration/%.6"> - <details key="start" value="2625"/> - <details key="end" value="2637"/> + <details key="start" value="2637"/> + <details key="end" value="2649"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.170" references="/0/CppOperationDeclaration/%.6/self"> @@ -2766,23 +2766,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.171" references="/0/CppOperationDeclaration/%.7"> - <details key="start" value="2640"/> - <details key="end" value="2654"/> + <details key="start" value="2652"/> + <details key="end" value="2666"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.172" references="/0/CppOperationDeclaration/%.7/operation"> - <details key="start" value="2640"/> - <details key="end" value="2649"/> + <details key="start" value="2652"/> + <details key="end" value="2661"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.173" references="/0/CppOperationDeclaration/%.8"> - <details key="start" value="2656"/> - <details key="end" value="2657"/> + <details key="start" value="2668"/> + <details key="end" value="2669"/> <details key="line" value="78"/> </eAnnotations> <eAnnotations source="positions.174" references="/0/CppOperationDeclaration/%.9"> - <details key="start" value="2658"/> - <details key="end" value="2686"/> + <details key="start" value="2670"/> + <details key="end" value="2698"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.175" references="/0/CppOperationDeclaration/%.9/self"> @@ -2791,18 +2791,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.176" references="/0/CppOperationDeclaration/%.9/%"> - <details key="start" value="2681"/> - <details key="end" value="2685"/> + <details key="start" value="2693"/> + <details key="end" value="2697"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.177" references="/0/CppOperationDeclaration/%.10"> - <details key="start" value="2688"/> - <details key="end" value="2689"/> + <details key="start" value="2700"/> + <details key="end" value="2701"/> <details key="line" value="78"/> </eAnnotations> <eAnnotations source="positions.178" references="/0/CppOperationDeclaration/%.11"> - <details key="start" value="2690"/> - <details key="end" value="2700"/> + <details key="start" value="2702"/> + <details key="end" value="2718"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.179" references="/0/CppOperationDeclaration/%.11/self"> @@ -2811,8 +2811,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.180" references="/0/CppOperationDeclaration/%.12"> - <details key="start" value="2703"/> - <details key="end" value="2718"/> + <details key="start" value="2721"/> + <details key="end" value="2736"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.181" references="/0/CppOperationDeclaration/%.12/self"> @@ -2821,23 +2821,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.182" references="/0/CppOperationDeclaration/%.13"> - <details key="start" value="2720"/> - <details key="end" value="2721"/> + <details key="start" value="2738"/> + <details key="end" value="2739"/> <details key="line" value="78"/> </eAnnotations> <eAnnotations source="positions.183" references="/0/CppOperationDeclaration/operation"> - <details key="start" value="2518"/> - <details key="end" value="2539"/> + <details key="start" value="2530"/> + <details key="end" value="2551"/> <details key="line" value="76"/> </eAnnotations> <eAnnotations source="positions.184" references="/0/CppBehaviorDeclaration"> - <details key="start" value="2735"/> - <details key="end" value="2923"/> + <details key="start" value="2753"/> + <details key="end" value="2947"/> <details key="line" value="81"/> </eAnnotations> <eAnnotations source="positions.185" references="/0/CppBehaviorDeclaration/%"> - <details key="start" value="2798"/> - <details key="end" value="2814"/> + <details key="start" value="2816"/> + <details key="end" value="2832"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.186" references="/0/CppBehaviorDeclaration/%/self"> @@ -2846,13 +2846,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.187" references="/0/CppBehaviorDeclaration/%.1"> - <details key="start" value="2816"/> - <details key="end" value="2817"/> + <details key="start" value="2834"/> + <details key="end" value="2835"/> <details key="line" value="83"/> </eAnnotations> <eAnnotations source="positions.188" references="/0/CppBehaviorDeclaration/%.2"> - <details key="start" value="2818"/> - <details key="end" value="2829"/> + <details key="start" value="2836"/> + <details key="end" value="2847"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.189" references="/0/CppBehaviorDeclaration/%.2/self"> @@ -2861,8 +2861,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.190" references="/0/CppBehaviorDeclaration/%.3"> - <details key="start" value="2832"/> - <details key="end" value="2847"/> + <details key="start" value="2850"/> + <details key="end" value="2865"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.191" references="/0/CppBehaviorDeclaration/%.3/self"> @@ -2871,23 +2871,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.192" references="/0/CppBehaviorDeclaration/%.4"> - <details key="start" value="2850"/> - <details key="end" value="2863"/> + <details key="start" value="2868"/> + <details key="end" value="2881"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.193" references="/0/CppBehaviorDeclaration/%.4/behavior"> - <details key="start" value="2850"/> - <details key="end" value="2858"/> + <details key="start" value="2868"/> + <details key="end" value="2876"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.194" references="/0/CppBehaviorDeclaration/%.5"> - <details key="start" value="2865"/> - <details key="end" value="2866"/> + <details key="start" value="2883"/> + <details key="end" value="2884"/> <details key="line" value="83"/> </eAnnotations> <eAnnotations source="positions.195" references="/0/CppBehaviorDeclaration/%.6"> - <details key="start" value="2867"/> - <details key="end" value="2894"/> + <details key="start" value="2885"/> + <details key="end" value="2912"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.196" references="/0/CppBehaviorDeclaration/%.6/self"> @@ -2896,18 +2896,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.197" references="/0/CppBehaviorDeclaration/%.6/%"> - <details key="start" value="2889"/> - <details key="end" value="2893"/> + <details key="start" value="2907"/> + <details key="end" value="2911"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.198" references="/0/CppBehaviorDeclaration/%.7"> - <details key="start" value="2896"/> - <details key="end" value="2897"/> + <details key="start" value="2914"/> + <details key="end" value="2915"/> <details key="line" value="83"/> </eAnnotations> <eAnnotations source="positions.199" references="/0/CppBehaviorDeclaration/%.8"> - <details key="start" value="2898"/> - <details key="end" value="2908"/> + <details key="start" value="2916"/> + <details key="end" value="2932"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.200" references="/0/CppBehaviorDeclaration/%.8/self"> @@ -2916,43 +2916,43 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.201" references="/0/CppBehaviorDeclaration/%.9"> - <details key="start" value="2910"/> - <details key="end" value="2911"/> + <details key="start" value="2934"/> + <details key="end" value="2935"/> <details key="line" value="83"/> </eAnnotations> <eAnnotations source="positions.202" references="/0/CppBehaviorDeclaration/behavior"> - <details key="start" value="2775"/> - <details key="end" value="2794"/> + <details key="start" value="2793"/> + <details key="end" value="2812"/> <details key="line" value="81"/> </eAnnotations> <eAnnotations source="positions.203" references="/0/CppConstInit"> - <details key="start" value="2925"/> - <details key="end" value="3130"/> + <details key="start" value="2949"/> + <details key="end" value="3154"/> <details key="line" value="86"/> </eAnnotations> <eAnnotations source="positions.204" references="/0/CppConstInit/%"> - <details key="start" value="2979"/> - <details key="end" value="3118"/> + <details key="start" value="3003"/> + <details key="end" value="3142"/> <details key="line" value="87"/> </eAnnotations> <eAnnotations source="positions.205" references="/0/CppConstInit/%/%"> - <details key="start" value="3046"/> - <details key="end" value="3049"/> + <details key="start" value="3070"/> + <details key="end" value="3073"/> <details key="line" value="87"/> </eAnnotations> <eAnnotations source="positions.206" references="/0/CppConstInit/%/%.1"> - <details key="start" value="3050"/> - <details key="end" value="3111"/> + <details key="start" value="3074"/> + <details key="end" value="3135"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.207" references="/0/CppConstInit/%/%.1/%"> - <details key="start" value="3050"/> - <details key="end" value="3096"/> + <details key="start" value="3074"/> + <details key="end" value="3120"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.208" references="/0/CppConstInit/%/%.1/%/%"> - <details key="start" value="3050"/> - <details key="end" value="3075"/> + <details key="start" value="3074"/> + <details key="end" value="3099"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.209" references="/0/CppConstInit/%/%.1/%/%/self"> @@ -2961,23 +2961,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.210" references="/0/CppConstInit/%/%.1/%/%/%"> - <details key="start" value="3065"/> - <details key="end" value="3074"/> + <details key="start" value="3089"/> + <details key="end" value="3098"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.211" references="/0/CppConstInit/%/%.1/%/%.1"> - <details key="start" value="3086"/> - <details key="end" value="3095"/> + <details key="start" value="3110"/> + <details key="end" value="3119"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.212" references="/0/CppConstInit/%/%.2"> - <details key="start" value="2983"/> - <details key="end" value="3045"/> + <details key="start" value="3007"/> + <details key="end" value="3069"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.213" references="/0/CppConstInit/%/%.2/%"> - <details key="start" value="2984"/> - <details key="end" value="3008"/> + <details key="start" value="3008"/> + <details key="end" value="3032"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.214" references="/0/CppConstInit/%/%.2/%/self"> @@ -2986,13 +2986,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.215" references="/0/CppConstInit/%/%.2/%/%"> - <details key="start" value="2998"/> - <details key="end" value="3007"/> + <details key="start" value="3022"/> + <details key="end" value="3031"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.216" references="/0/CppConstInit/%/%.2/%.1"> - <details key="start" value="3013"/> - <details key="end" value="3044"/> + <details key="start" value="3037"/> + <details key="end" value="3068"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.217" references="/0/CppConstInit/%/%.2/%.1/self"> @@ -3001,33 +3001,33 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.218" references="/0/CppConstInit/%/%.2/%.1/%"> - <details key="start" value="3027"/> - <details key="end" value="3043"/> + <details key="start" value="3051"/> + <details key="end" value="3067"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.219" references="/0/CppConstInit/operation"> - <details key="start" value="2955"/> - <details key="end" value="2976"/> + <details key="start" value="2979"/> + <details key="end" value="3000"/> <details key="line" value="86"/> </eAnnotations> <eAnnotations source="positions.220" references="/0/%.1"> - <details key="start" value="3133"/> - <details key="end" value="3213"/> + <details key="start" value="3157"/> + <details key="end" value="3237"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.221" references="/0/getBodyInTemplate"> - <details key="start" value="3214"/> - <details key="end" value="3331"/> + <details key="start" value="3238"/> + <details key="end" value="3355"/> <details key="line" value="92"/> </eAnnotations> <eAnnotations source="positions.222" references="/0/getBodyInTemplate/%"> - <details key="start" value="3293"/> - <details key="end" value="3317"/> + <details key="start" value="3317"/> + <details key="end" value="3341"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.223" references="/0/getBodyInTemplate/%/%"> - <details key="start" value="3293"/> - <details key="end" value="3310"/> + <details key="start" value="3317"/> + <details key="end" value="3334"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.224" references="/0/getBodyInTemplate/%/%/self"> @@ -3036,43 +3036,43 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.225" references="/0/getBodyInTemplate/%/%/language"> - <details key="start" value="3301"/> - <details key="end" value="3309"/> + <details key="start" value="3325"/> + <details key="end" value="3333"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.226" references="/0/getBodyInTemplate/operation"> - <details key="start" value="3249"/> - <details key="end" value="3270"/> + <details key="start" value="3273"/> + <details key="end" value="3294"/> <details key="line" value="92"/> </eAnnotations> <eAnnotations source="positions.227" references="/0/getBodyInTemplate/language"> - <details key="start" value="3272"/> - <details key="end" value="3289"/> + <details key="start" value="3296"/> + <details key="end" value="3313"/> <details key="line" value="92"/> </eAnnotations> <eAnnotations source="positions.228" references="/0/throws"> - <details key="start" value="3334"/> - <details key="end" value="3502"/> + <details key="start" value="3358"/> + <details key="end" value="3526"/> <details key="line" value="97"/> </eAnnotations> <eAnnotations source="positions.229" references="/0/throws/%"> - <details key="start" value="3381"/> - <details key="end" value="3490"/> + <details key="start" value="3405"/> + <details key="end" value="3514"/> <details key="line" value="98"/> </eAnnotations> <eAnnotations source="positions.230" references="/0/throws/%/%"> - <details key="start" value="3426"/> - <details key="end" value="3433"/> + <details key="start" value="3450"/> + <details key="end" value="3457"/> <details key="line" value="99"/> </eAnnotations> <eAnnotations source="positions.231" references="/0/throws/%/%.1"> - <details key="start" value="3433"/> - <details key="end" value="3484"/> + <details key="start" value="3457"/> + <details key="end" value="3508"/> <details key="line" value="99"/> </eAnnotations> <eAnnotations source="positions.232" references="/0/throws/%/%.1/%"> - <details key="start" value="3472"/> - <details key="end" value="3476"/> + <details key="start" value="3496"/> + <details key="end" value="3500"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.233" references="/0/throws/%/%.1/%/self"> @@ -3081,8 +3081,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.234" references="/0/throws/%/%.1/%.1"> - <details key="start" value="3439"/> - <details key="end" value="3454"/> + <details key="start" value="3463"/> + <details key="end" value="3478"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.235" references="/0/throws/%/%.1/%.1/self"> @@ -3091,53 +3091,53 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.236" references="/0/throws/%/%.1/%.2"> - <details key="start" value="3466"/> - <details key="end" value="3469"/> + <details key="start" value="3490"/> + <details key="end" value="3493"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.237" references="/0/throws/%/%.2"> - <details key="start" value="3484"/> - <details key="end" value="3485"/> + <details key="start" value="3508"/> + <details key="end" value="3509"/> <details key="line" value="100"/> </eAnnotations> <eAnnotations source="positions.238" references="/0/throws/%/%.3"> - <details key="start" value="3385"/> - <details key="end" value="3424"/> + <details key="start" value="3409"/> + <details key="end" value="3448"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.239" references="/0/throws/%/%.3/%"> - <details key="start" value="3386"/> - <details key="end" value="3419"/> + <details key="start" value="3410"/> + <details key="end" value="3443"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.240" references="/0/throws/%/%.3/%/%"> - <details key="start" value="3386"/> - <details key="end" value="3411"/> + <details key="start" value="3410"/> + <details key="end" value="3435"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.241" references="/0/throws/%/%.3/%/%/operation"> - <details key="start" value="3386"/> - <details key="end" value="3395"/> + <details key="start" value="3410"/> + <details key="end" value="3419"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.242" references="/0/throws/%/%.3/%.1"> - <details key="start" value="3422"/> - <details key="end" value="3423"/> + <details key="start" value="3446"/> + <details key="end" value="3447"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.243" references="/0/throws/operation"> - <details key="start" value="3358"/> - <details key="end" value="3378"/> + <details key="start" value="3382"/> + <details key="end" value="3402"/> <details key="line" value="97"/> </eAnnotations> <eAnnotations source="positions.244" references="/0/CppOperationImplementation"> - <details key="start" value="3505"/> - <details key="end" value="4007"/> + <details key="start" value="3529"/> + <details key="end" value="4037"/> <details key="line" value="104"/> </eAnnotations> <eAnnotations source="positions.245" references="/0/CppOperationImplementation/%"> - <details key="start" value="3574"/> - <details key="end" value="3591"/> + <details key="start" value="3598"/> + <details key="end" value="3615"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.246" references="/0/CppOperationImplementation/%/self"> @@ -3146,18 +3146,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.247" references="/0/CppOperationImplementation/%.1"> - <details key="start" value="3593"/> - <details key="end" value="3594"/> + <details key="start" value="3617"/> + <details key="end" value="3618"/> <details key="line" value="106"/> </eAnnotations> <eAnnotations source="positions.248" references="/0/CppOperationImplementation/%.2"> - <details key="start" value="3594"/> - <details key="end" value="3995"/> + <details key="start" value="3618"/> + <details key="end" value="4025"/> <details key="line" value="106"/> </eAnnotations> <eAnnotations source="positions.249" references="/0/CppOperationImplementation/%.2/%"> - <details key="start" value="3626"/> - <details key="end" value="3641"/> + <details key="start" value="3650"/> + <details key="end" value="3665"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.250" references="/0/CppOperationImplementation/%.2/%/self"> @@ -3166,23 +3166,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.251" references="/0/CppOperationImplementation/%.2/%.1"> - <details key="start" value="3644"/> - <details key="end" value="3658"/> + <details key="start" value="3668"/> + <details key="end" value="3682"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.252" references="/0/CppOperationImplementation/%.2/%.1/operation"> - <details key="start" value="3644"/> - <details key="end" value="3653"/> + <details key="start" value="3668"/> + <details key="end" value="3677"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.253" references="/0/CppOperationImplementation/%.2/%.2"> - <details key="start" value="3660"/> - <details key="end" value="3661"/> + <details key="start" value="3684"/> + <details key="end" value="3685"/> <details key="line" value="107"/> </eAnnotations> <eAnnotations source="positions.254" references="/0/CppOperationImplementation/%.2/%.3"> - <details key="start" value="3662"/> - <details key="end" value="3691"/> + <details key="start" value="3686"/> + <details key="end" value="3715"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.255" references="/0/CppOperationImplementation/%.2/%.3/self"> @@ -3191,18 +3191,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.256" references="/0/CppOperationImplementation/%.2/%.3/%"> - <details key="start" value="3685"/> - <details key="end" value="3690"/> + <details key="start" value="3709"/> + <details key="end" value="3714"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.257" references="/0/CppOperationImplementation/%.2/%.4"> - <details key="start" value="3693"/> - <details key="end" value="3698"/> + <details key="start" value="3717"/> + <details key="end" value="3722"/> <details key="line" value="107"/> </eAnnotations> <eAnnotations source="positions.258" references="/0/CppOperationImplementation/%.2/%.5"> - <details key="start" value="3699"/> - <details key="end" value="3715"/> + <details key="start" value="3723"/> + <details key="end" value="3739"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.259" references="/0/CppOperationImplementation/%.2/%.5/self"> @@ -3211,43 +3211,43 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.260" references="/0/CppOperationImplementation/%.2/%.5/%"> - <details key="start" value="3707"/> - <details key="end" value="3714"/> + <details key="start" value="3731"/> + <details key="end" value="3738"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.261" references="/0/CppOperationImplementation/%.2/%.6"> - <details key="start" value="3717"/> - <details key="end" value="3720"/> + <details key="start" value="3741"/> + <details key="end" value="3744"/> <details key="line" value="109"/> </eAnnotations> <eAnnotations source="positions.262" references="/0/CppOperationImplementation/%.2/%.7"> - <details key="start" value="3598"/> - <details key="end" value="3623"/> + <details key="start" value="3622"/> + <details key="end" value="3647"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.263" references="/0/CppOperationImplementation/%.2/%.7/%"> - <details key="start" value="3599"/> - <details key="end" value="3613"/> + <details key="start" value="3623"/> + <details key="end" value="3637"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.264" references="/0/CppOperationImplementation/%.2/%.7/%/operation"> - <details key="start" value="3599"/> - <details key="end" value="3608"/> + <details key="start" value="3623"/> + <details key="end" value="3632"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.265" references="/0/CppOperationImplementation/%.2/%.7/%.1"> - <details key="start" value="3616"/> - <details key="end" value="3622"/> + <details key="start" value="3640"/> + <details key="end" value="3646"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.266" references="/0/CppOperationImplementation/%.2/%.8"> - <details key="start" value="3720"/> - <details key="end" value="3990"/> + <details key="start" value="3744"/> + <details key="end" value="4020"/> <details key="line" value="110"/> </eAnnotations> <eAnnotations source="positions.267" references="/0/CppOperationImplementation/%.2/%.8/%"> - <details key="start" value="3728"/> - <details key="end" value="3747"/> + <details key="start" value="3752"/> + <details key="end" value="3771"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.268" references="/0/CppOperationImplementation/%.2/%.8/%/self"> @@ -3256,8 +3256,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.269" references="/0/CppOperationImplementation/%.2/%.8/%.1"> - <details key="start" value="3750"/> - <details key="end" value="3761"/> + <details key="start" value="3774"/> + <details key="end" value="3785"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.270" references="/0/CppOperationImplementation/%.2/%.8/%.1/self"> @@ -3266,8 +3266,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.271" references="/0/CppOperationImplementation/%.2/%.8/%.2"> - <details key="start" value="3764"/> - <details key="end" value="3779"/> + <details key="start" value="3788"/> + <details key="end" value="3803"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.272" references="/0/CppOperationImplementation/%.2/%.8/%.2/self"> @@ -3276,23 +3276,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.273" references="/0/CppOperationImplementation/%.2/%.8/collect"> - <details key="start" value="3782"/> - <details key="end" value="3816"/> + <details key="start" value="3806"/> + <details key="end" value="3840"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.274" references="/0/CppOperationImplementation/%.2/%.8/collect/%"> - <details key="start" value="3782"/> - <details key="end" value="3811"/> + <details key="start" value="3806"/> + <details key="end" value="3835"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.275" references="/0/CppOperationImplementation/%.2/%.8/collect/%/operation"> - <details key="start" value="3782"/> - <details key="end" value="3791"/> + <details key="start" value="3806"/> + <details key="end" value="3815"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.276" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1"> - <details key="start" value="3812"/> - <details key="end" value="3816"/> + <details key="start" value="3836"/> + <details key="end" value="3840"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.277" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1/temp1"> @@ -3306,8 +3306,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.279" references="/0/CppOperationImplementation/%.2/%.8/%.3"> - <details key="start" value="3819"/> - <details key="end" value="3843"/> + <details key="start" value="3843"/> + <details key="end" value="3867"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.280" references="/0/CppOperationImplementation/%.2/%.8/%.3/self"> @@ -3316,13 +3316,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.281" references="/0/CppOperationImplementation/%.2/%.8/%.4"> - <details key="start" value="3845"/> - <details key="end" value="3847"/> + <details key="start" value="3869"/> + <details key="end" value="3871"/> <details key="line" value="111"/> </eAnnotations> <eAnnotations source="positions.282" references="/0/CppOperationImplementation/%.2/%.8/%.5"> - <details key="start" value="3848"/> - <details key="end" value="3860"/> + <details key="start" value="3872"/> + <details key="end" value="3884"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.283" references="/0/CppOperationImplementation/%.2/%.8/%.5/self"> @@ -3331,23 +3331,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.284" references="/0/CppOperationImplementation/%.2/%.8/%.6"> - <details key="start" value="3863"/> - <details key="end" value="3877"/> + <details key="start" value="3887"/> + <details key="end" value="3901"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.285" references="/0/CppOperationImplementation/%.2/%.8/%.6/operation"> - <details key="start" value="3863"/> - <details key="end" value="3872"/> + <details key="start" value="3887"/> + <details key="end" value="3896"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.286" references="/0/CppOperationImplementation/%.2/%.8/%.7"> - <details key="start" value="3879"/> - <details key="end" value="3880"/> + <details key="start" value="3903"/> + <details key="end" value="3904"/> <details key="line" value="111"/> </eAnnotations> <eAnnotations source="positions.287" references="/0/CppOperationImplementation/%.2/%.8/%.8"> - <details key="start" value="3881"/> - <details key="end" value="3910"/> + <details key="start" value="3905"/> + <details key="end" value="3934"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.288" references="/0/CppOperationImplementation/%.2/%.8/%.8/self"> @@ -3356,18 +3356,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.289" references="/0/CppOperationImplementation/%.2/%.8/%.8/%"> - <details key="start" value="3904"/> - <details key="end" value="3909"/> + <details key="start" value="3928"/> + <details key="end" value="3933"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.290" references="/0/CppOperationImplementation/%.2/%.8/%.9"> - <details key="start" value="3912"/> - <details key="end" value="3913"/> + <details key="start" value="3936"/> + <details key="end" value="3937"/> <details key="line" value="111"/> </eAnnotations> <eAnnotations source="positions.291" references="/0/CppOperationImplementation/%.2/%.8/%.10"> - <details key="start" value="3914"/> - <details key="end" value="3922"/> + <details key="start" value="3938"/> + <details key="end" value="3946"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.292" references="/0/CppOperationImplementation/%.2/%.8/%.10/self"> @@ -3376,8 +3376,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.293" references="/0/CppOperationImplementation/%.2/%.8/%.11"> - <details key="start" value="3925"/> - <details key="end" value="3935"/> + <details key="start" value="3949"/> + <details key="end" value="3965"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.294" references="/0/CppOperationImplementation/%.2/%.8/%.11/self"> @@ -3386,8 +3386,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.295" references="/0/CppOperationImplementation/%.2/%.8/%.12"> - <details key="start" value="3938"/> - <details key="end" value="3952"/> + <details key="start" value="3968"/> + <details key="end" value="3982"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.296" references="/0/CppOperationImplementation/%.2/%.8/%.12/self"> @@ -3396,13 +3396,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.297" references="/0/CppOperationImplementation/%.2/%.8/%.13"> - <details key="start" value="3954"/> - <details key="end" value="3958"/> + <details key="start" value="3984"/> + <details key="end" value="3988"/> <details key="line" value="111"/> </eAnnotations> <eAnnotations source="positions.298" references="/0/CppOperationImplementation/%.2/%.8/%.14"> - <details key="start" value="3959"/> - <details key="end" value="3985"/> + <details key="start" value="3989"/> + <details key="end" value="4015"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.299" references="/0/CppOperationImplementation/%.2/%.8/%.14/self"> @@ -3411,28 +3411,28 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.300" references="/0/CppOperationImplementation/%.2/%.8/%.14/%"> - <details key="start" value="3977"/> - <details key="end" value="3984"/> + <details key="start" value="4007"/> + <details key="end" value="4014"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.301" references="/0/CppOperationImplementation/%.2/%.8/%.15"> - <details key="start" value="3987"/> - <details key="end" value="3990"/> + <details key="start" value="4017"/> + <details key="end" value="4020"/> <details key="line" value="113"/> </eAnnotations> <eAnnotations source="positions.302" references="/0/CppOperationImplementation/operation"> - <details key="start" value="3549"/> - <details key="end" value="3570"/> + <details key="start" value="3573"/> + <details key="end" value="3594"/> <details key="line" value="104"/> </eAnnotations> <eAnnotations source="positions.303" references="/0/CppBehaviorImplementation"> - <details key="start" value="4010"/> - <details key="end" value="4251"/> + <details key="start" value="4040"/> + <details key="end" value="4287"/> <details key="line" value="118"/> </eAnnotations> <eAnnotations source="positions.304" references="/0/CppBehaviorImplementation/%"> - <details key="start" value="4082"/> - <details key="end" value="4098"/> + <details key="start" value="4112"/> + <details key="end" value="4128"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.305" references="/0/CppBehaviorImplementation/%/self"> @@ -3441,13 +3441,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.306" references="/0/CppBehaviorImplementation/%.1"> - <details key="start" value="4100"/> - <details key="end" value="4101"/> + <details key="start" value="4130"/> + <details key="end" value="4131"/> <details key="line" value="120"/> </eAnnotations> <eAnnotations source="positions.307" references="/0/CppBehaviorImplementation/%.2"> - <details key="start" value="4102"/> - <details key="end" value="4117"/> + <details key="start" value="4132"/> + <details key="end" value="4147"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.308" references="/0/CppBehaviorImplementation/%.2/self"> @@ -3456,43 +3456,43 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.309" references="/0/CppBehaviorImplementation/%.3"> - <details key="start" value="4120"/> - <details key="end" value="4142"/> + <details key="start" value="4150"/> + <details key="end" value="4172"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.310" references="/0/CppBehaviorImplementation/%.3/%"> - <details key="start" value="4120"/> - <details key="end" value="4137"/> + <details key="start" value="4150"/> + <details key="end" value="4167"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.311" references="/0/CppBehaviorImplementation/%.3/%/behavior"> - <details key="start" value="4120"/> - <details key="end" value="4128"/> + <details key="start" value="4150"/> + <details key="end" value="4158"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.312" references="/0/CppBehaviorImplementation/%.4"> - <details key="start" value="4144"/> - <details key="end" value="4146"/> + <details key="start" value="4174"/> + <details key="end" value="4176"/> <details key="line" value="120"/> </eAnnotations> <eAnnotations source="positions.313" references="/0/CppBehaviorImplementation/%.5"> - <details key="start" value="4147"/> - <details key="end" value="4160"/> + <details key="start" value="4177"/> + <details key="end" value="4190"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.314" references="/0/CppBehaviorImplementation/%.5/behavior"> - <details key="start" value="4147"/> - <details key="end" value="4155"/> + <details key="start" value="4177"/> + <details key="end" value="4185"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.315" references="/0/CppBehaviorImplementation/%.6"> - <details key="start" value="4162"/> - <details key="end" value="4163"/> + <details key="start" value="4192"/> + <details key="end" value="4193"/> <details key="line" value="120"/> </eAnnotations> <eAnnotations source="positions.316" references="/0/CppBehaviorImplementation/%.7"> - <details key="start" value="4164"/> - <details key="end" value="4192"/> + <details key="start" value="4194"/> + <details key="end" value="4222"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.317" references="/0/CppBehaviorImplementation/%.7/self"> @@ -3501,18 +3501,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.318" references="/0/CppBehaviorImplementation/%.7/%"> - <details key="start" value="4186"/> - <details key="end" value="4191"/> + <details key="start" value="4216"/> + <details key="end" value="4221"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.319" references="/0/CppBehaviorImplementation/%.8"> - <details key="start" value="4194"/> - <details key="end" value="4195"/> + <details key="start" value="4224"/> + <details key="end" value="4225"/> <details key="line" value="120"/> </eAnnotations> <eAnnotations source="positions.320" references="/0/CppBehaviorImplementation/%.9"> - <details key="start" value="4196"/> - <details key="end" value="4206"/> + <details key="start" value="4226"/> + <details key="end" value="4242"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.321" references="/0/CppBehaviorImplementation/%.9/self"> @@ -3521,13 +3521,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.322" references="/0/CppBehaviorImplementation/%.10"> - <details key="start" value="4208"/> - <details key="end" value="4212"/> + <details key="start" value="4244"/> + <details key="end" value="4248"/> <details key="line" value="120"/> </eAnnotations> <eAnnotations source="positions.323" references="/0/CppBehaviorImplementation/%.11"> - <details key="start" value="4213"/> - <details key="end" value="4235"/> + <details key="start" value="4249"/> + <details key="end" value="4271"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.324" references="/0/CppBehaviorImplementation/%.11/self"> @@ -3536,18 +3536,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.325" references="/0/CppBehaviorImplementation/%.11/%"> - <details key="start" value="4227"/> - <details key="end" value="4234"/> + <details key="start" value="4263"/> + <details key="end" value="4270"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.326" references="/0/CppBehaviorImplementation/%.12"> - <details key="start" value="4237"/> - <details key="end" value="4239"/> + <details key="start" value="4273"/> + <details key="end" value="4275"/> <details key="line" value="122"/> </eAnnotations> <eAnnotations source="positions.327" references="/0/CppBehaviorImplementation/behavior"> - <details key="start" value="4053"/> - <details key="end" value="4078"/> + <details key="start" value="4083"/> + <details key="end" value="4108"/> <details key="line" value="118"/> </eAnnotations> </ecore:EAnnotation> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl index 4394b939c8a..99720c6e618 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl @@ -55,12 +55,12 @@ else endif/] [template public CppReturnSpec(operation : Operation)] -[if (type = null) or isConsOrDestructor()][ConsDestructorOrVoid()/][else][returnResult().modConst()/] [type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if] +[if (type = null) or isConsOrDestructor()][ConsDestructorOrVoid()/][else][returnResult().modCVQualifier()/] [type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if] [/template] [template public CppReturnSpec(behavior : Behavior)] -[if (returnResult() = null)]void [else][returnResult().modConst()/] [returnResult().type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if] +[if (returnResult() = null)]void [else][returnResult().modCVQualifier()/] [returnResult().type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if] [/template] @@ -75,12 +75,12 @@ endif/] [template public CppOperationDeclaration(operation : Operation)] [CppOperationDoc()/] -[InlineTxt()/][virtualTxt()/][staticTxt()/][CppReturnSpec()/][destructor()/][operation.name/]([CppOperationParameters(true)/])[modConst()/][virtualSuffix()/]; +[InlineTxt()/][virtualTxt()/][staticTxt()/][CppReturnSpec()/][destructor()/][operation.name/]([CppOperationParameters(true)/])[modCVQualifier()/][virtualSuffix()/]; [/template] [template public CppBehaviorDeclaration(behavior : Behavior)] [CppBehaviorDoc()/] -[InlineTxt()/][CppReturnSpec()/][behavior.name/]([CppBehaviorParameters(true)/])[modConst()/]; +[InlineTxt()/][CppReturnSpec()/][behavior.name/]([CppBehaviorParameters(true)/])[modCVQualifier()/]; [/template] [template public CppConstInit(operation : Operation)] @@ -108,7 +108,7 @@ throws [for (raisedException) separator(',')][name/][/for] [getBody('C/C++')/] } [else] -[templateSignature()/][InlineTxt()/][CppReturnSpec()/][operation.featuringClassifier.name/][templateShortSignature()/]::[destructor()/][operation.name/]([CppOperationParameters(false)/])[throws()/][modConst()/][CppConstInit()/] { +[templateSignature()/][InlineTxt()/][CppReturnSpec()/][operation.featuringClassifier.name/][templateShortSignature()/]::[destructor()/][operation.name/]([CppOperationParameters(false)/])[throws()/][modCVQualifier()/][CppConstInit()/] { [getBodyInTemplate('C/C++')/] } [/if] @@ -117,7 +117,7 @@ throws [for (raisedException) separator(',')][name/][/for] [template public CppBehaviorImplementation(behavior : OpaqueBehavior)] [CppBehaviorDoc()/] -[CppReturnSpec()/][behavior._context.name/]::[behavior.name/]([CppBehaviorParameters(false)/])[modConst()/] { +[CppReturnSpec()/][behavior._context.name/]::[behavior.name/]([CppBehaviorParameters(false)/])[modCVQualifier()/] { [getBodyFromOB('C/C++')/] } [/template]
\ No newline at end of file diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl index c6fb9fe3bb7..d02d03ec0ae 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl @@ -49,7 +49,7 @@ <ownedModuleElement xsi:type="mtl:Template" name="CppParameter" visibility="Public"> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../utils/Modifier.emtl#/0/modConst"/> + <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/> </argument> @@ -161,7 +161,7 @@ </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Comment"> - <body startPosition="1033" endPosition="1099" value=" signature for a given behavior (e.g. effect within state machine)"/> + <body startPosition="1039" endPosition="1105" value=" signature for a given behavior (e.g. effect within state machine)"/> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="CppBehaviorParameters" visibility="Public"> <body xsi:type="mtl:ForBlock"> @@ -329,12 +329,12 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eParameters> </eOperations> - <eOperations name="modConst"> + <eOperations name="modCVQualifier"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> <contents xsi:type="ocl.ecore:Constraint"/> </eAnnotations> <eAnnotations source="MTL"> - <references href="../../../utils/Modifier.emtl#/0/modConst"/> + <references href="../../../utils/Modifier.emtl#/0/modCVQualifier"/> </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="propertyOrParameter"> @@ -608,12 +608,12 @@ </eAnnotations> <eAnnotations source="positions.12" references="/0/CppParameter"> <details key="start" value="564"/> - <details key="end" value="795"/> + <details key="end" value="801"/> <details key="line" value="15"/> </eAnnotations> <eAnnotations source="positions.13" references="/0/CppParameter/%"> <details key="start" value="642"/> - <details key="end" value="652"/> + <details key="end" value="658"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.14" references="/0/CppParameter/%/self"> @@ -622,23 +622,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.15" references="/0/CppParameter/%.1"> - <details key="start" value="655"/> - <details key="end" value="688"/> + <details key="start" value="661"/> + <details key="end" value="694"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.16" references="/0/CppParameter/%.1/%"> - <details key="start" value="655"/> - <details key="end" value="669"/> + <details key="start" value="661"/> + <details key="end" value="675"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.17" references="/0/CppParameter/%.1/%/parameter"> - <details key="start" value="655"/> - <details key="end" value="664"/> + <details key="start" value="661"/> + <details key="end" value="670"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.18" references="/0/CppParameter/%.2"> - <details key="start" value="691"/> - <details key="end" value="699"/> + <details key="start" value="697"/> + <details key="end" value="705"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.19" references="/0/CppParameter/%.2/self"> @@ -647,8 +647,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.20" references="/0/CppParameter/%.3"> - <details key="start" value="702"/> - <details key="end" value="710"/> + <details key="start" value="708"/> + <details key="end" value="716"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.21" references="/0/CppParameter/%.3/self"> @@ -657,23 +657,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.22" references="/0/CppParameter/%.4"> - <details key="start" value="712"/> - <details key="end" value="713"/> + <details key="start" value="718"/> + <details key="end" value="719"/> <details key="line" value="16"/> </eAnnotations> <eAnnotations source="positions.23" references="/0/CppParameter/%.5"> - <details key="start" value="714"/> - <details key="end" value="728"/> + <details key="start" value="720"/> + <details key="end" value="734"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.24" references="/0/CppParameter/%.5/parameter"> - <details key="start" value="714"/> - <details key="end" value="723"/> + <details key="start" value="720"/> + <details key="end" value="729"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.25" references="/0/CppParameter/%.6"> - <details key="start" value="731"/> - <details key="end" value="741"/> + <details key="start" value="737"/> + <details key="end" value="747"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.26" references="/0/CppParameter/%.6/self"> @@ -682,13 +682,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.27" references="/0/CppParameter/%.7"> - <details key="start" value="743"/> - <details key="end" value="783"/> + <details key="start" value="749"/> + <details key="end" value="789"/> <details key="line" value="16"/> </eAnnotations> <eAnnotations source="positions.28" references="/0/CppParameter/%.7/%"> - <details key="start" value="762"/> - <details key="end" value="776"/> + <details key="start" value="768"/> + <details key="end" value="782"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.29" references="/0/CppParameter/%.7/%/self"> @@ -697,8 +697,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.30" references="/0/CppParameter/%.7/showDefault"> - <details key="start" value="747"/> - <details key="end" value="760"/> + <details key="start" value="753"/> + <details key="end" value="766"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.31" references="/0/CppParameter/parameter"> @@ -712,18 +712,18 @@ <details key="line" value="15"/> </eAnnotations> <eAnnotations source="positions.33" references="/0/CppOperationParameters"> - <details key="start" value="798"/> - <details key="end" value="1022"/> + <details key="start" value="804"/> + <details key="end" value="1028"/> <details key="line" value="20"/> </eAnnotations> <eAnnotations source="positions.34" references="/0/CppOperationParameters/%"> - <details key="start" value="885"/> - <details key="end" value="1010"/> + <details key="start" value="891"/> + <details key="end" value="1016"/> <details key="line" value="21"/> </eAnnotations> <eAnnotations source="positions.35" references="/0/CppOperationParameters/%/%"> - <details key="start" value="977"/> - <details key="end" value="1002"/> + <details key="start" value="983"/> + <details key="end" value="1008"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.36" references="/0/CppOperationParameters/%/%/self"> @@ -732,18 +732,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.37" references="/0/CppOperationParameters/%/%/showDefault"> - <details key="start" value="990"/> - <details key="end" value="1001"/> + <details key="start" value="996"/> + <details key="end" value="1007"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.38" references="/0/CppOperationParameters/%/select"> - <details key="start" value="891"/> - <details key="end" value="958"/> + <details key="start" value="897"/> + <details key="end" value="964"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.39" references="/0/CppOperationParameters/%/select/%"> - <details key="start" value="891"/> - <details key="end" value="905"/> + <details key="start" value="897"/> + <details key="end" value="911"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.40" references="/0/CppOperationParameters/%/select/%/self"> @@ -752,13 +752,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.41" references="/0/CppOperationParameters/%/select/%.1"> - <details key="start" value="914"/> - <details key="end" value="957"/> + <details key="start" value="920"/> + <details key="end" value="963"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.42" references="/0/CppOperationParameters/%/select/%.1/%"> - <details key="start" value="914"/> - <details key="end" value="923"/> + <details key="start" value="920"/> + <details key="end" value="929"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.43" references="/0/CppOperationParameters/%/select/%.1/%/temp1"> @@ -767,8 +767,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.44" references="/0/CppOperationParameters/%/select/%.1/%.1"> - <details key="start" value="927"/> - <details key="end" value="957"/> + <details key="start" value="933"/> + <details key="end" value="963"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.45" references="/0/CppOperationParameters/%/select/temp1"> @@ -777,38 +777,38 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.46" references="/0/CppOperationParameters/%/%.1"> - <details key="start" value="970"/> - <details key="end" value="974"/> + <details key="start" value="976"/> + <details key="end" value="980"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.47" references="/0/CppOperationParameters/operation"> - <details key="start" value="838"/> - <details key="end" value="859"/> + <details key="start" value="844"/> + <details key="end" value="865"/> <details key="line" value="20"/> </eAnnotations> <eAnnotations source="positions.48" references="/0/CppOperationParameters/showDefault"> - <details key="start" value="861"/> - <details key="end" value="882"/> + <details key="start" value="867"/> + <details key="end" value="888"/> <details key="line" value="20"/> </eAnnotations> <eAnnotations source="positions.49" references="/0/%.1"> - <details key="start" value="1025"/> - <details key="end" value="1101"/> + <details key="start" value="1031"/> + <details key="end" value="1107"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.50" references="/0/CppBehaviorParameters"> - <details key="start" value="1102"/> - <details key="end" value="1323"/> + <details key="start" value="1108"/> + <details key="end" value="1329"/> <details key="line" value="26"/> </eAnnotations> <eAnnotations source="positions.51" references="/0/CppBehaviorParameters/%"> - <details key="start" value="1186"/> - <details key="end" value="1311"/> + <details key="start" value="1192"/> + <details key="end" value="1317"/> <details key="line" value="27"/> </eAnnotations> <eAnnotations source="positions.52" references="/0/CppBehaviorParameters/%/%"> - <details key="start" value="1278"/> - <details key="end" value="1303"/> + <details key="start" value="1284"/> + <details key="end" value="1309"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.53" references="/0/CppBehaviorParameters/%/%/self"> @@ -817,18 +817,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.54" references="/0/CppBehaviorParameters/%/%/showDefault"> - <details key="start" value="1291"/> - <details key="end" value="1302"/> + <details key="start" value="1297"/> + <details key="end" value="1308"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.55" references="/0/CppBehaviorParameters/%/select"> - <details key="start" value="1192"/> - <details key="end" value="1259"/> + <details key="start" value="1198"/> + <details key="end" value="1265"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.56" references="/0/CppBehaviorParameters/%/select/%"> - <details key="start" value="1192"/> - <details key="end" value="1206"/> + <details key="start" value="1198"/> + <details key="end" value="1212"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.57" references="/0/CppBehaviorParameters/%/select/%/self"> @@ -837,13 +837,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.58" references="/0/CppBehaviorParameters/%/select/%.1"> - <details key="start" value="1215"/> - <details key="end" value="1258"/> + <details key="start" value="1221"/> + <details key="end" value="1264"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.59" references="/0/CppBehaviorParameters/%/select/%.1/%"> - <details key="start" value="1215"/> - <details key="end" value="1224"/> + <details key="start" value="1221"/> + <details key="end" value="1230"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.60" references="/0/CppBehaviorParameters/%/select/%.1/%/temp1"> @@ -852,8 +852,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.61" references="/0/CppBehaviorParameters/%/select/%.1/%.1"> - <details key="start" value="1228"/> - <details key="end" value="1258"/> + <details key="start" value="1234"/> + <details key="end" value="1264"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.62" references="/0/CppBehaviorParameters/%/select/temp2"> @@ -862,18 +862,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.63" references="/0/CppBehaviorParameters/%/%.1"> - <details key="start" value="1271"/> - <details key="end" value="1275"/> + <details key="start" value="1277"/> + <details key="end" value="1281"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.64" references="/0/CppBehaviorParameters/behavior"> - <details key="start" value="1141"/> - <details key="end" value="1160"/> + <details key="start" value="1147"/> + <details key="end" value="1166"/> <details key="line" value="26"/> </eAnnotations> <eAnnotations source="positions.65" references="/0/CppBehaviorParameters/showDefault"> - <details key="start" value="1162"/> - <details key="end" value="1183"/> + <details key="start" value="1168"/> + <details key="end" value="1189"/> <details key="line" value="26"/> </eAnnotations> </ecore:EAnnotation> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl index 9b74ce9fed6..9f1a560d469 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl @@ -13,7 +13,7 @@ [comment C++ parameter. Default values are added, if parameter showDefault is true (implementation signature may not repeat default value)/] [template public CppParameter(parameter : Parameter, showDefault : Boolean)] -[modConst()/][parameter.type.cppQualifiedName()/][modPtr()/][modRef()/] [parameter.name/][modArray()/][if (showDefault)][defaultValue()/][/if] +[modCVQualifier()/][parameter.type.cppQualifiedName()/][modPtr()/][modRef()/] [parameter.name/][modArray()/][if (showDefault)][defaultValue()/][/if] [/template] diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl index d4c3543afef..144d24288d2 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl @@ -82,7 +82,7 @@ </expression> <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> </ownedModuleElement> - <ownedModuleElement xsi:type="mtl:Query" name="modConst" visibility="Public"> + <ownedModuleElement xsi:type="mtl:Query" name="modCVQualifier" visibility="Public"> <parameter name="propertyOrParameter"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </parameter> @@ -94,13 +94,13 @@ <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.Modifier"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> </argument> - <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="modConst(org.eclipse.uml2.uml.Element)"> + <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="modCVQualifier(org.eclipse.uml2.uml.Element)"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> </argument> <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(Element)" kind="Sequence"> <part xsi:type="ocl.ecore:CollectionItem"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> - <item xsi:type="ocl.ecore:VariableExp" name="propertyOrParameter" referredVariable="/0/modConst/propertyOrParameter"> + <item xsi:type="ocl.ecore:VariableExp" name="propertyOrParameter" referredVariable="/0/modCVQualifier/propertyOrParameter"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </item> </part> @@ -159,11 +159,11 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eParameters> </eOperations> - <eOperations name="modConst"> + <eOperations name="modCVQualifier"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> <contents xsi:type="ocl.ecore:Constraint"/> </eAnnotations> - <eAnnotations source="MTL" references="/0/modConst"/> + <eAnnotations source="MTL" references="/0/modCVQualifier"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="propertyOrParameter"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> @@ -377,44 +377,44 @@ <details key="end" value="675"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.24" references="/0/modConst"> + <eAnnotations source="positions.24" references="/0/modCVQualifier"> <details key="start" value="682"/> - <details key="end" value="880"/> + <details key="end" value="892"/> <details key="line" value="13"/> </eAnnotations> - <eAnnotations source="positions.25" references="/0/modConst/propertyOrParameter"> - <details key="start" value="705"/> - <details key="end" value="734"/> + <eAnnotations source="positions.25" references="/0/modCVQualifier/propertyOrParameter"> + <details key="start" value="711"/> + <details key="end" value="740"/> <details key="line" value="13"/> </eAnnotations> - <eAnnotations source="positions.26" references="/0/modConst/%"> - <details key="start" value="748"/> - <details key="end" value="877"/> + <eAnnotations source="positions.26" references="/0/modCVQualifier/%"> + <details key="start" value="754"/> + <details key="end" value="889"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.27" references="/0/modConst/%/self"> + <eAnnotations source="positions.27" references="/0/modCVQualifier/%/self"> <details key="start" value="-1"/> <details key="end" value="-1"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.28" references="/0/modConst/%/%"> - <details key="start" value="755"/> - <details key="end" value="803"/> + <eAnnotations source="positions.28" references="/0/modCVQualifier/%/%"> + <details key="start" value="761"/> + <details key="end" value="809"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.29" references="/0/modConst/%/%.1"> - <details key="start" value="805"/> - <details key="end" value="845"/> + <eAnnotations source="positions.29" references="/0/modCVQualifier/%/%.1"> + <details key="start" value="811"/> + <details key="end" value="857"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.30" references="/0/modConst/%/%.2"> - <details key="start" value="847"/> - <details key="end" value="876"/> + <eAnnotations source="positions.30" references="/0/modCVQualifier/%/%.2"> + <details key="start" value="859"/> + <details key="end" value="888"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.31" references="/0/modConst/%/%.2/%/propertyOrParameter"> - <details key="start" value="856"/> - <details key="end" value="875"/> + <eAnnotations source="positions.31" references="/0/modCVQualifier/%/%.2/%/propertyOrParameter"> + <details key="start" value="868"/> + <details key="end" value="887"/> <details key="line" value="0"/> </eAnnotations> </ecore:EAnnotation> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java index adc21bc8024..3f13e2c6486 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java @@ -15,6 +15,7 @@ import org.eclipse.papyrus.C_Cpp.Array; import org.eclipse.papyrus.C_Cpp.Const; import org.eclipse.papyrus.C_Cpp.Ptr; import org.eclipse.papyrus.C_Cpp.Ref; +import org.eclipse.papyrus.C_Cpp.Volatile; import org.eclipse.papyrus.acceleo.GenUtils; import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils; import org.eclipse.uml2.uml.AggregationKind; @@ -42,7 +43,7 @@ public class Modifier { public static String array; - public static String isConst; + public static String cvQualifier; public static String modPtr(Element propertyOrParameter) { update(propertyOrParameter); @@ -59,9 +60,9 @@ public class Modifier { return array; } - public static String modConst(Element propertyOrParameter) { + public static String modCVQualifier(Element propertyOrParameter) { update(propertyOrParameter); - return isConst; + return cvQualifier; } /** @@ -126,14 +127,36 @@ public class Modifier { } } } + + // CVQualifiers cannot be used with static functions + if (propertyOperationOrParameter instanceof Operation + && ( (Operation)propertyOperationOrParameter ).isStatic() ) { + cvQualifier = new String(); + } // Const - if (GenUtils.hasStereotype(propertyOperationOrParameter, Const.class)) { - isConst = (propertyOperationOrParameter instanceof Operation) ? - " const" : // added at the end of operation, prefix with " " //$NON-NLS-1$ - "const "; // before operation or parameter, postfix with " " //$NON-NLS-1$ + else if (GenUtils.hasStereotype(propertyOperationOrParameter, Const.class)) { + // Volatile with const + if (GenUtils.hasStereotype(propertyOperationOrParameter, Volatile.class)) { + cvQualifier = (propertyOperationOrParameter instanceof Operation) ? + " const volatile" : // added at the end of operation, prefix with " " //$NON-NLS-1$ + "const volatile "; // before operation or parameter, postfix with " " //$NON-NLS-1$ + } + // Const without Volatile + else { + cvQualifier = (propertyOperationOrParameter instanceof Operation) ? + " const" : // added at the end of operation, prefix with " " //$NON-NLS-1$ + "const "; // before operation or parameter, postfix with " " //$NON-NLS-1$ + } + } + // Volatile without const + else if (GenUtils.hasStereotype(propertyOperationOrParameter, Volatile.class)) { + cvQualifier = (propertyOperationOrParameter instanceof Operation) ? + " volatile" : // added at the end of operation, prefix with " " //$NON-NLS-1$ + "volatile "; // before operation or parameter, postfix with " " //$NON-NLS-1$ } + // No CV qualifiers else { - isConst = ""; //$NON-NLS-1$ + cvQualifier = ""; //$NON-NLS-1$ } } } diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl index 9dd3f65d40c..08166221277 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl @@ -10,6 +10,6 @@ [query public modArray(propertyOrParameter : Element) : String = invoke('org.eclipse.papyrus.cpp.codegen.utils.Modifier', 'modArray(org.eclipse.uml2.uml.Element)', Sequence{propertyOrParameter}) /] -[query public modConst(propertyOrParameter : Element) : String - = invoke('org.eclipse.papyrus.cpp.codegen.utils.Modifier', 'modConst(org.eclipse.uml2.uml.Element)', Sequence{propertyOrParameter}) /] +[query public modCVQualifier(propertyOrParameter : Element) : String + = invoke('org.eclipse.papyrus.cpp.codegen.utils.Modifier', 'modCVQualifier(org.eclipse.uml2.uml.Element)', Sequence{propertyOrParameter}) /] |