read_verilog features are updated for the duplication check features.

Author: shtaxxx

veriloggen/core/module.py

@@ -515,8 +515,13 @@ def find_module(self, name):
         if name in self.submodule:
             return self.submodule[name]
         for gen in self.generate.values():
-            r = gen.find_module(name)
-            if r: return r
+            if isinstance(gen, (tuple, list)):
+                for g in gen:
+                    r = g.find_module(name)
+                    if r: return r
+            else:
+                r = gen.find_module(name)
+                if r: return r
         for sub in self.submodule.values():
             r = sub.find_module(name)
             if r: return r
@@ -526,7 +531,11 @@ def get_modules(self):
         modules = collections.OrderedDict()
         modules[self.name] = self
         for gen in self.generate.values():
-            modules.update( gen.get_modules() )
+            if isinstance(gen, (tuple, list)):
+                for g in gen:
+                    modules.update( g.get_modules() )
+            else:
+                modules.update( gen.get_modules() )
         for sub in self.submodule.values():
             modules.update( sub.get_modules() )
         return modules
@@ -610,7 +619,11 @@ def find_identifier(self, name):
     def get_modules(self):
         modules = collections.OrderedDict()
         for gen in self.generate.values():
-            modules.update( gen.get_modules() )
+            if isinstance(gen, (tuple, list)):
+                for g in gen:
+                    modules.update( g.get_modules() )
+            else:
+                modules.update( gen.get_modules() )
         for sub in self.submodule.values():
             modules.update( sub.get_modules() )
         return modules

veriloggen/verilog/from_verilog.py

@@ -776,7 +776,7 @@ def _visit_GenerateFor(self, item):
         scope = (item.statement.scope
                  if isinstance(item.statement, vast.Block)
                  else None)
-        _for = module.GenerateFor(pre, cond, post, scope)
+        _for = module.GenerateFor(self.m, pre, cond, post, scope)
         ret = _for
         self.add_object(_for)
         self.push_module(_for)
@@ -792,7 +792,7 @@ def _visit_GenerateIf(self, item):
         false_scope = (item.false_statement.scope
                       if isinstance(item.false_statement, vast.Block)
                       else None)
-        _if_true = module.GenerateIf(cond, true_scope)
+        _if_true = module.GenerateIf(self.m, cond, true_scope)
         ret = _if_true
         self.add_object(_if_true)
         self.push_module(_if_true)