- Handle arrays of records inside records correctly in DAEDump.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15862 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 19, 2013 · 362202e · 362202e
1 parent 42a0f2f
commit 362202e
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/Compiler/FrontEnd/DAEDump.mo b/Compiler/FrontEnd/DAEDump.mo
@@ -1748,7 +1748,7 @@ algorithm
     // protected vars are not input!, see Modelica Spec 3.2, Section 12.6, Record Constructor Functions, page 140
     case(DAE.T_COMPLEX(cistate,DAE.TYPES_VAR(name=name,attributes = DAE.ATTR(visibility=SCode.PROTECTED()),ty=tp,binding=binding)::varLst,ec,lstPath))
       equation
-        s1 ="  protected "+&Types.unparseType(tp)+&" "+&name+&printRecordConstructorBinding(binding)+&";\n";
+        s1 ="  protected "+&unparseType(tp)+&" "+&name+&printRecordConstructorBinding(binding)+&";\n";
         s2 = printRecordConstructorInputsStr(DAE.T_COMPLEX(cistate,varLst,ec,lstPath));
         str = s1 +&s2;
       then
@@ -1757,15 +1757,15 @@ algorithm
     // constants are not input! see Modelica Spec 3.2, Section 12.6, Record Constructor Functions, page 140
     case(DAE.T_COMPLEX(cistate,DAE.TYPES_VAR(name=name,attributes=DAE.ATTR(variability=SCode.CONST()),ty=tp,binding=binding)::varLst,ec,lstPath))
       equation
-        s1 ="  constant "+&Types.unparseType(tp)+&" "+&name+&printRecordConstructorBinding(binding)+&";\n";
+        s1 ="  constant "+&unparseType(tp)+&" "+&name+&printRecordConstructorBinding(binding)+&";\n";
         s2 = printRecordConstructorInputsStr(DAE.T_COMPLEX(cistate,varLst,ec,lstPath));
         str = s1 +& s2;
       then
         str;
 
     case(DAE.T_COMPLEX(cistate,DAE.TYPES_VAR(name=name,ty=tp,binding=binding)::varLst,ec,lstPath))
       equation
-        s1 ="  input "+&Types.unparseType(tp)+&" "+&name+&printRecordConstructorBinding(binding)+&";\n";
+        s1 ="  input "+&unparseType(tp)+&" "+&name+&printRecordConstructorBinding(binding)+&";\n";
         s2 = printRecordConstructorInputsStr(DAE.T_COMPLEX(cistate,varLst,ec,lstPath));
         str = s1 +& s2;
       then
@@ -2984,16 +2984,30 @@ protected function unparseType "wrapper function for Types.unparseType, so recor
 algorithm
   str := matchcontinue(tp)
     local
-      String name; Absyn.Path path;
-      Types.Type bc_tp;
-
-    case(DAE.T_COMPLEX(complexClassType = ClassInf.RECORD(_),source = {path})) equation
-      name = Absyn.pathStringNoQual(path);
-    then name;
+      String name, dim_str;
+      Absyn.Path path;
+      Types.Type bc_tp, ty;
+      list<DAE.Dimension> dims;
 
-    case(DAE.T_SUBTYPE_BASIC(complexType = bc_tp)) then Types.unparseType(bc_tp);
+    case DAE.T_COMPLEX(complexClassType = ClassInf.RECORD(_), source = {path})
+      equation
+        name = Absyn.pathStringNoQual(path);
+      then
+        name;
 
-    case _ then Types.unparseType(tp);
+    case DAE.T_ARRAY(ty = ty)
+      equation
+        DAE.T_COMPLEX(complexClassType = ClassInf.RECORD(_), source = {path}) =
+          Types.arrayElementType(ty);
+        (_, dims) = Types.flattenArrayTypeOpt(tp); 
+        name = Absyn.pathStringNoQual(path);
+        dim_str = List.toString(dims, ExpressionDump.dimensionString, "", "[",
+            ", ", "]", false);
+      then
+        name +& dim_str;
+
+    case DAE.T_SUBTYPE_BASIC(complexType = bc_tp) then Types.unparseType(bc_tp);
+    else Types.unparseType(tp);
   end matchcontinue;
 end unparseType;