- Fix for unallocated arrays in records. And some passing tests.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12118 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 19, 2012 · 334a772 · 334a772
1 parent af4d6d4
commit 334a772
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Compiler/Template/AbsynDumpTpl.mo b/Compiler/Template/AbsynDumpTpl.mo
@@ -4,7 +4,7 @@ encapsulated package AbsynDumpTpl
   package:     AbsynDumpTpl
   description: Generated by Susan.
   
-  $Id$
+  $Id: TplCodegen.mo 9216 2011-05-31 10:52:47Z sjoelund.se $
 "
 
 public import Tpl;

diff --git a/Compiler/susan_codegen/SimCode/CodegenC.tpl b/Compiler/susan_codegen/SimCode/CodegenC.tpl
@@ -3472,6 +3472,7 @@ case var as VARIABLE(parallelism = NON_PARALLEL(__)) then
   let addRoot = match typ case "modelica_metatype" then ' mmc_GC_add_root(&<%varName%>, mmc_GC_local_state, "<%varName%>");' else ''  
   let &varDecls += if not outStruct then '<%typ%> <%varName%><%initVar%>;<%addRoot%><%\n%>' //else ""
   let varName = if outStruct then '<%outStruct%>.c<%i%>' else '<%contextCref(var.name,contextFunction)%>'
+  let &varInits += initRecordMembers(var)
   let instDimsInit = (instDims |> exp =>
       daeExp(exp, contextFunction, &varInits /*BUFC*/, &varDecls /*BUFD*/)
     ;separator=", ") 
@@ -3490,7 +3491,7 @@ case var as VARIABLE(parallelism = NON_PARALLEL(__)) then
     else
       let &varInits += 'alloc_<%expTypeShort(var.ty)%>_array(&<%varName%>, <%listLength(instDims)%>, <%instDimsInit%>);<%\n%>'
       let defaultValue = varDefaultValue(var, outStruct, i, varName, &varDecls, &varInits)
-     let &varInits += defaultValue
+      let &varInits += defaultValue
       "")
   else
     (match var.value