Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl24
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl8
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl7
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl64
4 files changed, 103 insertions, 0 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
index dce9463f9ea..0126195414d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
@@ -27,7 +27,15 @@
<ifExpr xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/Union">
@@ -214,7 +222,15 @@
<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="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/26">
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
@@ -222,7 +238,15 @@
<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="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/27">
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
</body>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
index e660d6cb726..c90b1a6efdf 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
@@ -122,7 +122,15 @@
<source 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="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getComments"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
</source>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
index 3f959ab9cf8..48d38fca763 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
@@ -8,7 +8,14 @@
<takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
</input>
<imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
<imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
+>>>>>>> refs/heads/Qompass
<imports href="../CppPrimitiveTypes.emtl#/0"/>
<imports href="../CppEnumerations.emtl#/0"/>
<ownedModuleElement xsi:type="mtl:Template" name="TypeAndEnumForVisibility" visibility="Public">
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 dd738ac3e3d..e3b085443c6 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
@@ -336,7 +336,15 @@
<ifExpr xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34">
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/Inline">
@@ -424,7 +432,15 @@
<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="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/52">
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>
@@ -501,7 +517,15 @@
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59">
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/ConstInit">
@@ -520,7 +544,15 @@
<source xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58">
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/ConstInit">
@@ -530,7 +562,15 @@
<argument xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58">
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:TypeExp" eType="/6/Create">
@@ -553,7 +593,15 @@
<source 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="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/64">
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:VariableExp" name="language" referredVariable="/0/getBodyInTemplate/language">
@@ -651,7 +699,15 @@
<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="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/85">
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/104">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/104">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
@@ -753,7 +809,15 @@
<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="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+<<<<<<< HEAD
+<<<<<<< HEAD
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/95">
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/114">
+>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/114">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</argument>
</body>

Back to the top