Instance can accept a dict object for params and ports.

Author: shtaxxx

tests/read_verilog_/module_modify/read_verilog_module_modify.py

@@ -45,7 +45,7 @@ def mkTop():
     params = m.copy_params(led)
     ports = m.copy_ports(led)
 
-    m.Instance(led, 'inst_blinkled', m.connect_params(led), m.connect_ports(led))
+    m.Instance(led, 'inst_blinkled', params, ports)
 
     return m
 

veriloggen/module.py

@@ -497,12 +497,16 @@ def __init__(self, module, instname, params=None, ports=None):
         self.instname = instname
         if not params:
             self.params = ()
+        elif isinstance(params, dict):
+            self.params = [ (k, v) for k, v in params.items() ]
         elif isinstance(params[0], (tuple, list)):
             self.params = params
         else:
             self.params = [ (None, p) for p in params ]
         if not ports:
             self.ports = ()
+        elif isinstance(ports, dict):
+            self.ports = [ (k, v) for k, v in ports.items() ]
         elif isinstance(ports[0], (tuple, list)):
             self.ports = ports
         else:
@@ -514,12 +518,12 @@ def _type_check_module(self, module):
                             type(module))
 
     def _type_check_params(self, params):
-        if not isinstance(params, (tuple, list)):
-            raise TypeError("params of Instance require tuple, not %s." % type(params))
+        if not isinstance(params, (tuple, list, dict)):
+            raise TypeError("params of Instance require tuple, list, or dict, not %s." % type(params))
 
     def _type_check_ports(self, ports):
-        if not isinstance(ports, (tuple, list)):
-            raise TypeError("ports of Instance require tuple, not %s." % type(ports))
+        if not isinstance(ports, (tuple, list, dict)):
+            raise TypeError("ports of Instance require tuple, list, or dict, not %s." % type(ports))
 
 #-------------------------------------------------------------------------------
 class Generate(Module):