Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2016-07-17 19:10:17 +0000
committerHenrik Rentz-Reichert2016-08-12 13:59:50 +0000
commit8ef7f2301ec756c29f08ba56dd4f6d537828b8c3 (patch)
tree5fd19a27cf1c562053ca6e1109de38c9de3b173a /plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice
parentcc3093fe8f33d131870d6f5ef468c22c0420870e (diff)
downloadorg.eclipse.etrice-8ef7f2301ec756c29f08ba56dd4f6d537828b8c3.tar.gz
org.eclipse.etrice-8ef7f2301ec756c29f08ba56dd4f6d537828b8c3.tar.xz
org.eclipse.etrice-8ef7f2301ec756c29f08ba56dd4f6d537828b8c3.zip
[cpp] Improvements + fixed data passing, data classes and attribute init
Equipped etUnit with a special version of EXPECT_ORDER_START() in the C++ case that assumes a StaticArray as second argument. Updated ui.runtime archives. Change-Id: I2bbafe26b345b4deafd0269284cfc5bfbbc3d69d
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice')
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend9
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
index 97db7df17..55779bec0 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
@@ -181,9 +181,12 @@ class CExtensions implements ILanguageExtension {
override String pointerLiteral() { "*" }
override String nullPointer() { "NULL" }
override String voidPointer() { "void*" }
- override String typeArrayModifier() { pointerLiteral }
- override String arrayDeclaration(String type, int size, String name, boolean isRef)'''
+ override String arrayType(String type, int size, boolean isRef)'''
+ «type»«IF isRef»*«ENDIF»
+ '''
+
+ override String arrayDeclaration(String type, int size, boolean isRef, String name)'''
«type»«IF isRef»*«ENDIF» «name»[«size»]
'''
@@ -371,7 +374,7 @@ class CExtensions implements ILanguageExtension {
else
type.getName()
}
-
+
override makeOverridable() {
// not possible for C: empty string
""

Back to the top