diff options
| author | Thomas Schuetz | 2012-01-25 10:37:37 +0000 |
|---|---|---|
| committer | Thomas Schuetz | 2012-01-25 10:37:37 +0000 |
| commit | 8e3702cf33a4be4974ed583fc15f35abfa0f0853 (patch) | |
| tree | 7ed17fff828399aede256a521016c03c37a80716 /plugins/org.eclipse.etrice.generator/src/org/eclipse | |
| parent | 749b13f65870f2cbdc3ae89c90b432966300d235 (diff) | |
| parent | 4cf0af1ebfd6c8c9f9122da470dc8e21f721fbfa (diff) | |
| download | org.eclipse.etrice-8e3702cf33a4be4974ed583fc15f35abfa0f0853.tar.gz org.eclipse.etrice-8e3702cf33a4be4974ed583fc15f35abfa0f0853.tar.xz org.eclipse.etrice-8e3702cf33a4be4974ed583fc15f35abfa0f0853.zip | |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/etrice/org.eclipse.etrice
Conflicts:
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java
runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java
runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java
runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java
runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java
Diffstat (limited to 'plugins/org.eclipse.etrice.generator/src/org/eclipse')
| -rw-r--r-- | plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend index ab9ed4120..d63b2cf96 100644 --- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend +++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend @@ -83,7 +83,10 @@ class ProcedureHelpers { «IF a.defaultValueLiteral!=null»
«IF a.size==0»
«a.name» = «a.defaultValueLiteral»;
- «ELSEIF !a.defaultValueLiteral.startsWith("{")»
+ «ELSEIF a.defaultValueLiteral.startsWith("{")»
+ «a.name» = new «a.type.typeName»[] «a.defaultValueLiteral»;
+ «ELSE»
+ «a.name» = new «a.type.typeName»[«a.size»];
for (int i=0;i<«a.size»;i++){
«a.name»[i] = «a.defaultValueLiteral»;
}
@@ -92,6 +95,7 @@ class ProcedureHelpers { «IF a.size==0»
«a.name» = «a.type.defaultValue»;
«ELSE»
+ «a.name» = new «a.type.typeName»[«a.size»];
for (int i=0;i<«a.size»;i++){
«a.name»[i] = «a.type.defaultValue»;
}
@@ -129,6 +133,10 @@ class ProcedureHelpers { def private GetterHeader(Attribute attribute, String classname){'''
«languageExt.accessLevelPublic()»«attribute.type.typeName»«IF attribute.size!=0»[]«ENDIF» get«attribute.name.toFirstUpper()» («languageExt.selfPointer(classname, 0)»)'''
}
+
+ def argList(List<Attribute> attributes) {
+ '''«FOR a : attributes SEPARATOR ", "»«a.type.typeName»«IF a.size>1»[]«ENDIF» «a.name»«ENDFOR»'''
+ }
// Operations
|