fix usage of x in integer_types,..

Author: jck

myhdl/conversion/_analyze.py

@@ -42,7 +42,7 @@
 from myhdl._extractHierarchy import _isMem, _getMemInfo, _UserCode
 from myhdl._Signal import _Signal, _WaiterList
 from myhdl._ShadowSignal import _ShadowSignal, _SliceSignal
-from myhdl._util import _isTupleOfInts, _dedent, _makeAST
+from myhdl._util import _isTupleOfInts, _dedent, _flatten, _makeAST
 from myhdl._resolverefs import _AttrRefTransformer
 from myhdl._compat import builtins, integer_types
 
@@ -576,7 +576,7 @@ def visit_Call(self, node):
             node.obj = int(0) # XXX
         elif f is bool:
             node.obj = bool()
-        elif f in (integer_types, ord):
+        elif f in _flatten(integer_types, ord):
             node.obj = int(-1)
 ##         elif f in (posedge , negedge):
 ##             node.obj = _EdgeDetector()

myhdl/conversion/_toVHDL.py

@@ -40,7 +40,6 @@
 
 import myhdl
 from myhdl import *
-from myhdl._compat import integer_types, class_types, StringIO
 from myhdl import ToVHDLError, ToVHDLWarning
 from myhdl._extractHierarchy import (_HierExtr, _isMem, _getMemInfo,
                                      _UserVhdlCode, _userCodeMap)
@@ -52,6 +51,8 @@
                                        _Ram, _Rom, _enumTypeSet, _constDict, _extConstDict)
 from myhdl._Signal import _Signal,_WaiterList
 from myhdl.conversion._toVHDLPackage import _package
+from myhdl._util import  _flatten
+from myhdl._compat import integer_types, class_types, StringIO
 
 
 _version = myhdl.__version__.replace('.','')
@@ -2053,7 +2054,7 @@ def visit_Call(self, node):
             node.vhd = vhd_unsigned(s)
         elif f is bool:
             node.vhd = vhd_boolean()
-        elif f in (integer_types, ord):
+        elif f in _flatten(integer_types, ord):
             node.vhd = vhd_int()
             node.args[0].vhd = vhd_int()
         elif f in (intbv, modbv):