Changeset 9322b32 in OpenModelica

Timestamp:

2014-12-11T17:11:26+01:00 (10 years ago)

Author:

Niklas Worschech <niklas.worschech@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

96625081

Parents:

5aa69a5

Message:

fix for create array in cpp template

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@23736 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

File:

• Compiler/Template/CodegenCpp.tpl (modified) (4 diffs)

Compiler/Template/CodegenCpp.tpl

@@ -9828 +9828 @@
                                void <%extraFuncsNamespace%>::createArray_<%arrayVar%>(<%ArrayType%>& <%arrayVar%>)
                                {
+                                  <%arrayVar%>.setDims(<%allocateDimensions(arraytype,context)%>);
                                   <%funcCalls%>
-                                  <%arrayVar%>.setDims(<%allocateDimensions(arraytype,context)%>);
+                                  
 
                                }
@@ -9873 +9874 @@
 let funcCall = 'createArray_<%arrayVar%>_<%idx%>(<%arrayVar%>);<%\n%>'
 let &funcVarDecls = buffer ""
+let &preExpSubArrays = buffer ""
 let funcs = (array |> e hasindex i0 fromindex intAdd(intMul(idx, multiplicator),1) =>
+       let subArraycall = daeExp(e, context, &preExpSubArrays , &funcVarDecls ,simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace,useFlatArrayNotation)
        <<
-        <%arrayVar%>.append(<%i0%>,<%daeExp(e, context, &preExp , &funcVarDecls ,simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace,useFlatArrayNotation)%>);
+          <%arrayVar%>.append(<%i0%>,<%subArraycall%>);
        >> ;separator="\n")
        let & extraFuncs +=
@@ -9882 +9885 @@
        {
         <%funcVarDecls%>
+        <%preExpSubArrays%>
         <%funcs%>
        }
@@ -9888 +9892 @@
 end daeExpSubArray2;
 
-template daeExpSubArrayFunc(Integer idx,String arrayVar,String ArrayType)
-::=
-let func = 'void createArray_<%arrayVar%>_<%idx%>(<%ArrayType%>& <%arrayVar%>);'
-func
-end daeExpSubArrayFunc;
+