Merge branch 'fix_resolver_bug' into develop

Author: shtaxxx

veriloggen/resolver/resolver.py

@@ -676,7 +676,12 @@ def visit_GenerateIf(self, node):
         #    "GenerateIf statement is not currently supported.")
         return node
 
+    def visit_GenerateIfElse(self, node):
+        # raise NotImplementedError(
+        #    "GenerateIfElse statement is not currently supported.")
+        return node
+
 
 def resolve(m, const_dict=None):
-    mvisitor = ModuleReplaceVisitor(m, const_dict)
+    mvisitor = ModuleReplaceVisitor(copy.deepcopy(m), const_dict)
     return mvisitor.resolve()

veriloggen/verilog/from_verilog.py

@@ -887,6 +887,7 @@ def _visit_GenerateIf(self, item):
         self.pop_module()
 
         _if_false = _if_true.Else(false_scope)
+        self.add_object(_if_false)
         self.push_module(_if_false)
         statement = (self.visit(item.false_statement)
                      if item.false_statement is not None else None)