[UR] Address Review Feedback

Author: Petr Vesely

scripts/templates/helper.py

@@ -236,7 +236,7 @@ def get_array_length(cls, name):
     @classmethod
     def get_array_element_type(cls, name):
         if not cls.is_array(name):
-            raise Exception("Cannot find array length of non-array type.")
+            raise Exception("Cannot find array type of non-array type.")
 
         match = re.match(cls.RE_ARRAY, name)
         return match.groups()[0]

scripts/templates/params.hpp.mako

@@ -85,14 +85,16 @@ def findMemberType(_item):
         os << ".${iname} = ";
         ${x}_params::serializeUnion(os, ${deref}(params${access}${item['name']}), params${access}${th.param_traits.tagged_member(item)});
     %elif th.type_traits.is_array(item['type']):
-        os << ".${iname} = [";
+        os << ".${iname} = {";
         for(auto i = 0; i < ${th.type_traits.get_array_length(item['type'])}; i++){
             if(i != 0){
                 os << ", ";
             }
-            os << ${deref}(params${access}${item['name']}[i]);
+            <%call expr="member(iname, itype, True)">
+                ${deref}(params${access}${item['name']}[i])
+            </%call>
         }
-        os << "]";
+        os << "}";
     %elif typename is not None:
         os << ".${iname} = ";
         ${x}_params::serializeTagged(os, ${deref}(params${access}${pname}), ${deref}(params${access}${prefix}${typename}), ${deref}(params${access}${prefix}${typename_size}));

source/common/ur_params.hpp

@@ -9905,14 +9905,15 @@ operator<<(std::ostream &os, const struct ur_exp_sampler_addr_modes_t params) {
     ur_params::serializeStruct(os, (params.pNext));
 
     os << ", ";
-    os << ".addrModes = [";
+    os << ".addrModes = {";
     for (auto i = 0; i < 3; i++) {
         if (i != 0) {
             os << ", ";
         }
+
         os << (params.addrModes[i]);
     }
-    os << "]";
+    os << "}";
 
     os << "}";
     return os;

test/unit/utils/params.cpp

@@ -381,11 +381,11 @@ struct UrSamplerAddressModesTest {
                "\\{"
                ".stype = UR_STRUCTURE_TYPE_EXP_SAMPLER_ADDR_MODES, "
                ".pNext = nullptr, "
-               ".addrModes = \\["
+               ".addrModes = \\{"
                "UR_SAMPLER_ADDRESSING_MODE_CLAMP, "
                "UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT, "
                "UR_SAMPLER_ADDRESSING_MODE_REPEAT"
-               "\\]"
+               "\\}"
                "\\}";
     }