Fixes for bug #1275:

- Allow arrays in instBuiltinAttribute when checkModel is used, so that
  checkModel can be used on array types with modifications.
- Added test case libraries/msl31/Modelica.Mechanics.MultiBody.


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

Compiler/Inst.mo

@@ -2254,14 +2254,24 @@ algorithm
     local
       Values.Value v; DAE.Type t_1,bindTp; DAE.Exp bind1;
       DAE.Const c;
+      DAE.Dimension d;
 
     case(cache,env,id,SOME(v),bind,expectedTp,DAE.PROP(bindTp,c))
       equation
         failure(equality(c=DAE.C_VAR));
         (bind1,t_1) = Types.matchType(bind,bindTp,expectedTp,true);
       then DAE.TYPES_VAR(id,DAE.ATTR(false,false,SCode.RO(),SCode.PARAM(),Absyn.BIDIR(),Absyn.UNSPECIFIED()),
         false,t_1,DAE.EQBOUND(bind1,SOME(v),DAE.C_PARAM(),DAE.BINDING_FROM_DEFAULT_VALUE()),NONE());
-
+
+    case(cache,env,id,SOME(v),bind,expectedTp,DAE.PROP(bindTp as (DAE.T_ARRAY(arrayDim = d),_),c))
+      equation
+        failure(equality(c=DAE.C_VAR));
+        true = OptManager.getOption("checkModel");
+        expectedTp = Types.liftArray(expectedTp, d);
+        (bind1,t_1) = Types.matchType(bind,bindTp,expectedTp,true);
+      then DAE.TYPES_VAR(id,DAE.ATTR(false,false,SCode.RO(),SCode.PARAM(),Absyn.BIDIR(),Absyn.UNSPECIFIED()),
+        false,t_1,DAE.EQBOUND(bind1,SOME(v),DAE.C_PARAM(),DAE.BINDING_FROM_DEFAULT_VALUE()),NONE());
+
     case(cache,env,id,_,bind,expectedTp,DAE.PROP(bindTp,c))
       equation
         failure(equality(c=DAE.C_VAR));
@@ -2270,6 +2280,16 @@ algorithm
       then DAE.TYPES_VAR(id,DAE.ATTR(false,false,SCode.RO(),SCode.PARAM(),Absyn.BIDIR(),Absyn.UNSPECIFIED()),
       false,t_1,DAE.EQBOUND(bind1,SOME(v),DAE.C_PARAM(),DAE.BINDING_FROM_DEFAULT_VALUE()),NONE());
 
+    case(cache,env,id,_,bind,expectedTp,DAE.PROP(bindTp as (DAE.T_ARRAY(arrayDim = d),_),c))
+      equation
+        failure(equality(c=DAE.C_VAR));
+        true = OptManager.getOption("checkModel");
+        expectedTp = Types.liftArray(expectedTp, d);
+        (bind1,t_1) = Types.matchType(bind,bindTp,expectedTp,true);
+        (cache,v,_) = Ceval.ceval(cache,env, bind1, false, NONE, NONE, Ceval.NO_MSG());
+      then DAE.TYPES_VAR(id,DAE.ATTR(false,false,SCode.RO(),SCode.PARAM(),Absyn.BIDIR(),Absyn.UNSPECIFIED()),
+      false,t_1,DAE.EQBOUND(bind1,SOME(v),DAE.C_PARAM(),DAE.BINDING_FROM_DEFAULT_VALUE()),NONE());
+
     case(cache,env,id,_,bind,expectedTp,DAE.PROP(bindTp,c))
       equation
         failure(equality(c=DAE.C_VAR));