Skip to content

C
cython
Commit 4f8a75c1 authored by Robert Bradshaw's avatar Robert Bradshaw
Browse files
Options

merge

parents 95e19f49 a3038580
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 42 deletions
Cython/Compiler/ModuleNode.py
View file @ 4f8a75c1
......@@ -201,7 +201,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
for entry in api_funcs:
sig = entry.type.signature_string()
h_code.putln(
'if (__Pyx_ImportFunction(module, "%s", (void (**)(void))&%s, "%s") < 0) goto bad;' % (
'if (__Pyx_ImportFunction(module, "%s", (void**)&%s, "%s") < 0) goto bad;' % (
entry.name,
entry.cname,
sig))
......@@ -1800,7 +1800,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
if entry.api or entry.defined_in_pxd:
env.use_utility_code(function_export_utility_code)
signature = entry.type.signature_string()
code.putln('if (__Pyx_ExportFunction("%s", (void (*)(void))%s, "%s") < 0) %s' % (
code.putln('if (__Pyx_ExportFunction("%s", (void*)%s, "%s") < 0) %s' % (
entry.name,
entry.cname,
signature,
......@@ -1832,7 +1832,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code.error_goto(self.pos)))
for entry in entries:
code.putln(
'if (__Pyx_ImportFunction(%s, "%s", (void (**)(void))&%s, "%s") < 0) %s' % (
'if (__Pyx_ImportFunction(%s, "%s", (void**)&%s, "%s") < 0) %s' % (
temp,
entry.name,
entry.cname,
......@@ -1971,23 +1971,24 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
c_method_entries = [
entry for entry in type.scope.cfunc_entries
if entry.func_cname ]
code.putln('#if PY_MAJOR_VERSION >= 3')
for meth_entry in c_method_entries:
cast = meth_entry.type.signature_cast_string()
code.putln(
"%s.%s = %s%s;" % (
type.vtable_cname,
meth_entry.cname,
cast,
meth_entry.func_cname))
code.putln('#else')
for meth_entry in c_method_entries:
code.putln(
"*(void(**)(void))&%s.%s = (void(*)(void))%s;" % (
type.vtable_cname,
meth_entry.cname,
meth_entry.func_cname))
code.putln('#endif')
if c_method_entries:
code.putln('#if PY_MAJOR_VERSION >= 3')
for meth_entry in c_method_entries:
cast = meth_entry.type.signature_cast_string()
code.putln(
"%s.%s = %s%s;" % (
type.vtable_cname,
meth_entry.cname,
cast,
meth_entry.func_cname))
code.putln('#else')
for meth_entry in c_method_entries:
code.putln(
"*(void(**)(void))&%s.%s = (void(*)(void))%s;" % (
type.vtable_cname,
meth_entry.cname,
meth_entry.func_cname))
code.putln('#endif')
def generate_typeptr_assignment_code(self, entry, code):
# Generate code to initialise the typeptr of an extension
......@@ -2115,18 +2116,17 @@ bad:
function_export_utility_code = UtilityCode(
proto = """
static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *sig); /*proto*/
static int __Pyx_ExportFunction(const char *name, void *f, const char *sig); /*proto*/
""",
impl = r"""
static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *sig) {
static int __Pyx_ExportFunction(const char *name, void *f, const char *sig) {
#if PY_VERSION_HEX < 0x02050000
char *api = (char *)"%(API)s";
#else
const char *api = "%(API)s";
#endif
PyObject *d = 0;
PyObject *cobj = 0;
void *p = 0;
PyObject *p = 0;
d = PyObject_GetAttrString(%(MODULE)s, api);
if (!d) {
......@@ -2138,17 +2138,16 @@ static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *s
if (PyModule_AddObject(%(MODULE)s, api, d) < 0)
goto bad;
}
p = *(void **)&f;
cobj = PyCObject_FromVoidPtrAndDesc(p, (void *)sig, 0);
if (!cobj)
p = PyCObject_FromVoidPtrAndDesc(f, (void *)sig, 0);
if (!p)
goto bad;
if (PyDict_SetItemString(d, name, cobj) < 0)
if (PyDict_SetItemString(d, name, p) < 0)
goto bad;
Py_DECREF(cobj);
Py_DECREF(p);
Py_DECREF(d);
return 0;
bad:
Py_XDECREF(cobj);
Py_XDECREF(p);
Py_XDECREF(d);
return -1;
}
......@@ -2159,12 +2158,12 @@ bad:
function_import_utility_code = UtilityCode(
proto = """
static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**f)(void), const char *sig); /*proto*/
static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void **f, const char *sig); /*proto*/
""",
impl = """
#ifndef __PYX_HAVE_RT_ImportFunction
#define __PYX_HAVE_RT_ImportFunction
static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**f)(void), const char *sig) {
static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void **f, const char *sig) {
#if PY_VERSION_HEX < 0x02050000
char *api = (char *)"%(API)s";
#else
......@@ -2172,8 +2171,7 @@ static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**
#endif
PyObject *d = 0;
PyObject *cobj = 0;
void *p = 0;
const char *desc = 0;
char *desc;
d = PyObject_GetAttrString(module, api);
if (!d)
......@@ -2185,7 +2183,7 @@ static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**
PyModule_GetName(module), funcname);
goto bad;
}
desc = (const char *)PyCObject_GetDesc(cobj);
desc = (char *)PyCObject_GetDesc(cobj);
if (!desc)
goto bad;
if (strcmp(desc, sig) != 0) {
......@@ -2194,8 +2192,7 @@ static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**
PyModule_GetName(module), funcname, sig, desc);
goto bad;
}
p = PyCObject_AsVoidPtr(cobj);
*f = *(void (**)(void))&p;
*f = PyCObject_AsVoidPtr(cobj);
Py_DECREF(d);
return 0;
bad:
......
Cython/Compiler/PyrexTypes.py
View file @ 4f8a75c1
......@@ -303,14 +303,16 @@ class BuiltinObjectType(PyObjectType):
def type_test_code(self, arg):
type_name = self.name
if type_name == 'str':
type_name = 'String'
check = 'PyString_CheckExact'
elif type_name == 'set':
type_name = 'AnySet'
check = 'PyAnySet_CheckExact'
elif type_name == 'frozenset':
type_name = 'FrozenSet'
check = 'PyFrozenSet_CheckExact'
elif type_name == 'bool':
check = 'PyBool_Check'
else:
type_name = type_name.capitalize()
return 'likely(Py%s_CheckExact(%s)) || (%s) == Py_None || (PyErr_Format(PyExc_TypeError, "Expected %s, got %%s", Py_TYPE(%s)->tp_name), 0)' % (type_name, arg, arg, self.name, arg)
check = 'Py%s_CheckExact' % type_name.capitalize()
return 'likely(%s(%s)) || (%s) == Py_None || (PyErr_Format(PyExc_TypeError, "Expected %s, got %%s", Py_TYPE(%s)->tp_name), 0)' % (check, arg, arg, self.name, arg)
def declaration_code(self, entity_code,
for_display = 0, dll_linkage = None, pyrex = 0):
......
tests/run/cdef_bool_T227.pyx 0 → 100644
View file @ 4f8a75c1
__doc__ = u"""
>>> foo(True)
True
>>> foo(False)
False
>>> foo('abc') # doctest: +ELLIPSIS
Traceback (most recent call last):
TypeError: ...
>>> call_cfoo(True)
True
>>> call_cfoo(False)
False
>>> call_cfoo('abc') # doctest: +ELLIPSIS
Traceback (most recent call last):
TypeError: ...
"""
def foo(bool a):
return a == True
def call_cfoo(a):
return cfoo(a)
cdef cfoo(bool a):
return a == True
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7