Fix importer support for assigning array values to properties. #276

Author: amykyta3

src/systemrdl/properties/bases.py

@@ -80,7 +80,17 @@ def assign_value(self, comp_def: 'comp.Component', value: Any, src_ref: 'SourceR
             assign_type = rdltypes.UserEnum
         else:
             # Value is already evaluated
-            assign_type = type(value)
+            if isinstance(value, list):
+                # Value is a list. Construct an arrayed type
+                if value:
+                    # List is not empty. Get member type
+                    member_type = type(value[0])
+                else:
+                    # List is empty. Member type is unknown
+                    member_type = None
+                assign_type = rdltypes.ArrayedType(member_type)
+            else:
+                assign_type = type(value)
 
         # First check if the value's type is already directly compatible
         for valid_type in self.valid_types:

test/rdl_src/incdir/importer_udps.rdl

@@ -0,0 +1,29 @@
+property udp_string {
+    type = string;
+    component = all;
+};
+
+property udp_string_array {
+    type = string[];
+    component = all;
+};
+
+property udp_boolean {
+    type = boolean;
+    component = all;
+};
+
+property udp_boolean_array {
+    type = boolean[];
+    component = all;
+};
+
+property udp_longint {
+    type = longint;
+    component = all;
+};
+
+property udp_longint_array {
+    type = longint[];
+    component = all;
+};

test/test_importer.py

@@ -1,10 +1,11 @@
 import unittest
+import os
 
 from systemrdl import RDLCompiler, FieldNode, AddressableNode
 from systemrdl.importer import RDLImporter
 
+#-------------------------------------------------------------------------------
 class MyImporter(RDLImporter):
-
     def import_file(self, path: str) -> None:
         super().import_file(path)
 
@@ -79,6 +80,7 @@ def import_file(self, path: str) -> None:
                                     "reg1.some_signal", 0)
         self.add_child(my_rf, reg1)
 
+
 class TypeNameErrorTestcaseImporter(RDLImporter):
 
     def import_file(self, path: str) -> None:
@@ -90,6 +92,42 @@ def import_file(self, path: str) -> None:
         # Creates a register instance with an illegal name.
         reg_t = self.create_reg_definition("illegal.type.name")
 
+#-------------------------------------------------------------------------------
+class TypeTestImporter(RDLImporter):
+    def import_file(self, path: str) -> None:
+        super().import_file(path)
+
+        top = self.create_addrmap_definition("top")
+        self.register_root_component(top)
+
+        reg = self.instantiate_reg(
+            self.create_reg_definition(),
+            "r",
+            0x0,
+        )
+        self.add_child(top, reg)
+
+        field = self.instantiate_field(
+            self.create_field_definition(),
+            "f",
+            0,
+            32,
+        )
+        self.add_child(reg, field)
+
+        self.assign_property(top, "udp_string", "my string")
+        self.assign_property(top, "udp_string_array", ["str1", "str2", "str3"])
+        self.assign_property(top, "udp_boolean", True)
+        self.assign_property(top, "udp_boolean_array", [True, False, True])
+        self.assign_property(top, "udp_longint", 123)
+        self.assign_property(top, "udp_longint_array", [12, 34, 56])
+
+        self.assign_property(reg, "udp_string_array", [])
+        self.assign_property(reg, "udp_boolean_array", [])
+        self.assign_property(reg, "udp_longint_array", [])
+
+#-------------------------------------------------------------------------------
+
 class TestImporter(unittest.TestCase):
     def test_importer(self):
         rdlc = RDLCompiler()
@@ -141,3 +179,28 @@ def test_illegal_type_name_import_raises_error(self):
         i = TypeNameErrorTestcaseImporter(rdlc)
         with self.assertRaisesRegex(ValueError, "Type name has invalid characters: 'illegal.type.name'"):
             i.import_file("asdf")
+
+
+    def test_importer_types(self):
+        rdlc = RDLCompiler()
+
+        this_dir = os.path.dirname(os.path.realpath(__file__))
+        rdlc.compile_file(os.path.join(this_dir, "rdl_src/incdir/importer_udps.rdl"))
+
+        i = TypeTestImporter(rdlc)
+        i.import_file("asdf")
+
+        root = rdlc.elaborate()
+
+        top = root.top
+        self.assertEqual(top.get_property("udp_string"), "my string")
+        self.assertListEqual(top.get_property("udp_string_array"), ["str1", "str2", "str3"])
+        self.assertIs(top.get_property("udp_boolean"), True)
+        self.assertListEqual(top.get_property("udp_boolean_array"), [True, False, True])
+        self.assertEqual(top.get_property("udp_longint"), 123)
+        self.assertListEqual(top.get_property("udp_longint_array"), [12, 34, 56])
+
+        reg = top.get_child_by_name("r")
+        self.assertListEqual(reg.get_property("udp_string_array"), [])
+        self.assertListEqual(reg.get_property("udp_boolean_array"), [])
+        self.assertListEqual(reg.get_property("udp_longint_array"), [])