Parameter copy behavior of Submodule has been improved.

Author: shtaxxx

hello_led.ipynb

@@ -53,9 +53,7 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "def mkTest():\n",
@@ -83,32 +81,25 @@
   {
    "cell_type": "code",
    "execution_count": 4,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
       "\n",
       "\n",
-      "module test #\n",
-      "(\n",
-      "  parameter WIDTH = 8\n",
-      ")\n",
+      "module test\n",
       "(\n",
       "\n",
       ");\n",
       "\n",
+      "  localparam WIDTH = 8;\n",
       "  reg CLK;\n",
       "  reg RST;\n",
       "  wire [WIDTH-1:0] LED;\n",
       "\n",
       "  blinkled\n",
-      "  #(\n",
-      "    .WIDTH(WIDTH)\n",
-      "  )\n",
       "  uut\n",
       "  (\n",
       "    .CLK(CLK),\n",
@@ -10207,6 +10198,15 @@
     "\n",
     "    # sim.view_waveform()"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -10225,7 +10225,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.1"
+   "version": "3.6.2"
   }
  },
  "nbformat": 4,

veriloggen/core/module.py

@@ -679,7 +679,7 @@ def copy_params_as_localparams(self, src, prefix=None, postfix=None,
             name = ''.join([prefix, obj.name, postfix])
             value = visitor.visit(obj.value)
             width = visitor.visit(obj.width)
-            signed = obj.sined
+            signed = obj.signed
             copy_obj = vtypes.Localparam(value, width, signed, name)
             self.add_object(copy_obj)
             ret[copy_obj.name] = copy_obj

veriloggen/core/submodule.py

@@ -96,21 +96,28 @@ def __init__(self, parent, child,
         # params
         new_params = collections.OrderedDict()
 
-        param_exclude = []
-        param_exclude.extend(arg_params.keys())
-        new_params.update(parent.copy_params(child, self.prefix))
+        if arg_params:
+            new_params.update(
+                parent.copy_params_as_localparams(child, self.prefix,
+                                                  include=arg_params.keys()))
+
+        # localparams
+        # used ones only
+        new_localparams = collections.OrderedDict()
+        if used_params:
+            new_localparams.update(
+                parent.copy_params_as_localparams(child, self.prefix,
+                                                  include=used_params,
+                                                  exclude=arg_params.keys()))
+            new_localparams.update(
+                parent.copy_localparams(child, self.prefix, include=used_params))
 
         # overwrite the parameter value by parameter arg
         for key, param in arg_params.items():
             new_key = ''.join([self.prefix, key])
             new_param = new_params[new_key]
             new_param.value = param
 
-        # localparams (used ones only)
-        new_localparams = collections.OrderedDict()
-        new_localparams.update(
-            parent.copy_localparams(child, self.prefix, include=used_params))
-
         # ports
         new_ports = collections.OrderedDict()
         if as_io:
@@ -129,13 +136,15 @@ def __init__(self, parent, child,
             new_ports.update(parent.copy_ports_as_vars(
                 child, self.prefix, include=as_wire, use_wire=True))
 
+        # for instance args
         self.all_params = collections.OrderedDict()
         self.all_raw_params = collections.OrderedDict()
 
         for key in child_params.keys():
             new_key = ''.join((self.prefix, key))
-            self.all_params[key] = new_params[new_key]
-            self.all_raw_params[new_key] = new_params[new_key]
+            if new_key in new_params:
+                self.all_params[key] = new_params[new_key]
+                self.all_raw_params[new_key] = new_params[new_key]
 
         self.all_ports = collections.OrderedDict()
         self.all_raw_ports = collections.OrderedDict()