Merge pull request #164 from hgomersall/improved_block_decorator

[WIP] Improved block decorator

myhdl/_block.py

@@ -22,7 +22,8 @@
 
 import inspect
 
-from functools import wraps
+#from functools import wraps
+import functools
 
 import myhdl
 from myhdl import BlockError, BlockInstanceError, Cosimulation
@@ -80,16 +81,55 @@ def _getCallInfo():
     return _CallInfo(name, modctxt, symdict)
 
 
-def block(func):
-    srcfile = inspect.getsourcefile(func)
-    srcline = inspect.getsourcelines(func)[0]
+class _bound_function_wrapper(object): 
+
+    def __init__(self, bound_func, srcfile, srcline):
 
-    @wraps(func)
-    def deco(*args, **kwargs):
-        deco.calls += 1
-        return _Block(func, deco, srcfile, srcline, *args, **kwargs)
-    deco.calls = 0
-    return deco
+        self.srcfile = srcfile
+        self.srcline = srcline
+
+        self.bound_func = bound_func
+        functools.update_wrapper(self, bound_func)
+
+        self.calls = 0
+
+    def __call__(self, *args, **kwargs):
+        self.calls += 1
+        return _Block(self.bound_func, self, self.srcfile, 
+                      self.srcline, *args, **kwargs)
+
+class block(object):
+    def __init__(self, func):
+        self.srcfile = inspect.getsourcefile(func)
+        self.srcline = inspect.getsourcelines(func)[0]
+
+        self.func = func
+        functools.update_wrapper(self, func)
+
+        self.calls = 0        
+
+    def __get__(self, instance, owner):
+
+        bound_func = self.func.__get__(instance, owner)
+        return _bound_function_wrapper(bound_func, self.srcfile, self.srcline)
+
+    def __call__(self, *args, **kwargs):
+
+        self.calls += 1
+        return _Block(self.func, self, self.srcfile, 
+                      self.srcline, *args, **kwargs)
+
+#def block(func):
+#    srcfile = inspect.getsourcefile(func)
+#    srcline = inspect.getsourcelines(func)[0]
+#
+#    print(func, type(func))
+#    @wraps(func)
+#    def deco(*args, **kwargs):
+#        deco.calls += 1
+#        return _Block(func, deco, srcfile, srcline, *args, **kwargs)
+#    deco.calls = 0
+#    return deco
 
 
 class _Block(object):