Fixed bug in codec generation causing some alias signatures to include the constraint for an array type parameter.

Author: LarsAsplund

vhdl/com/test/custom_types.vhd

@@ -82,7 +82,14 @@ package custom_types_pkg is
     msg_type : record8_msg_type_t;
     addr     : natural;
     data     : natural;
-  end record record8_t;
+  end record record8_t;    type int_2d_t is array (integer range <>, integer range <>) of integer;
+  type record9_msg_type_t is (foo, bar);
+  type record9_t is record
+    msg_type : record9_msg_type_t;
+    slv   : std_logic_vector(7 downto 0);
+    str   : string(1 to 3);
+    int_2d : int_2d_t(1 to 2, 4 downto -1);
+  end record record9_t;
 
   type array1_t is array (-2 to 2) of natural;
   type array2_t is array (2 downto -2) of natural;

vhdl/com/test/tb_com_codec.vhd

@@ -152,6 +152,7 @@ begin
     variable rec1 : record1_t;
     variable rec2 : record2_t;
     variable rec3 : record3_t;
+    variable rec9 : record9_t;
     variable p : positive := 1;
 
   begin
@@ -461,6 +462,9 @@ begin
         deallocate(e1);
         deallocate(e2);
         deallocate(e3);
+      elsif run("Test that records containing arrays can be encoded and decoded") then
+        rec9 := decode(encode(record9_t'(foo, x"a5", "foo", ((1, 2, 3, 4, 5, 6), (4, 3, 2, 1, 0, -1)))));
+        check_relation(rec9 = (foo, x"a5", "foo", ((1, 2, 3, 4, 5, 6), (4, 3, 2, 1, 0, -1))));
       end if;
     end loop;
 

vunit/com/codec_vhdl_package.py

@@ -200,7 +200,7 @@ def _generate_msg_type_encoders(self):  # pylint: disable=too-many-locals
                             if identifier != 'msg_type':
                                 parameter_list.append('    constant %s : %s' % (identifier,
                                                                                 element.subtype_indication.code))
-                                parameter_type_list.append(element.subtype_indication.code)
+                                parameter_type_list.append(element.subtype_indication.type_mark)
                                 encoding_list.append('encode(%s)' % identifier)
                             else:
                                 encoding_list.append("encode(%s'(%s))" % (element.subtype_indication.code, value))