improve trace_sigs

myhdl/test_trace_sigs.py

@@ -49,6 +49,11 @@ def fun():
     inst = gen(clk)
     return inst
 
+def fun2():
+    clk = Signal(bool(0))
+    inst = gen(clk)
+    return inst
+
 def dummy():
     clk = Signal(bool(0))
     inst = gen(clk)

myhdl/trace_sigs.py

@@ -63,12 +63,12 @@ re_assname = re.compile(r"^\s*(?P<assname>\w[\w\d]*)\s*=")
 
 def trace_sigs(dut, *args, **kwargs):
     global _tracing
+    if _tracing:
+        return dut(*args, **kwargs) # skip
     if not callable(dut):
         raise ArgTypeError("got %s" % type(dut))
     if _isgeneratorfunction(dut):
         raise ArgTypeError("got generator function")
-    if _tracing:
-         return dut(*args, **kwargs) # skip
     _tracing = 1
     try:
         o = getouterframes(currentframe())[1]

myhdl/util.py

@@ -98,15 +98,15 @@ def _isGenSeq(obj):
     return 1
 
 def _isgeneratorfunction(obj):
-   if type(obj) is FunctionType:
-       s = inspect.getsource(obj)
-       s = s.lstrip()
-       s = 'from __future__ import generators\n' + s # for 2.2 ...
-       tree = compiler.parse(s)
-       v = _YieldVisitor()
-       compiler.walk(tree, v)
-       return v.isgenfunc
-   return 0
+    if type(obj) is FunctionType:
+        s = inspect.getsource(obj)
+        s = s.lstrip()
+        s = 'from __future__ import generators\n' + s # for 2.2 ...
+        tree = compiler.parse(s)
+        v = _YieldVisitor()
+        compiler.walk(tree, v)
+        return v.isgenfunc
+    return 0
 
 class _YieldVisitor(object):