Commit 02b256cd authored by Xavier Thompson's avatar Xavier Thompson

Avoid wrapping cypcass methods with Python-incompatible return types

parent 17e6b1aa
...@@ -1508,6 +1508,8 @@ class CppClassNode(CStructOrUnionDefNode, BlockNode): ...@@ -1508,6 +1508,8 @@ class CppClassNode(CStructOrUnionDefNode, BlockNode):
# templates [(string, bool)] or None # templates [(string, bool)] or None
# decorators [DecoratorNode] or None # decorators [DecoratorNode] or None
# cypclass boolean # cypclass boolean
# lock_mode 'nolock', 'checklock', 'autolock', or None
# activable boolean
# cyp_wrapper CClassDefNode or None # cyp_wrapper CClassDefNode or None
...@@ -1623,19 +1625,19 @@ class CppClassNode(CStructOrUnionDefNode, BlockNode): ...@@ -1623,19 +1625,19 @@ class CppClassNode(CStructOrUnionDefNode, BlockNode):
for thunk in self.entry.type.deferred_declarations: for thunk in self.entry.type.deferred_declarations:
thunk() thunk()
self.insert_cypclass_method_wrappers() self.insert_cypclass_method_wrappers(env)
def insert_cypclass_method_wrappers(self): def insert_cypclass_method_wrappers(self, env):
if self.cyp_wrapper: if self.cyp_wrapper:
for attr in self.attributes: for attr in self.attributes:
if isinstance(attr, CFuncDefNode): if isinstance(attr, CFuncDefNode):
py_method_wrapper = self.synthesize_cypclass_method_wrapper(attr) py_method_wrapper = self.synthesize_cypclass_method_wrapper(attr, env)
if py_method_wrapper: if py_method_wrapper:
# the wrapper cclasses are inserted after the wrapped node # the wrapper cclasses are inserted after the wrapped node
# so their declaration analysis will still occur # so their declaration analysis will still occur
self.cyp_wrapper.body.stats.append(py_method_wrapper) self.cyp_wrapper.body.stats.append(py_method_wrapper)
def synthesize_cypclass_method_wrapper(self, cfunc_method): def synthesize_cypclass_method_wrapper(self, cfunc_method, env):
if cfunc_method.is_static_method: if cfunc_method.is_static_method:
return # for now skip static methods return # for now skip static methods
...@@ -1650,6 +1652,12 @@ class CppClassNode(CStructOrUnionDefNode, BlockNode): ...@@ -1650,6 +1652,12 @@ class CppClassNode(CStructOrUnionDefNode, BlockNode):
if not skipped_self: if not skipped_self:
return # if this ever happens (?), skip non-static methods without a self argument return # if this ever happens (?), skip non-static methods without a self argument
cfunc_return_type = cfunc_method.type.return_type
# we pass the global scope as argument, should not affect the result (?)
if not cfunc_return_type.can_coerce_to_pyobject(env.global_scope()):
return # skip c methods with Python-incompatible return types
from .CypclassWrapper import underlying_name from .CypclassWrapper import underlying_name
from . import ExprNodes from . import ExprNodes
...@@ -1705,7 +1713,7 @@ class CppClassNode(CStructOrUnionDefNode, BlockNode): ...@@ -1705,7 +1713,7 @@ class CppClassNode(CStructOrUnionDefNode, BlockNode):
) )
# > return the result of the call if the underlying return type is not void # > return the result of the call if the underlying return type is not void
if cfunc_method.type.return_type.is_void: if cfunc_return_type.is_void:
py_stat = ExprStatNode(pos=cfunc_method.pos, expr=c_call) py_stat = ExprStatNode(pos=cfunc_method.pos, expr=c_call)
else: else:
py_stat = ReturnStatNode(pos=cfunc_method.pos, return_type=PyrexTypes.py_object_type, value=c_call) py_stat = ReturnStatNode(pos=cfunc_method.pos, return_type=PyrexTypes.py_object_type, value=c_call)
......
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