Fixed method definitions in thread is moved

Author: shtaxxx

tests/extension/thread_/fixed_const/thread_fixed_const.py

@@ -27,7 +27,7 @@ def mkLed():
 
     def blink(times):
         led.value = 0
-        next_val = FixedConst(0, 8)
+        next_val = vthread.fixed.FixedConst(0, 8)
         for i in range(times):
             next_val = next_val + 1
             led.value = next_val

veriloggen/thread/__init__.py

@@ -5,3 +5,4 @@
 from .pool import ThreadPool
 from .stream import Stream
 from .ttypes import *
+from . import fixed

veriloggen/thread/compiler.py

@@ -12,7 +12,6 @@
 from . import optimizer
 from .scope import ScopeName, ScopeFrameList, ScopeFrame
 from .operator import getVeriloggenOp, getMethodName, applyMethod
-from . import fixed_intrinsics as fxi
 
 
 numerical_types = vtypes.numerical_types
@@ -69,15 +68,6 @@ def __init__(self, m, name, clk, rst, fsm,
         self.start_frame = start_frame
         self.datawidth = datawidth
 
-        fixed_intrinsics = {
-            'FixedConst': fxi._intrinsic_FixedConst,
-            'to_fixed': fxi._intrinsic_to_fixed,
-            'fixed_to_int': fxi._intrinsic_fixed_to_int,
-            'fixed_to_int_low': fxi._intrinsic_fixed_to_int_low,
-            'fixed_to_real': fxi._intrinsic_fixed_to_real,
-        }
-        self.intrinsic_functions.update(fixed_intrinsics)
-
         self.scope = ScopeFrameList()
         self.loop_info = OrderedDict()
 
@@ -615,7 +605,7 @@ def _call_Attribute(self, node):
         value = self.visit(node.func.value)
         method = getattr(value, node.func.attr)
 
-        if not inspect.ismethod(method):
+        if not inspect.ismethod(method) and not inspect.isfunction(method):
             raise TypeError("'%s' object is not callable" % str(type(method)))
 
         # prepare the argument values

veriloggen/thread/fixed_intrinsics.py renamed to veriloggen/thread/fixed.py

@@ -4,23 +4,26 @@
 import veriloggen.core.vtypes as vtypes
 import veriloggen.types.fixed as fixed
 
+__intrinsics__ = ('FixedConst', 'to_fixed', 'fixed_to_int',
+                  'fixed_to_int_low', 'fixed_to_real')
 
-def _intrinsic_FixedConst(fsm, value, point=0, signed=True, raw=False):
+
+def FixedConst(fsm, value, point=0, signed=True, raw=False):
     point = vtypes.raw_value(point)
     return fixed.FixedConst(value, point, signed, raw)
 
 
-def _intrinsic_to_fixed(fsm, value, point, signed=False):
+def to_fixed(fsm, value, point, signed=False):
     return fixed.to_fixed(value, point, signed)
 
 
-def _intrinsic_fixed_to_int(fsm, value, point, signed=False):
+def fixed_to_int(fsm, value, point, signed=False):
     return fixed.fixed_to_int(value, point, signed)
 
 
-def _intrinsic_fixed_to_int_low(fsm, value, point):
+def fixed_to_int_low(fsm, value, point):
     return fixed.fixed_to_int_low(value, point)
 
 
-def _intrinsic_fixed_to_real(fsm, value, point, signed=False):
+def fixed_to_real(fsm, value, point, signed=False):
     return fixed.fixed_to_real(value, point, signed)