#2896 Fix simplify asub when array<T> types are involved

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22766 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 16, 2014 · 6a2360f · 6a2360f
1 parent f118ef0
commit 6a2360f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Compiler/FrontEnd/Expression.mo b/Compiler/FrontEnd/Expression.mo
@@ -1066,6 +1066,10 @@ algorithm
       then tp;
     case (DAE.T_ARRAY(ty = tp,dims = (_ :: ds),source = ts))
       then DAE.T_ARRAY(tp,ds,ts);
+    case (DAE.T_METATYPE(ty = tp))
+      then Types.simplifyType(unliftArray(tp));
+    case (DAE.T_METAARRAY(ty = tp))
+      then tp;
     else inType;
   end match;
 end unliftArray;

diff --git a/Compiler/FrontEnd/ExpressionSimplify.mo b/Compiler/FrontEnd/ExpressionSimplify.mo
@@ -2902,9 +2902,16 @@ algorithm
       then
         e;
 
+    case(DAE.CREF(c,DAE.T_METATYPE(ty=DAE.T_METAARRAY(ty=t))), _, _)
+      equation
+        t = Types.simplifyType(t);
+        exp = Expression.makeBuiltinCall("arrayGet",{ie,inSubExp},t,false);
+      then exp;
+
     // name subscript
     case(DAE.CREF(c,t), _, _)
       equation
+        true = Types.isArray(t,{});
         t = Expression.unliftArray(t);
         c_1 = simplifyAsubCref(c, inSubExp);
         exp = Expression.makeCrefExp(c_1, t);