Commit 29676ce1 authored by Robert Bradshaw's avatar Robert Bradshaw

Remove internal dependancy on included .pxd files

parent 2826c424
...@@ -15,7 +15,7 @@ class CythonScope(ModuleScope): ...@@ -15,7 +15,7 @@ class CythonScope(ModuleScope):
pos=None, pos=None,
defining = 1, defining = 1,
cname='<error>') cname='<error>')
def lookup_type(self, name): def lookup_type(self, name):
# This function should go away when types are all first-level objects. # This function should go away when types are all first-level objects.
type = parse_basic_type(name) type = parse_basic_type(name)
...@@ -23,4 +23,27 @@ class CythonScope(ModuleScope): ...@@ -23,4 +23,27 @@ class CythonScope(ModuleScope):
return type return type
def create_cython_scope(context): def create_cython_scope(context):
create_utility_scope(context)
return CythonScope(context) return CythonScope(context)
def create_utility_scope(context):
global utility_scope
utility_scope = ModuleScope(u'utility', None, context)
# These are used to optimize isinstance in FinalOptimizePhase
type_object = utility_scope.declare_typedef('PyTypeObject',
base_type = c_void_type,
pos = None,
cname = 'PyTypeObject')
type_object.is_void = True
utility_scope.declare_cfunction(
'PyObject_TypeCheck',
CFuncType(c_bint_type, [CFuncTypeArg("o", py_object_type, None),
CFuncTypeArg("t", c_ptr_type(type_object), None)]),
pos = None,
defining = 1,
cname = 'PyObject_TypeCheck')
return utility_scope
...@@ -640,11 +640,9 @@ class FinalOptimizePhase(Visitor.CythonTransform): ...@@ -640,11 +640,9 @@ class FinalOptimizePhase(Visitor.CythonTransform):
if node.function.name == 'isinstance': if node.function.name == 'isinstance':
type_arg = node.args[1] type_arg = node.args[1]
if type_arg.type.is_builtin_type and type_arg.type.name == 'type': if type_arg.type.is_builtin_type and type_arg.type.name == 'type':
object_module = self.context.find_module('python_object') from CythonScope import utility_scope
node.function.entry = object_module.lookup('PyObject_TypeCheck') node.function.entry = utility_scope.lookup('PyObject_TypeCheck')
if node.function.entry is None:
return node # only happens when there was an error earlier
node.function.type = node.function.entry.type node.function.type = node.function.entry.type
PyTypeObjectPtr = PyrexTypes.CPtrType(object_module.lookup('PyTypeObject').type) PyTypeObjectPtr = PyrexTypes.CPtrType(utility_scope.lookup('PyTypeObject').type)
node.args[1] = ExprNodes.CastNode(node.args[1], PyTypeObjectPtr) node.args[1] = ExprNodes.CastNode(node.args[1], PyTypeObjectPtr)
return node return node
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment