h_code.putln("%s DL_IMPORT(PyTypeObject) %s;" % (
Naming.extern_c_macro,
type.typeobj_cname))
- #self.generate_obj_struct_definition(type, h_code)
def generate_cclass_include_code(self, type, i_code):
i_code.putln("cdef extern class %s.%s:" % (
code = globalstate['all_the_rest']
self.generate_cached_builtins_decls(env, code)
+ # generate lambda function definitions
+ for node in env.lambda_defs:
+ node.generate_function_definitions(env, code)
+ # generate normal function definitions
self.body.generate_function_definitions(env, code)
code.mark_pos(None)
self.generate_typeobj_definitions(env, code)
self.generate_method_table(env, code)
- self.generate_filename_init_prototype(code)
if env.has_import_star:
self.generate_import_star(env, code)
self.generate_pymoduledef_struct(env, code)
elif type.is_enum:
self.generate_enum_definition(entry, code)
elif type.is_extension_type and entry not in vtabslot_entries:
- self.generate_obj_struct_definition(type, code)
+ self.generate_objstruct_definition(type, code)
for entry in vtabslot_list:
- self.generate_obj_struct_definition(entry.type, code)
+ self.generate_objstruct_definition(entry.type, code)
for entry in vtab_list:
self.generate_typeobject_predeclaration(entry, code)
self.generate_exttype_vtable_struct(entry, code)
for module in modules:
defined_here = module is env
modulecode.putln("/* Module declarations from %s */" %
- module.qualified_name.encode("ASCII", "ignore"))
+ module.qualified_name)
self.generate_global_declarations(module, modulecode, defined_here)
self.generate_cfunction_predeclarations(module, modulecode, defined_here)
def generate_module_preamble(self, env, cimported_modules, code):
- code.putln('/* Generated by Cython %s on %s */' % (
+ code.putln("/* Generated by Cython %s on %s */" % (
Version.version, time.asctime()))
- code.putln('')
- code.putln('#define PY_SSIZE_T_CLEAN')
+ code.putln("")
+ code.putln("#define PY_SSIZE_T_CLEAN")
for filename in env.python_include_files:
code.putln('#include "%s"' % filename)
code.putln("#ifndef Py_PYTHON_H")
code.putln(" #error Python headers needed to compile C extensions, please install development version of Python.")
code.putln("#else")
code.globalstate["end"].putln("#endif /* Py_PYTHON_H */")
- code.putln("#ifndef PY_LONG_LONG")
- code.putln(" #define PY_LONG_LONG LONG_LONG")
- code.putln("#endif")
- code.putln("#ifndef DL_EXPORT")
- code.putln(" #define DL_EXPORT(t) t")
- code.putln("#endif")
- code.putln("#if PY_VERSION_HEX < 0x02040000")
- code.putln(" #define METH_COEXIST 0")
- code.putln(" #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)")
- code.putln(" #define PyDict_Contains(d,o) PySequence_Contains(d,o)")
- code.putln("#endif")
+
+ code.put("""
+#include <stddef.h> /* For offsetof */
+#ifndef offsetof
+#define offsetof(type, member) ( (size_t) & ((type*)0) -> member )
+#endif
- code.putln("#if PY_VERSION_HEX < 0x02050000")
- code.putln(" typedef int Py_ssize_t;")
- code.putln(" #define PY_SSIZE_T_MAX INT_MAX")
- code.putln(" #define PY_SSIZE_T_MIN INT_MIN")
- code.putln(" #define PY_FORMAT_SIZE_T \"\"")
- code.putln(" #define PyInt_FromSsize_t(z) PyInt_FromLong(z)")
- code.putln(" #define PyInt_AsSsize_t(o) PyInt_AsLong(o)")
- code.putln(" #define PyNumber_Index(o) PyNumber_Int(o)")
- code.putln(" #define PyIndex_Check(o) PyNumber_Check(o)")
- code.putln("#endif")
+#if !defined(WIN32) && !defined(MS_WINDOWS)
+ #ifndef __stdcall
+ #define __stdcall
+ #endif
+ #ifndef __cdecl
+ #define __cdecl
+ #endif
+ #ifndef __fastcall
+ #define __fastcall
+ #endif
+#endif
- code.putln("#if PY_VERSION_HEX < 0x02060000")
- code.putln(" #define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)")
- code.putln(" #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)")
- code.putln(" #define Py_SIZE(ob) (((PyVarObject*)(ob))->ob_size)")
- code.putln(" #define PyVarObject_HEAD_INIT(type, size) \\")
- code.putln(" PyObject_HEAD_INIT(type) size,")
- code.putln(" #define PyType_Modified(t)")
- code.putln(" #define PyBytes_CheckExact PyString_CheckExact")
- code.putln("")
- code.putln(" typedef struct {")
- code.putln(" void *buf;")
- code.putln(" PyObject *obj;")
- code.putln(" Py_ssize_t len;")
- code.putln(" Py_ssize_t itemsize;")
- code.putln(" int readonly;")
- code.putln(" int ndim;")
- code.putln(" char *format;")
- code.putln(" Py_ssize_t *shape;")
- code.putln(" Py_ssize_t *strides;")
- code.putln(" Py_ssize_t *suboffsets;")
- code.putln(" void *internal;")
- code.putln(" } Py_buffer;")
- code.putln("")
- code.putln(" #define PyBUF_SIMPLE 0")
- code.putln(" #define PyBUF_WRITABLE 0x0001")
- code.putln(" #define PyBUF_FORMAT 0x0004")
- code.putln(" #define PyBUF_ND 0x0008")
- code.putln(" #define PyBUF_STRIDES (0x0010 | PyBUF_ND)")
- code.putln(" #define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)")
- code.putln(" #define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)")
- code.putln(" #define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)")
- code.putln(" #define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)")
- code.putln("")
- code.putln("#endif")
+#ifndef DL_IMPORT
+ #define DL_IMPORT(t) t
+#endif
+#ifndef DL_EXPORT
+ #define DL_EXPORT(t) t
+#endif
+
+#ifndef PY_LONG_LONG
+ #define PY_LONG_LONG LONG_LONG
+#endif
- code.put(builtin_module_name_utility_code.proto)
+#if PY_VERSION_HEX < 0x02040000
+ #define METH_COEXIST 0
+ #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
+ #define PyDict_Contains(d,o) PySequence_Contains(d,o)
+#endif
- code.putln("#if PY_MAJOR_VERSION >= 3")
- code.putln(" #define Py_TPFLAGS_CHECKTYPES 0")
- code.putln(" #define Py_TPFLAGS_HAVE_INDEX 0")
- code.putln("#endif")
+#if PY_VERSION_HEX < 0x02050000
+ typedef int Py_ssize_t;
+ #define PY_SSIZE_T_MAX INT_MAX
+ #define PY_SSIZE_T_MIN INT_MIN
+ #define PY_FORMAT_SIZE_T \"\"
+ #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
+ #define PyInt_AsSsize_t(o) PyInt_AsLong(o)
+ #define PyNumber_Index(o) PyNumber_Int(o)
+ #define PyIndex_Check(o) PyNumber_Check(o)
+ #define PyErr_WarnEx(category, message, stacklevel) PyErr_Warn(category, message)
+#endif
- code.putln("#if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)")
- code.putln(" #define Py_TPFLAGS_HAVE_NEWBUFFER 0")
- code.putln("#endif")
+#if PY_VERSION_HEX < 0x02060000
+ #define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)
+ #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
+ #define Py_SIZE(ob) (((PyVarObject*)(ob))->ob_size)
+ #define PyVarObject_HEAD_INIT(type, size) \\
+ PyObject_HEAD_INIT(type) size,
+ #define PyType_Modified(t)
- code.putln("#if PY_MAJOR_VERSION >= 3")
- code.putln(" #define PyBaseString_Type PyUnicode_Type")
- code.putln(" #define PyString_Type PyUnicode_Type")
- code.putln(" #define PyString_CheckExact PyUnicode_CheckExact")
- code.putln(" #define PyInt_Type PyLong_Type")
- code.putln(" #define PyInt_Check(op) PyLong_Check(op)")
- code.putln(" #define PyInt_CheckExact(op) PyLong_CheckExact(op)")
- code.putln(" #define PyInt_FromString PyLong_FromString")
- code.putln(" #define PyInt_FromUnicode PyLong_FromUnicode")
- code.putln(" #define PyInt_FromLong PyLong_FromLong")
- code.putln(" #define PyInt_FromSize_t PyLong_FromSize_t")
- code.putln(" #define PyInt_FromSsize_t PyLong_FromSsize_t")
- code.putln(" #define PyInt_AsLong PyLong_AsLong")
- code.putln(" #define PyInt_AS_LONG PyLong_AS_LONG")
- code.putln(" #define PyInt_AsSsize_t PyLong_AsSsize_t")
- code.putln(" #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask")
- code.putln(" #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask")
- code.putln(" #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)")
- code.putln(" #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)")
- code.putln("#else")
+ typedef struct {
+ void *buf;
+ PyObject *obj;
+ Py_ssize_t len;
+ Py_ssize_t itemsize;
+ int readonly;
+ int ndim;
+ char *format;
+ Py_ssize_t *shape;
+ Py_ssize_t *strides;
+ Py_ssize_t *suboffsets;
+ void *internal;
+ } Py_buffer;
+
+ #define PyBUF_SIMPLE 0
+ #define PyBUF_WRITABLE 0x0001
+ #define PyBUF_FORMAT 0x0004
+ #define PyBUF_ND 0x0008
+ #define PyBUF_STRIDES (0x0010 | PyBUF_ND)
+ #define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)
+ #define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)
+ #define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)
+ #define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
+
+#endif
+
+#if PY_MAJOR_VERSION < 3
+ #define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
+#else
+ #define __Pyx_BUILTIN_MODULE_NAME "builtins"
+#endif
+
+#if PY_MAJOR_VERSION >= 3
+ #define Py_TPFLAGS_CHECKTYPES 0
+ #define Py_TPFLAGS_HAVE_INDEX 0
+#endif
+
+#if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)
+ #define Py_TPFLAGS_HAVE_NEWBUFFER 0
+#endif
+
+#if PY_MAJOR_VERSION >= 3
+ #define PyBaseString_Type PyUnicode_Type
+ #define PyStringObject PyUnicodeObject
+ #define PyString_Type PyUnicode_Type
+ #define PyString_Check PyUnicode_Check
+ #define PyString_CheckExact PyUnicode_CheckExact
+#endif
+
+#if PY_VERSION_HEX < 0x02060000
+ #define PyBytesObject PyStringObject
+ #define PyBytes_Type PyString_Type
+ #define PyBytes_Check PyString_Check
+ #define PyBytes_CheckExact PyString_CheckExact
+ #define PyBytes_FromString PyString_FromString
+ #define PyBytes_FromStringAndSize PyString_FromStringAndSize
+ #define PyBytes_FromFormat PyString_FromFormat
+ #define PyBytes_DecodeEscape PyString_DecodeEscape
+ #define PyBytes_AsString PyString_AsString
+ #define PyBytes_AsStringAndSize PyString_AsStringAndSize
+ #define PyBytes_Size PyString_Size
+ #define PyBytes_AS_STRING PyString_AS_STRING
+ #define PyBytes_GET_SIZE PyString_GET_SIZE
+ #define PyBytes_Repr PyString_Repr
+ #define PyBytes_Concat PyString_Concat
+ #define PyBytes_ConcatAndDel PyString_ConcatAndDel
+#endif
+
+#if PY_MAJOR_VERSION >= 3
+ #define PyInt_Type PyLong_Type
+ #define PyInt_Check(op) PyLong_Check(op)
+ #define PyInt_CheckExact(op) PyLong_CheckExact(op)
+ #define PyInt_FromString PyLong_FromString
+ #define PyInt_FromUnicode PyLong_FromUnicode
+ #define PyInt_FromLong PyLong_FromLong
+ #define PyInt_FromSize_t PyLong_FromSize_t
+ #define PyInt_FromSsize_t PyLong_FromSsize_t
+ #define PyInt_AsLong PyLong_AsLong
+ #define PyInt_AS_LONG PyLong_AS_LONG
+ #define PyInt_AsSsize_t PyLong_AsSsize_t
+ #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask
+ #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
+#endif
+""")
+
+ code.put("""
+#if PY_MAJOR_VERSION >= 3
+ #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)
+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)
+#else
+""")
if Future.division in env.context.future_directives:
code.putln(" #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)")
code.putln(" #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)")
else:
code.putln(" #define __Pyx_PyNumber_Divide(x,y) PyNumber_Divide(x,y)")
code.putln(" #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y)")
- code.putln(" #define PyBytes_Type PyString_Type")
code.putln("#endif")
- code.putln("#if PY_MAJOR_VERSION >= 3")
- code.putln(" #define PyMethod_New(func, self, klass) PyInstanceMethod_New(func)")
- code.putln("#endif")
-
- code.putln("#if !defined(WIN32) && !defined(MS_WINDOWS)")
- code.putln(" #ifndef __stdcall")
- code.putln(" #define __stdcall")
- code.putln(" #endif")
- code.putln(" #ifndef __cdecl")
- code.putln(" #define __cdecl")
- code.putln(" #endif")
- code.putln(" #ifndef __fastcall")
- code.putln(" #define __fastcall")
- code.putln(" #endif")
- code.putln("#else")
- code.putln(" #define _USE_MATH_DEFINES")
- code.putln("#endif")
+ code.put("""
+#if PY_MAJOR_VERSION >= 3
+ #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func))
+#endif
- code.putln("#if PY_VERSION_HEX < 0x02050000")
- code.putln(" #define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),((char *)(n)))")
- code.putln(" #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))")
- code.putln(" #define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),((char *)(n)))")
- code.putln("#else")
- code.putln(" #define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),(n))")
- code.putln(" #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))")
- code.putln(" #define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),(n))")
- code.putln("#endif")
+#if PY_VERSION_HEX < 0x02050000
+ #define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),((char *)(n)))
+ #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))
+ #define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),((char *)(n)))
+#else
+ #define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),(n))
+ #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))
+ #define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),(n))
+#endif
- code.putln("#if PY_VERSION_HEX < 0x02050000")
- code.putln(" #define __Pyx_NAMESTR(n) ((char *)(n))")
- code.putln(" #define __Pyx_DOCSTR(n) ((char *)(n))")
- code.putln("#else")
- code.putln(" #define __Pyx_NAMESTR(n) (n)")
- code.putln(" #define __Pyx_DOCSTR(n) (n)")
- code.putln("#endif")
+#if PY_VERSION_HEX < 0x02050000
+ #define __Pyx_NAMESTR(n) ((char *)(n))
+ #define __Pyx_DOCSTR(n) ((char *)(n))
+#else
+ #define __Pyx_NAMESTR(n) (n)
+ #define __Pyx_DOCSTR(n) (n)
+#endif
+""")
+ code.putln("")
self.generate_extern_c_macro_definition(code)
+ code.putln("")
+ code.putln("#if defined(WIN32) || defined(MS_WINDOWS)")
+ code.putln("#define _USE_MATH_DEFINES")
+ code.putln("#endif")
code.putln("#include <math.h>")
code.putln("#define %s" % Naming.api_guard_prefix + self.api_name(env))
self.generate_includes(env, cimported_modules, code)
code.putln('static int %s = 0;' % Naming.clineno_cname)
code.putln('static const char * %s= %s;' % (Naming.cfilenm_cname, Naming.file_c_macro))
code.putln('static const char *%s;' % Naming.filename_cname)
- code.putln('static const char **%s;' % Naming.filetable_cname)
# XXX this is a mess
for utility_code in PyrexTypes.c_int_from_py_function.specialize_list:
def generate_includes(self, env, cimported_modules, code):
includes = []
for filename in env.include_files:
- # fake decoding of filenames to their original byte sequence
- code.putln('#include "%s"' % filename)
+ byte_decoded_filenname = str(filename)
+ if byte_decoded_filenname[0] == '<' and byte_decoded_filenname[-1] == '>':
+ code.putln('#include %s' % byte_decoded_filenname)
+ else:
+ code.putln('#include "%s"' % byte_decoded_filenname)
def generate_filename_table(self, code):
code.putln("")
- code.putln("static const char *%s[] = {" % Naming.filenames_cname)
+ code.putln("static const char *%s[] = {" % Naming.filetable_cname)
if code.globalstate.filename_list:
for source_desc in code.globalstate.filename_list:
filename = os.path.basename(source_desc.get_filenametable_entry())
escaped_filename = filename.replace("\\", "\\\\").replace('"', r'\"')
- code.putln('"%s",' %
- escaped_filename)
+ code.putln('"%s",' % escaped_filename)
else:
# Some C compilers don't like an empty array
code.putln("0")
elif type.is_enum:
self.generate_enum_definition(entry, code)
elif type.is_extension_type:
- self.generate_obj_struct_definition(type, code)
+ self.generate_objstruct_definition(type, code)
def generate_gcc33_hack(self, env, code):
# Workaround for spurious warning generation in gcc 3.3
def generate_typedef(self, entry, code):
base_type = entry.type.typedef_base_type
- code.putln("")
- code.putln("typedef %s;" % base_type.declaration_code(entry.cname))
+ if base_type.is_numeric:
+ writer = code.globalstate['numeric_typedefs']
+ else:
+ writer = code
+ writer.putln("")
+ writer.putln("typedef %s;" % base_type.declaration_code(entry.cname))
def sue_header_footer(self, type, kind, name):
if type.typedef_flag:
type.vtabstruct_cname,
type.vtabptr_cname))
- def generate_obj_struct_definition(self, type, code):
+ def generate_objstruct_definition(self, type, code):
code.mark_pos(type.pos)
# Generate object struct definition for an
# extension type.
self.generate_descr_set_function(scope, code)
self.generate_property_accessors(scope, code)
self.generate_method_table(scope, code)
- self.generate_member_table(scope, code)
self.generate_getset_table(scope, code)
self.generate_typeobj_definition(full_module_name, entry, code)
type.vtabslot_cname,
struct_type_cast, type.vtabptr_cname))
for entry in py_attrs:
- if entry.name == "__weakref__":
+ if scope.is_internal or entry.name == "__weakref__":
+ # internal classes do not need None inits
code.putln("p->%s = 0;" % entry.cname)
else:
code.put_init_var_to_py_none(entry, "p->%s", nanny=False)
if type.typedef_flag:
objstruct = type.objstruct_cname
else:
- #objstruct = "struct %s" % scope.parent_type.objstruct_cname
objstruct = "struct %s" % type.objstruct_cname
code.putln(
"sizeof(%s), /*tp_basicsize*/" %
def generate_method_table(self, env, code):
code.putln("")
code.putln(
- "static struct PyMethodDef %s[] = {" %
+ "static PyMethodDef %s[] = {" %
env.method_table_cname)
for entry in env.pyfunc_entries:
code.put_pymethoddef(entry, ",")
code.putln(
"};")
- def generate_member_table(self, env, code):
- #print "ModuleNode.generate_member_table: scope =", env ###
- if env.public_attr_entries:
- code.putln("")
- code.putln(
- "static struct PyMemberDef %s[] = {" %
- env.member_table_cname)
- type = env.parent_type
- if type.typedef_flag:
- objstruct = type.objstruct_cname
- else:
- objstruct = "struct %s" % type.objstruct_cname
- for entry in env.public_attr_entries:
- type_code = entry.type.pymemberdef_typecode
- if entry.visibility == 'readonly':
- flags = "READONLY"
- else:
- flags = "0"
- code.putln('{(char *)"%s", %s, %s, %s, 0},' % (
- entry.name,
- type_code,
- "offsetof(%s, %s)" % (objstruct, entry.cname),
- flags))
- code.putln(
- "{0, 0, 0, 0, 0}")
- code.putln(
- "};")
-
def generate_getset_table(self, env, code):
if env.property_entries:
code.putln("")
code.putln(
"};")
- def generate_filename_init_prototype(self, code):
- code.putln("");
- code.putln("static void %s(void); /*proto*/" % Naming.fileinit_cname)
-
def generate_import_star(self, env, code):
env.use_utility_code(streq_utility_code)
code.putln()
code.putln("__pyx_refnanny = __Pyx_RefNanny->SetupContext(\"%s\", __LINE__, __FILE__);"% header3)
code.putln("#endif")
- self.generate_filename_init_call(code)
-
code.putln("%s = PyTuple_New(0); %s" % (Naming.empty_tuple, code.error_goto_if_null(Naming.empty_tuple, self.pos)));
- code.putln("#if PY_MAJOR_VERSION < 3");
- code.putln("%s = PyString_FromStringAndSize(\"\", 0); %s" % (Naming.empty_bytes, code.error_goto_if_null(Naming.empty_bytes, self.pos)));
- code.putln("#else");
code.putln("%s = PyBytes_FromStringAndSize(\"\", 0); %s" % (Naming.empty_bytes, code.error_goto_if_null(Naming.empty_bytes, self.pos)));
- code.putln("#endif");
+
+ code.putln("#ifdef %s_USED" % Naming.binding_cfunc)
+ code.putln("if (%s_init() < 0) %s" % (Naming.binding_cfunc, code.error_goto(self.pos)))
+ code.putln("#endif")
code.putln("/*--- Library function declarations ---*/")
env.generate_library_function_declarations(code)
if not Options.generate_cleanup_code:
return
code.globalstate.use_utility_code(register_cleanup_utility_code)
- code.putln('static PyObject* %s(PyObject *self, PyObject *unused) {' % Naming.cleanup_cname)
+ code.putln('static PyObject *%s(CYTHON_UNUSED PyObject *self, CYTHON_UNUSED PyObject *unused) {' %
+ Naming.cleanup_cname)
if Options.generate_cleanup_code >= 2:
code.putln("/*--- Global cleanup code ---*/")
rev_entries = list(env.var_entries)
module_is_main = "%s%s" % (Naming.module_is_main, self.full_module_name.replace('.', '__'))
code.globalstate.use_utility_code(main_method.specialize(module_name=env.module_name, module_is_main=module_is_main))
- def generate_filename_init_call(self, code):
- code.putln("%s();" % Naming.fileinit_cname)
-
def generate_pymoduledef_struct(self, env, code):
if env.doc:
doc = "__Pyx_DOCSTR(%s)" % code.get_string_const(env.doc)
module_name = '__Pyx_BUILTIN_MODULE_NAME'
if type.name in self.py3_type_name_map:
code.putln("#if PY_MAJOR_VERSION >= 3")
- code.putln('%s = __Pyx_ImportType(%s, "%s", sizeof(%s)); %s' % (
+ code.putln('%s = __Pyx_ImportType(%s, "%s", sizeof(%s), 1); %s' % (
type.typeptr_cname,
module_name,
self.py3_type_name_map[type.name],
objstruct,
error_code))
code.putln("#else")
- code.putln('%s = __Pyx_ImportType(%s, "%s", sizeof(%s)); %s' % (
+ code.putln('%s = __Pyx_ImportType(%s, "%s", sizeof(%s), %i); %s' % (
type.typeptr_cname,
module_name,
type.name,
objstruct,
+ not type.is_external or type.is_subclassed,
error_code))
if type.name in self.py3_type_name_map:
code.putln("#endif")
#
#------------------------------------------------------------------------------------
-builtin_module_name_utility_code = UtilityCode(
-proto = """\
-#if PY_MAJOR_VERSION < 3
- #define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
-#else
- #define __Pyx_BUILTIN_MODULE_NAME "builtins"
-#endif
-""")
-
-#------------------------------------------------------------------------------------
-
streq_utility_code = UtilityCode(
proto = """
-static INLINE int __Pyx_StrEq(const char *, const char *); /*proto*/
+static CYTHON_INLINE int __Pyx_StrEq(const char *, const char *); /*proto*/
""",
impl = """
-static INLINE int __Pyx_StrEq(const char *s1, const char *s2) {
+static CYTHON_INLINE int __Pyx_StrEq(const char *s1, const char *s2) {
while (*s1 != '\\0' && *s1 == *s2) { s1++; s2++; }
return *s1 == *s2;
}
type_import_utility_code = UtilityCode(
proto = """
-static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name, long size); /*proto*/
+static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name, long size, int strict); /*proto*/
""",
impl = """
#ifndef __PYX_HAVE_RT_ImportType
#define __PYX_HAVE_RT_ImportType
static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name,
- long size)
+ long size, int strict)
{
PyObject *py_module = 0;
PyObject *result = 0;
PyObject *py_name = 0;
+ char warning[200];
py_module = __Pyx_ImportModule(module_name);
if (!py_module)
module_name, class_name);
goto bad;
}
- if (((PyTypeObject *)result)->tp_basicsize != size) {
+ if (!strict && ((PyTypeObject *)result)->tp_basicsize > size) {
+ PyOS_snprintf(warning, sizeof(warning),
+ "%s.%s size changed, may indicate binary incompatibility",
+ module_name, class_name);
+ #if PY_VERSION_HEX < 0x02050000
+ PyErr_Warn(NULL, warning);
+ #else
+ PyErr_WarnEx(NULL, warning, 0);
+ #endif
+ }
+ else if (((PyTypeObject *)result)->tp_basicsize != size) {
PyErr_Format(PyExc_ValueError,
- "%s.%s does not appear to be the correct type object",
+ "%s.%s has the wrong size, try recompiling",
module_name, class_name);
goto bad;
}
goto bad;
}
tmp.fp = f;
-#if PY_VERSION_HEX < 0x03010000
- cobj = PyCObject_FromVoidPtrAndDesc(tmp.p, (void *)sig, 0);
-#else
+#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3&&PY_MINOR_VERSION==0)
cobj = PyCapsule_New(tmp.p, sig, 0);
+#else
+ cobj = PyCObject_FromVoidPtrAndDesc(tmp.p, (void *)sig, 0);
#endif
if (!cobj)
goto bad;
void (*fp)(void);
void *p;
} tmp;
-#if PY_VERSION_HEX < 0x03010000
- const char *desc, *s1, *s2;
-#endif
d = PyObject_GetAttrString(module, (char *)"%(API)s");
if (!d)
PyModule_GetName(module), funcname);
goto bad;
}
-#if PY_VERSION_HEX < 0x03010000
+#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3&&PY_MINOR_VERSION==0)
+ if (!PyCapsule_IsValid(cobj, sig)) {
+ PyErr_Format(PyExc_TypeError,
+ "C function %%s.%%s has wrong signature (expected %%s, got %%s)",
+ PyModule_GetName(module), funcname, sig, PyCapsule_GetName(cobj));
+ goto bad;
+ }
+ tmp.p = PyCapsule_GetPointer(cobj, sig);
+#else
+ {const char *desc, *s1, *s2;
desc = (const char *)PyCObject_GetDesc(cobj);
if (!desc)
goto bad;
PyModule_GetName(module), funcname, sig, desc);
goto bad;
}
- tmp.p = PyCObject_AsVoidPtr(cobj);
-#else
- if (!PyCapsule_IsValid(cobj, sig)) {
- PyErr_Format(PyExc_TypeError,
- "C function %%s.%%s has wrong signature (expected %%s, got %%s)",
- PyModule_GetName(module), funcname, sig, PyCapsule_GetName(cobj));
- goto bad;
- }
- tmp.p = PyCapsule_GetPointer(cobj, sig);
+ tmp.p = PyCObject_AsVoidPtr(cobj);}
#endif
*f = tmp.fp;
if (!(*f))
register_cleanup_utility_code = UtilityCode(
proto = """
static int __Pyx_RegisterCleanup(void); /*proto*/
-static PyObject* __pyx_module_cleanup(PyObject *self, PyObject *unused); /*proto*/
-static PyMethodDef cleanup_def = {__Pyx_NAMESTR("__cleanup"), (PyCFunction)&__pyx_module_cleanup, METH_NOARGS, 0};
-""",
+static PyObject* %(module_cleanup)s(CYTHON_UNUSED PyObject *self, CYTHON_UNUSED PyObject *unused); /*proto*/
+static PyMethodDef cleanup_def = {__Pyx_NAMESTR("__cleanup"), (PyCFunction)&%(module_cleanup)s, METH_NOARGS, 0};
+""" % {'module_cleanup': Naming.cleanup_cname},
impl = """
static int __Pyx_RegisterCleanup(void) {
/* Don't use Py_AtExit because that has a 32-call limit
char* s;
PyObject *locals = 0;
PyObject *list = 0;
+#if PY_MAJOR_VERSION >= 3
+ PyObject *utf8_name = 0;
+#endif
PyObject *name;
PyObject *item;
for(i=0; i<PyList_GET_SIZE(list); i++) {
name = PyTuple_GET_ITEM(PyList_GET_ITEM(list, i), 0);
item = PyTuple_GET_ITEM(PyList_GET_ITEM(list, i), 1);
-#if PY_MAJOR_VERSION < 3
- s = PyString_AsString(name);
+#if PY_MAJOR_VERSION >= 3
+ utf8_name = PyUnicode_AsUTF8String(name);
+ if (!utf8_name) goto bad;
+ s = PyBytes_AS_STRING(utf8_name);
+ if (%(IMPORT_STAR_SET)s(item, name, s) < 0) goto bad;
+ Py_DECREF(utf8_name); utf8_name = 0;
#else
- s = PyUnicode_AsString(name);
-#endif
+ s = PyString_AsString(name);
if (!s) goto bad;
if (%(IMPORT_STAR_SET)s(item, name, s) < 0) goto bad;
+#endif
}
ret = 0;
bad:
Py_XDECREF(locals);
Py_XDECREF(list);
+#if PY_MAJOR_VERSION >= 3
+ Py_XDECREF(utf8_name);
+#endif
return ret;
}
""" % {'IMPORT_STAR' : Naming.import_star,