diff options
| author | orivej <orivej@yandex-team.ru> | 2022-02-10 16:45:01 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:01 +0300 |
| commit | 2d37894b1b037cf24231090eda8589bbb44fb6fc (patch) | |
| tree | be835aa92c6248212e705f25388ebafcf84bc7a1 /contrib/tools/cython/Cython/Includes | |
| parent | 718c552901d703c502ccbefdfc3c9028d608b947 (diff) | |
| download | ydb-2d37894b1b037cf24231090eda8589bbb44fb6fc.tar.gz | |
Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib/tools/cython/Cython/Includes')
115 files changed, 1749 insertions, 1749 deletions
diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python.pxd index 3b3f7f49ff..56236e925c 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_bool.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_bool.pxd index 01e0463713..9a6d253f45 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_bool.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_bool.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.bool cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_buffer.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_buffer.pxd index 6a1f84ef6f..2baeaae00c 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_buffer.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_buffer.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.buffer cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_bytes.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_bytes.pxd index e52d2c9bfa..87af662de0 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_bytes.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_bytes.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.bytes cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_cobject.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_cobject.pxd index a8539c3290..ed32c6b878 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_cobject.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_cobject.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.cobject cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_complex.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_complex.pxd index cb944a8a59..0a780b3b2d 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_complex.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_complex.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.complex cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_dict.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_dict.pxd index 231c358cde..05b5f4796a 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_dict.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_dict.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.dict cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_exc.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_exc.pxd index 58a31ca473..6eb236bccb 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_exc.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_exc.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.exc cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_float.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_float.pxd index 64dcff8c83..7e133ef9bb 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_float.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_float.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.float cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_function.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_function.pxd index d81960d768..1461c4e635 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_function.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_function.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.function cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_getargs.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_getargs.pxd index 80e99d3198..3852d6a6a1 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_getargs.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_getargs.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.getargs cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_instance.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_instance.pxd index f0640b0786..99cb5a9091 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_instance.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_instance.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.instance cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_int.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_int.pxd index b83e4c2798..c1fd5178d6 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_int.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_int.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.int cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_iterator.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_iterator.pxd index 0efcc4176b..e09aad2790 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_iterator.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_iterator.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.iterator cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_list.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_list.pxd index d70ef91ecf..64febcf969 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_list.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_list.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.list cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_long.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_long.pxd index 34f2d50c85..1a24380c4c 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_long.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_long.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.long cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_mapping.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_mapping.pxd index a1883e9e20..cd01bee015 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_mapping.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_mapping.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.mapping cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_mem.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_mem.pxd index 9d6ec7d281..d74429ea36 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_mem.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_mem.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.mem cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_method.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_method.pxd index 781a7299d1..e7da5154e4 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_method.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_method.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.method cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_module.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_module.pxd index adc4e8086f..6310c0247d 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_module.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_module.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.module cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_number.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_number.pxd index 30a852328d..ae67da1c38 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_number.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_number.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.number cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_object.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_object.pxd index a60aec203a..3981bfa44e 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_object.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_object.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.object cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_oldbuffer.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_oldbuffer.pxd index c5a7853486..e03e66a2e2 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_oldbuffer.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_oldbuffer.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.oldbuffer cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_pycapsule.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_pycapsule.pxd index 8789099181..fe9cf8f8d9 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_pycapsule.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_pycapsule.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.pycapsule cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_ref.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_ref.pxd index d8cbae574d..9447418198 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_ref.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_ref.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.ref cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_sequence.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_sequence.pxd index c5c422098d..fdef5b63eb 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_sequence.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_sequence.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.sequence cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_set.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_set.pxd index 63626aa3b3..a2feb93712 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_set.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_set.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.set cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_string.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_string.pxd index 501e18cf32..24c818338e 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_string.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_string.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.string cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_tuple.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_tuple.pxd index 6101315435..190713b020 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_tuple.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_tuple.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.tuple cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_type.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_type.pxd index 94436aa819..3ac47d1b3f 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_type.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_type.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.type cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_unicode.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_unicode.pxd index 9d383ec0b2..2b488b2dc8 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_unicode.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_unicode.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.unicode cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_version.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_version.pxd index 0e9c887b9d..c27ca4df95 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_version.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_version.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.version cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/python_weakref.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/python_weakref.pxd index c70f44cbe5..1f84f1a179 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/python_weakref.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/python_weakref.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from cpython.weakref cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/stdio.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/stdio.pxd index cd77b499fc..41a4aebf1d 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/stdio.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/stdio.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from libc.stdio cimport * diff --git a/contrib/tools/cython/Cython/Includes/Deprecated/stdlib.pxd b/contrib/tools/cython/Cython/Includes/Deprecated/stdlib.pxd index 5f48fbe2c6..499511cde9 100644 --- a/contrib/tools/cython/Cython/Includes/Deprecated/stdlib.pxd +++ b/contrib/tools/cython/Cython/Includes/Deprecated/stdlib.pxd @@ -1,2 +1,2 @@ -# Present for backwards compatibility +# Present for backwards compatibility from libc.stdlib cimport * diff --git a/contrib/tools/cython/Cython/Includes/cpython/array.pxd b/contrib/tools/cython/Cython/Includes/cpython/array.pxd index 5d37c007df..19230a0a82 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/array.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/array.pxd @@ -52,14 +52,14 @@ from libc.string cimport strcat, strncat, \ from cpython.object cimport Py_SIZE from cpython.ref cimport PyTypeObject, Py_TYPE from cpython.exc cimport PyErr_BadArgument -from cpython.mem cimport PyObject_Malloc, PyObject_Free +from cpython.mem cimport PyObject_Malloc, PyObject_Free cdef extern from *: # Hard-coded utility code hack. ctypedef class array.array [object arrayobject] ctypedef object GETF(array a, Py_ssize_t ix) ctypedef object SETF(array a, Py_ssize_t ix, object o) ctypedef struct arraydescr: # [object arraydescr]: - char typecode + char typecode int itemsize GETF getitem # PyObject * (*getitem)(struct arrayobject *, Py_ssize_t); SETF setitem # int (*setitem)(struct arrayobject *, Py_ssize_t, PyObject *); @@ -104,7 +104,7 @@ cdef extern from *: # Hard-coded utility code hack. info.itemsize = self.ob_descr.itemsize # e.g. sizeof(float) info.len = info.itemsize * item_count - info.shape = <Py_ssize_t*> PyObject_Malloc(sizeof(Py_ssize_t) + 2) + info.shape = <Py_ssize_t*> PyObject_Malloc(sizeof(Py_ssize_t) + 2) if not info.shape: raise MemoryError() info.shape[0] = item_count # constant regardless of resizing @@ -116,7 +116,7 @@ cdef extern from *: # Hard-coded utility code hack. info.obj = self def __releasebuffer__(self, Py_buffer* info): - PyObject_Free(info.shape) + PyObject_Free(info.shape) array newarrayobject(PyTypeObject* type, Py_ssize_t size, arraydescr *descr) diff --git a/contrib/tools/cython/Cython/Includes/cpython/buffer.pxd b/contrib/tools/cython/Cython/Includes/cpython/buffer.pxd index 2f6158f1f1..3f1ada774a 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/buffer.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/buffer.pxd @@ -8,7 +8,7 @@ cdef extern from "Python.h": cdef enum: PyBUF_SIMPLE, PyBUF_WRITABLE, - PyBUF_WRITEABLE, # backwards compatibility + PyBUF_WRITEABLE, # backwards compatibility PyBUF_FORMAT, PyBUF_ND, PyBUF_STRIDES, diff --git a/contrib/tools/cython/Cython/Includes/cpython/bytearray.pxd b/contrib/tools/cython/Cython/Includes/cpython/bytearray.pxd index 4da41c4a0a..1af4a6c427 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/bytearray.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/bytearray.pxd @@ -1,33 +1,33 @@ -from .object cimport PyObject - -cdef extern from "Python.h": - bint PyByteArray_Check(object o) - # Return true if the object o is a bytearray object or an instance of a subtype of the bytearray type. - - bint PyByteArray_CheckExact(object o) - # Return true if the object o is a bytearray object, but not an instance of a subtype of the bytearray type. - - bytearray PyByteArray_FromObject(object o) - # Return a new bytearray object from any object, o, that implements the buffer protocol. - - bytearray PyByteArray_FromStringAndSize(char *string, Py_ssize_t len) - # Create a new bytearray object from string and its length, len. On failure, NULL is returned. - - bytearray PyByteArray_Concat(object a, object b) - # Concat bytearrays a and b and return a new bytearray with the result. - - Py_ssize_t PyByteArray_Size(object bytearray) - # Return the size of bytearray after checking for a NULL pointer. - - char* PyByteArray_AsString(object bytearray) - # Return the contents of bytearray as a char array after checking for a NULL pointer. - # The returned array always has an extra null byte appended. - - int PyByteArray_Resize(object bytearray, Py_ssize_t len) - # Resize the internal buffer of bytearray to len. - - char* PyByteArray_AS_STRING(object bytearray) - # Macro version of PyByteArray_AsString(). - - Py_ssize_t PyByteArray_GET_SIZE(object bytearray) - # Macro version of PyByteArray_Size(). +from .object cimport PyObject + +cdef extern from "Python.h": + bint PyByteArray_Check(object o) + # Return true if the object o is a bytearray object or an instance of a subtype of the bytearray type. + + bint PyByteArray_CheckExact(object o) + # Return true if the object o is a bytearray object, but not an instance of a subtype of the bytearray type. + + bytearray PyByteArray_FromObject(object o) + # Return a new bytearray object from any object, o, that implements the buffer protocol. + + bytearray PyByteArray_FromStringAndSize(char *string, Py_ssize_t len) + # Create a new bytearray object from string and its length, len. On failure, NULL is returned. + + bytearray PyByteArray_Concat(object a, object b) + # Concat bytearrays a and b and return a new bytearray with the result. + + Py_ssize_t PyByteArray_Size(object bytearray) + # Return the size of bytearray after checking for a NULL pointer. + + char* PyByteArray_AsString(object bytearray) + # Return the contents of bytearray as a char array after checking for a NULL pointer. + # The returned array always has an extra null byte appended. + + int PyByteArray_Resize(object bytearray, Py_ssize_t len) + # Resize the internal buffer of bytearray to len. + + char* PyByteArray_AS_STRING(object bytearray) + # Macro version of PyByteArray_AsString(). + + Py_ssize_t PyByteArray_GET_SIZE(object bytearray) + # Macro version of PyByteArray_Size(). diff --git a/contrib/tools/cython/Cython/Includes/cpython/bytes.pxd b/contrib/tools/cython/Cython/Includes/cpython/bytes.pxd index a21cc3baf6..ea72c6aae7 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/bytes.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/bytes.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": ctypedef struct va_list diff --git a/contrib/tools/cython/Cython/Includes/cpython/ceval.pxd b/contrib/tools/cython/Cython/Includes/cpython/ceval.pxd index 51631b0a26..f22191f9fe 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/ceval.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/ceval.pxd @@ -1,8 +1,8 @@ - -cdef extern from "Python.h": - - void PyEval_InitThreads() - # Initialize and acquire the global interpreter lock. - - int PyEval_ThreadsInitialized() - # Returns a non-zero value if PyEval_InitThreads() has been called. + +cdef extern from "Python.h": + + void PyEval_InitThreads() + # Initialize and acquire the global interpreter lock. + + int PyEval_ThreadsInitialized() + # Returns a non-zero value if PyEval_InitThreads() has been called. diff --git a/contrib/tools/cython/Cython/Includes/cpython/datetime.pxd b/contrib/tools/cython/Cython/Includes/cpython/datetime.pxd index 4dbf40d677..cd0f90719b 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/datetime.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/datetime.pxd @@ -1,4 +1,4 @@ -from cpython.object cimport PyObject +from cpython.object cimport PyObject cdef extern from "Python.h": ctypedef struct PyTypeObject: diff --git a/contrib/tools/cython/Cython/Includes/cpython/dict.pxd b/contrib/tools/cython/Cython/Includes/cpython/dict.pxd index fc531ab7af..16dd5e1458 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/dict.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/dict.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": @@ -52,7 +52,7 @@ cdef extern from "Python.h": # be hashable; if it isn't, TypeError will be raised. Return 0 on # success or -1 on failure. - int PyDict_SetItemString(object p, const char *key, object val) except -1 + int PyDict_SetItemString(object p, const char *key, object val) except -1 # Insert value into the dictionary p using key as a key. key # should be a char*. The key object is created using # PyString_FromString(key). Return 0 on success or -1 on failure. @@ -62,7 +62,7 @@ cdef extern from "Python.h": # hashable; if it isn't, TypeError is raised. Return 0 on success # or -1 on failure. - int PyDict_DelItemString(object p, const char *key) except -1 + int PyDict_DelItemString(object p, const char *key) except -1 # Remove the entry in dictionary p which has a key specified by # the string key. Return 0 on success or -1 on failure. @@ -72,7 +72,7 @@ cdef extern from "Python.h": # NULL if the key key is not present, but without setting an # exception. - PyObject* PyDict_GetItemString(object p, const char *key) + PyObject* PyDict_GetItemString(object p, const char *key) # Return value: Borrowed reference. # This is the same as PyDict_GetItem(), but key is specified as a # char*, rather than a PyObject*. diff --git a/contrib/tools/cython/Cython/Includes/cpython/exc.pxd b/contrib/tools/cython/Cython/Includes/cpython/exc.pxd index 608fe3e560..bc57c0e571 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/exc.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/exc.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": @@ -50,7 +50,7 @@ cdef extern from "Python.h": # return value to a specific exception; use # PyErr_ExceptionMatches() instead, shown below. (The comparison # could easily fail since the exception may be an instance instead - # of a class, in the case of a class exception, or it may be a + # of a class, in the case of a class exception, or it may be a # subclass of the expected exception.) bint PyErr_ExceptionMatches(object exc) @@ -153,13 +153,13 @@ cdef extern from "Python.h": # PyErr_SetFromErrno(type);" when the system call returns an # error. - PyObject* PyErr_SetFromErrnoWithFilenameObject(object type, object filenameObject) except NULL - # Similar to PyErr_SetFromErrno(), with the additional behavior - # that if filenameObject is not NULL, it is passed to the - # constructor of type as a third parameter. - # In the case of OSError exception, this is used to define - # the filename attribute of the exception instance. - + PyObject* PyErr_SetFromErrnoWithFilenameObject(object type, object filenameObject) except NULL + # Similar to PyErr_SetFromErrno(), with the additional behavior + # that if filenameObject is not NULL, it is passed to the + # constructor of type as a third parameter. + # In the case of OSError exception, this is used to define + # the filename attribute of the exception instance. + PyObject* PyErr_SetFromErrnoWithFilename(object type, char *filename) except NULL # Return value: Always NULL. Similar to PyErr_SetFromErrno(), # with the additional behavior that if filename is not NULL, it is diff --git a/contrib/tools/cython/Cython/Includes/cpython/function.pxd b/contrib/tools/cython/Cython/Includes/cpython/function.pxd index 8818e1e560..0002a3f6cb 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/function.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/function.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": diff --git a/contrib/tools/cython/Cython/Includes/cpython/int.pxd b/contrib/tools/cython/Cython/Includes/cpython/int.pxd index e70cb3698f..50babff615 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/int.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/int.pxd @@ -46,12 +46,12 @@ cdef extern from "Python.h": object PyInt_FromSsize_t(Py_ssize_t ival) # Return value: New reference. # Create a new integer object with a value of ival. If the value - # is larger than LONG_MAX or smaller than LONG_MIN, a long integer - # object is returned. - - object PyInt_FromSize_t(size_t ival) - # Return value: New reference. - # Create a new integer object with a value of ival. If the value + # is larger than LONG_MAX or smaller than LONG_MIN, a long integer + # object is returned. + + object PyInt_FromSize_t(size_t ival) + # Return value: New reference. + # Create a new integer object with a value of ival. If the value # exceeds LONG_MAX, a long integer object is returned. long PyInt_AsLong(object io) except? -1 @@ -83,7 +83,7 @@ cdef extern from "Python.h": long PyInt_GetMax() # Return the system's idea of the largest integer it can handle # (LONG_MAX, as defined in the system header files). - - int PyInt_ClearFreeList() - # Clear the integer free list. Return the number of items that could not be freed. - # New in version 2.6. + + int PyInt_ClearFreeList() + # Clear the integer free list. Return the number of items that could not be freed. + # New in version 2.6. diff --git a/contrib/tools/cython/Cython/Includes/cpython/list.pxd b/contrib/tools/cython/Cython/Includes/cpython/list.pxd index 0d3d2c95a7..c6a29535c9 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/list.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/list.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": diff --git a/contrib/tools/cython/Cython/Includes/cpython/long.pxd b/contrib/tools/cython/Cython/Includes/cpython/long.pxd index 2b70f9bbb1..eb8140d417 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/long.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/long.pxd @@ -146,4 +146,4 @@ cdef extern from "Python.h": # pointer. If pylong cannot be converted, an OverflowError will be # raised. This is only assured to produce a usable void pointer # for values created with PyLong_FromVoidPtr(). For values outside - # 0..LONG_MAX, both signed and unsigned integers are accepted. + # 0..LONG_MAX, both signed and unsigned integers are accepted. diff --git a/contrib/tools/cython/Cython/Includes/cpython/longintrepr.pxd b/contrib/tools/cython/Cython/Includes/cpython/longintrepr.pxd index 12fb7dc0f5..c38c1bff88 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/longintrepr.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/longintrepr.pxd @@ -1,19 +1,19 @@ -# Internals of the "long" type (Python 2) or "int" type (Python 3). - +# Internals of the "long" type (Python 2) or "int" type (Python 3). + cdef extern from "Python.h": """ #if PY_MAJOR_VERSION < 3 #include "longintrepr.h" #endif """ - ctypedef unsigned int digit - ctypedef int sdigit # Python >= 2.7 only - - ctypedef class __builtin__.py_long [object PyLongObject]: - cdef digit* ob_digit - - cdef py_long _PyLong_New(Py_ssize_t s) - - cdef long PyLong_SHIFT - cdef digit PyLong_BASE - cdef digit PyLong_MASK + ctypedef unsigned int digit + ctypedef int sdigit # Python >= 2.7 only + + ctypedef class __builtin__.py_long [object PyLongObject]: + cdef digit* ob_digit + + cdef py_long _PyLong_New(Py_ssize_t s) + + cdef long PyLong_SHIFT + cdef digit PyLong_BASE + cdef digit PyLong_MASK diff --git a/contrib/tools/cython/Cython/Includes/cpython/mem.pxd b/contrib/tools/cython/Cython/Includes/cpython/mem.pxd index 57b12c9224..af820f2ee0 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/mem.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/mem.pxd @@ -27,7 +27,7 @@ cdef extern from "Python.h": # available for allocating and releasing memory from the Python # heap: - void* PyMem_RawMalloc(size_t n) nogil + void* PyMem_RawMalloc(size_t n) nogil void* PyMem_Malloc(size_t n) # Allocates n bytes and returns a pointer of type void* to the # allocated memory, or NULL if the request fails. Requesting zero @@ -35,7 +35,7 @@ cdef extern from "Python.h": # PyMem_Malloc(1) had been called instead. The memory will not # have been initialized in any way. - void* PyMem_RawRealloc(void *p, size_t n) nogil + void* PyMem_RawRealloc(void *p, size_t n) nogil void* PyMem_Realloc(void *p, size_t n) # Resizes the memory block pointed to by p to n bytes. The # contents will be unchanged to the minimum of the old and the new @@ -45,7 +45,7 @@ cdef extern from "Python.h": # NULL, it must have been returned by a previous call to # PyMem_Malloc() or PyMem_Realloc(). - void PyMem_RawFree(void *p) nogil + void PyMem_RawFree(void *p) nogil void PyMem_Free(void *p) # Frees the memory block pointed to by p, which must have been # returned by a previous call to PyMem_Malloc() or @@ -76,36 +76,36 @@ cdef extern from "Python.h": # PyMem_MALLOC(), PyMem_REALLOC(), PyMem_FREE(). # PyMem_NEW(), PyMem_RESIZE(), PyMem_DEL(). - - - ##################################################################### - # Raw object memory interface - ##################################################################### - - # Functions to call the same malloc/realloc/free as used by Python's - # object allocator. If WITH_PYMALLOC is enabled, these may differ from - # the platform malloc/realloc/free. The Python object allocator is - # designed for fast, cache-conscious allocation of many "small" objects, - # and with low hidden memory overhead. - # - # PyObject_Malloc(0) returns a unique non-NULL pointer if possible. - # - # PyObject_Realloc(NULL, n) acts like PyObject_Malloc(n). - # PyObject_Realloc(p != NULL, 0) does not return NULL, or free the memory - # at p. - # - # Returned pointers must be checked for NULL explicitly; no action is - # performed on failure other than to return NULL (no warning it printed, no - # exception is set, etc). - # - # For allocating objects, use PyObject_{New, NewVar} instead whenever - # possible. The PyObject_{Malloc, Realloc, Free} family is exposed - # so that you can exploit Python's small-block allocator for non-object - # uses. If you must use these routines to allocate object memory, make sure - # the object gets initialized via PyObject_{Init, InitVar} after obtaining - # the raw memory. - - void* PyObject_Malloc(size_t size) - void* PyObject_Calloc(size_t nelem, size_t elsize) - void* PyObject_Realloc(void *ptr, size_t new_size) - void PyObject_Free(void *ptr) + + + ##################################################################### + # Raw object memory interface + ##################################################################### + + # Functions to call the same malloc/realloc/free as used by Python's + # object allocator. If WITH_PYMALLOC is enabled, these may differ from + # the platform malloc/realloc/free. The Python object allocator is + # designed for fast, cache-conscious allocation of many "small" objects, + # and with low hidden memory overhead. + # + # PyObject_Malloc(0) returns a unique non-NULL pointer if possible. + # + # PyObject_Realloc(NULL, n) acts like PyObject_Malloc(n). + # PyObject_Realloc(p != NULL, 0) does not return NULL, or free the memory + # at p. + # + # Returned pointers must be checked for NULL explicitly; no action is + # performed on failure other than to return NULL (no warning it printed, no + # exception is set, etc). + # + # For allocating objects, use PyObject_{New, NewVar} instead whenever + # possible. The PyObject_{Malloc, Realloc, Free} family is exposed + # so that you can exploit Python's small-block allocator for non-object + # uses. If you must use these routines to allocate object memory, make sure + # the object gets initialized via PyObject_{Init, InitVar} after obtaining + # the raw memory. + + void* PyObject_Malloc(size_t size) + void* PyObject_Calloc(size_t nelem, size_t elsize) + void* PyObject_Realloc(void *ptr, size_t new_size) + void PyObject_Free(void *ptr) diff --git a/contrib/tools/cython/Cython/Includes/cpython/method.pxd b/contrib/tools/cython/Cython/Includes/cpython/method.pxd index 7866562605..f51ebcc7c7 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/method.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/method.pxd @@ -1,5 +1,5 @@ -from .object cimport PyObject - +from .object cimport PyObject + cdef extern from "Python.h": ############################################################################ # 7.5.4 Method Objects diff --git a/contrib/tools/cython/Cython/Includes/cpython/module.pxd b/contrib/tools/cython/Cython/Includes/cpython/module.pxd index d804eea5d1..8eb323b010 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/module.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/module.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": ctypedef struct _inittab @@ -6,7 +6,7 @@ cdef extern from "Python.h": ##################################################################### # 5.3 Importing Modules ##################################################################### - object PyImport_ImportModule(const char *name) + object PyImport_ImportModule(const char *name) # Return value: New reference. # This is a simplified interface to PyImport_ImportModuleEx() # below, leaving the globals and locals arguments set to @@ -20,7 +20,7 @@ cdef extern from "Python.h": # loaded.) Return a new reference to the imported module, or NULL # with an exception set on failure. - object PyImport_ImportModuleEx(const char *name, object globals, object locals, object fromlist) + object PyImport_ImportModuleEx(const char *name, object globals, object locals, object fromlist) # Return value: New reference. # Import a module. This is best described by referring to the @@ -64,7 +64,7 @@ cdef extern from "Python.h": # the reloaded module, or NULL with an exception set on failure # (the module still exists in this case). - PyObject* PyImport_AddModule(const char *name) except NULL + PyObject* PyImport_AddModule(const char *name) except NULL # Return value: Borrowed reference. # Return the module object corresponding to a module name. The # name argument may be of the form package.module. First check the @@ -145,7 +145,7 @@ cdef extern from "Python.h": bint PyModule_CheckExact(object p) # Return true if p is a module object, but not a subtype of PyModule_Type. - object PyModule_New(const char *name) + object PyModule_New(const char *name) # Return value: New reference. # Return a new module object with the __name__ attribute set to # name. Only the module's __doc__ and __name__ attributes are @@ -170,18 +170,18 @@ cdef extern from "Python.h": # module's __file__ attribute. If this is not defined, or if it is # not a string, raise SystemError and return NULL. - int PyModule_AddObject(object module, const char *name, object value) except -1 + int PyModule_AddObject(object module, const char *name, object value) except -1 # Add an object to module as name. This is a convenience function # which can be used from the module's initialization # function. This steals a reference to value. Return -1 on error, # 0 on success. - int PyModule_AddIntConstant(object module, const char *name, long value) except -1 + int PyModule_AddIntConstant(object module, const char *name, long value) except -1 # Add an integer constant to module as name. This convenience # function can be used from the module's initialization # function. Return -1 on error, 0 on success. - int PyModule_AddStringConstant(object module, const char *name, const char *value) except -1 + int PyModule_AddStringConstant(object module, const char *name, const char *value) except -1 # Add a string constant to module as name. This convenience # function can be used from the module's initialization # function. The string value must be null-terminated. Return -1 on diff --git a/contrib/tools/cython/Cython/Includes/cpython/number.pxd b/contrib/tools/cython/Cython/Includes/cpython/number.pxd index 4e926fc3c5..ded35c292a 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/number.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/number.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": diff --git a/contrib/tools/cython/Cython/Includes/cpython/object.pxd b/contrib/tools/cython/Cython/Includes/cpython/object.pxd index 891efb847f..5a81166393 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/object.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/object.pxd @@ -1,78 +1,78 @@ from libc.stdio cimport FILE -cimport cpython.type +cimport cpython.type cdef extern from "Python.h": - ctypedef struct PyObject # forward declaration - - ctypedef object (*newfunc)(cpython.type.type, object, object) # (type, args, kwargs) - - ctypedef object (*unaryfunc)(object) - ctypedef object (*binaryfunc)(object, object) - ctypedef object (*ternaryfunc)(object, object, object) + ctypedef struct PyObject # forward declaration + + ctypedef object (*newfunc)(cpython.type.type, object, object) # (type, args, kwargs) + + ctypedef object (*unaryfunc)(object) + ctypedef object (*binaryfunc)(object, object) + ctypedef object (*ternaryfunc)(object, object, object) ctypedef int (*inquiry)(object) except -1 ctypedef Py_ssize_t (*lenfunc)(object) except -1 - ctypedef object (*ssizeargfunc)(object, Py_ssize_t) - ctypedef object (*ssizessizeargfunc)(object, Py_ssize_t, Py_ssize_t) + ctypedef object (*ssizeargfunc)(object, Py_ssize_t) + ctypedef object (*ssizessizeargfunc)(object, Py_ssize_t, Py_ssize_t) ctypedef int (*ssizeobjargproc)(object, Py_ssize_t, object) except -1 ctypedef int (*ssizessizeobjargproc)(object, Py_ssize_t, Py_ssize_t, object) except -1 ctypedef int (*objobjargproc)(object, object, object) except -1 ctypedef int (*objobjproc)(object, object) except -1 - + ctypedef Py_hash_t (*hashfunc)(object) except -1 - ctypedef object (*reprfunc)(object) - + ctypedef object (*reprfunc)(object) + ctypedef int (*cmpfunc)(object, object) except -2 - ctypedef object (*richcmpfunc)(object, object, int) - - # The following functions use 'PyObject*' as first argument instead of 'object' to prevent - # accidental reference counting when calling them during a garbage collection run. - ctypedef void (*destructor)(PyObject*) + ctypedef object (*richcmpfunc)(object, object, int) + + # The following functions use 'PyObject*' as first argument instead of 'object' to prevent + # accidental reference counting when calling them during a garbage collection run. + ctypedef void (*destructor)(PyObject*) ctypedef int (*visitproc)(PyObject*, void *) except -1 ctypedef int (*traverseproc)(PyObject*, visitproc, void*) except -1 ctypedef void (*freefunc)(void*) - - ctypedef object (*descrgetfunc)(object, object, object) - ctypedef int (*descrsetfunc)(object, object, object) except -1 - - ctypedef struct PyTypeObject: - const char* tp_name - const char* tp_doc - Py_ssize_t tp_basicsize - Py_ssize_t tp_itemsize - Py_ssize_t tp_dictoffset - unsigned long tp_flags - - newfunc tp_new - destructor tp_dealloc - traverseproc tp_traverse - inquiry tp_clear + + ctypedef object (*descrgetfunc)(object, object, object) + ctypedef int (*descrsetfunc)(object, object, object) except -1 + + ctypedef struct PyTypeObject: + const char* tp_name + const char* tp_doc + Py_ssize_t tp_basicsize + Py_ssize_t tp_itemsize + Py_ssize_t tp_dictoffset + unsigned long tp_flags + + newfunc tp_new + destructor tp_dealloc + traverseproc tp_traverse + inquiry tp_clear freefunc tp_free - - ternaryfunc tp_call - hashfunc tp_hash - reprfunc tp_str - reprfunc tp_repr - - cmpfunc tp_compare - richcmpfunc tp_richcompare - - PyTypeObject* tp_base - PyObject* tp_dict - - descrgetfunc tp_descr_get - descrsetfunc tp_descr_set - - ctypedef struct PyObject: - Py_ssize_t ob_refcnt - PyTypeObject *ob_type - - cdef PyTypeObject *Py_TYPE(object) - - void* PyObject_Malloc(size_t) - void* PyObject_Realloc(void *, size_t) - void PyObject_Free(void *) - + + ternaryfunc tp_call + hashfunc tp_hash + reprfunc tp_str + reprfunc tp_repr + + cmpfunc tp_compare + richcmpfunc tp_richcompare + + PyTypeObject* tp_base + PyObject* tp_dict + + descrgetfunc tp_descr_get + descrsetfunc tp_descr_set + + ctypedef struct PyObject: + Py_ssize_t ob_refcnt + PyTypeObject *ob_type + + cdef PyTypeObject *Py_TYPE(object) + + void* PyObject_Malloc(size_t) + void* PyObject_Realloc(void *, size_t) + void PyObject_Free(void *) + ##################################################################### # 6.1 Object Protocol ##################################################################### @@ -82,12 +82,12 @@ cdef extern from "Python.h": # option currently supported is Py_PRINT_RAW; if given, the str() # of the object is written instead of the repr(). - bint PyObject_HasAttrString(object o, const char *attr_name) + bint PyObject_HasAttrString(object o, const char *attr_name) # Returns 1 if o has the attribute attr_name, and 0 # otherwise. This is equivalent to the Python expression # "hasattr(o, attr_name)". This function always succeeds. - object PyObject_GetAttrString(object o, const char *attr_name) + object PyObject_GetAttrString(object o, const char *attr_name) # Return value: New reference. Retrieve an attribute named # attr_name from object o. Returns the attribute value on success, # or NULL on failure. This is the equivalent of the Python @@ -106,7 +106,7 @@ cdef extern from "Python.h": object PyObject_GenericGetAttr(object o, object attr_name) - int PyObject_SetAttrString(object o, const char *attr_name, object v) except -1 + int PyObject_SetAttrString(object o, const char *attr_name, object v) except -1 # Set the value of the attribute named attr_name, for object o, to # the value v. Returns -1 on failure. This is the equivalent of # the Python statement "o.attr_name = v". @@ -118,7 +118,7 @@ cdef extern from "Python.h": int PyObject_GenericSetAttr(object o, object attr_name, object v) except -1 - int PyObject_DelAttrString(object o, const char *attr_name) except -1 + int PyObject_DelAttrString(object o, const char *attr_name) except -1 # Delete attribute named attr_name, for object o. Returns -1 on # failure. This is the equivalent of the Python statement: "del # o.attr_name". @@ -364,36 +364,36 @@ cdef extern from "Python.h": # Takes an arbitrary object and returns the result of calling # obj.__format__(format_spec). # Added in Py2.6 - - # Type flags (tp_flags of PyTypeObject) - long Py_TPFLAGS_HAVE_GETCHARBUFFER - long Py_TPFLAGS_HAVE_SEQUENCE_IN - long Py_TPFLAGS_HAVE_INPLACEOPS - long Py_TPFLAGS_CHECKTYPES - long Py_TPFLAGS_HAVE_RICHCOMPARE - long Py_TPFLAGS_HAVE_WEAKREFS - long Py_TPFLAGS_HAVE_ITER - long Py_TPFLAGS_HAVE_CLASS - long Py_TPFLAGS_HEAPTYPE - long Py_TPFLAGS_BASETYPE - long Py_TPFLAGS_READY - long Py_TPFLAGS_READYING - long Py_TPFLAGS_HAVE_GC - long Py_TPFLAGS_HAVE_STACKLESS_EXTENSION - long Py_TPFLAGS_HAVE_INDEX - long Py_TPFLAGS_HAVE_VERSION_TAG - long Py_TPFLAGS_VALID_VERSION_TAG - long Py_TPFLAGS_IS_ABSTRACT - long Py_TPFLAGS_HAVE_NEWBUFFER - long Py_TPFLAGS_INT_SUBCLASS - long Py_TPFLAGS_LONG_SUBCLASS - long Py_TPFLAGS_LIST_SUBCLASS - long Py_TPFLAGS_TUPLE_SUBCLASS - long Py_TPFLAGS_STRING_SUBCLASS - long Py_TPFLAGS_UNICODE_SUBCLASS - long Py_TPFLAGS_DICT_SUBCLASS - long Py_TPFLAGS_BASE_EXC_SUBCLASS - long Py_TPFLAGS_TYPE_SUBCLASS - long Py_TPFLAGS_DEFAULT_EXTERNAL - long Py_TPFLAGS_DEFAULT_CORE - long Py_TPFLAGS_DEFAULT + + # Type flags (tp_flags of PyTypeObject) + long Py_TPFLAGS_HAVE_GETCHARBUFFER + long Py_TPFLAGS_HAVE_SEQUENCE_IN + long Py_TPFLAGS_HAVE_INPLACEOPS + long Py_TPFLAGS_CHECKTYPES + long Py_TPFLAGS_HAVE_RICHCOMPARE + long Py_TPFLAGS_HAVE_WEAKREFS + long Py_TPFLAGS_HAVE_ITER + long Py_TPFLAGS_HAVE_CLASS + long Py_TPFLAGS_HEAPTYPE + long Py_TPFLAGS_BASETYPE + long Py_TPFLAGS_READY + long Py_TPFLAGS_READYING + long Py_TPFLAGS_HAVE_GC + long Py_TPFLAGS_HAVE_STACKLESS_EXTENSION + long Py_TPFLAGS_HAVE_INDEX + long Py_TPFLAGS_HAVE_VERSION_TAG + long Py_TPFLAGS_VALID_VERSION_TAG + long Py_TPFLAGS_IS_ABSTRACT + long Py_TPFLAGS_HAVE_NEWBUFFER + long Py_TPFLAGS_INT_SUBCLASS + long Py_TPFLAGS_LONG_SUBCLASS + long Py_TPFLAGS_LIST_SUBCLASS + long Py_TPFLAGS_TUPLE_SUBCLASS + long Py_TPFLAGS_STRING_SUBCLASS + long Py_TPFLAGS_UNICODE_SUBCLASS + long Py_TPFLAGS_DICT_SUBCLASS + long Py_TPFLAGS_BASE_EXC_SUBCLASS + long Py_TPFLAGS_TYPE_SUBCLASS + long Py_TPFLAGS_DEFAULT_EXTERNAL + long Py_TPFLAGS_DEFAULT_CORE + long Py_TPFLAGS_DEFAULT diff --git a/contrib/tools/cython/Cython/Includes/cpython/pylifecycle.pxd b/contrib/tools/cython/Cython/Includes/cpython/pylifecycle.pxd index 07f4edd397..2c71e37163 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/pylifecycle.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/pylifecycle.pxd @@ -1,68 +1,68 @@ -# Interfaces to configure, query, create & destroy the Python runtime - -from libc.stdio cimport FILE -from .pystate cimport PyThreadState - - -cdef extern from "Python.h": - ctypedef int wchar_t - - void Py_SetProgramName(wchar_t *) - wchar_t *Py_GetProgramName() - - void Py_SetPythonHome(wchar_t *) - wchar_t *Py_GetPythonHome() - - # Only used by applications that embed the interpreter and need to - # override the standard encoding determination mechanism - int Py_SetStandardStreamEncoding(const char *encoding, const char *errors) - - void Py_Initialize() - void Py_InitializeEx(int) - void _Py_InitializeEx_Private(int, int) - void Py_Finalize() - int Py_FinalizeEx() - int Py_IsInitialized() - PyThreadState *Py_NewInterpreter() - void Py_EndInterpreter(PyThreadState *) - - +# Interfaces to configure, query, create & destroy the Python runtime + +from libc.stdio cimport FILE +from .pystate cimport PyThreadState + + +cdef extern from "Python.h": + ctypedef int wchar_t + + void Py_SetProgramName(wchar_t *) + wchar_t *Py_GetProgramName() + + void Py_SetPythonHome(wchar_t *) + wchar_t *Py_GetPythonHome() + + # Only used by applications that embed the interpreter and need to + # override the standard encoding determination mechanism + int Py_SetStandardStreamEncoding(const char *encoding, const char *errors) + + void Py_Initialize() + void Py_InitializeEx(int) + void _Py_InitializeEx_Private(int, int) + void Py_Finalize() + int Py_FinalizeEx() + int Py_IsInitialized() + PyThreadState *Py_NewInterpreter() + void Py_EndInterpreter(PyThreadState *) + + # _Py_PyAtExit is for the atexit module, Py_AtExit is for low-level - # exit functions. + # exit functions. void _Py_PyAtExit(void (*func)(object), object) - int Py_AtExit(void (*func)()) - - void Py_Exit(int) - - # Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. - void _Py_RestoreSignals() - - int Py_FdIsInteractive(FILE *, const char *) - - # Bootstrap __main__ (defined in Modules/main.c) - int Py_Main(int argc, wchar_t **argv) - - # In getpath.c - wchar_t *Py_GetProgramFullPath() - wchar_t *Py_GetPrefix() - wchar_t *Py_GetExecPrefix() - wchar_t *Py_GetPath() - void Py_SetPath(const wchar_t *) - int _Py_CheckPython3() - - # In their own files - const char *Py_GetVersion() - const char *Py_GetPlatform() - const char *Py_GetCopyright() - const char *Py_GetCompiler() - const char *Py_GetBuildInfo() - const char *_Py_gitidentifier() - const char *_Py_gitversion() - - ctypedef void (*PyOS_sighandler_t)(int) - PyOS_sighandler_t PyOS_getsig(int) - PyOS_sighandler_t PyOS_setsig(int, PyOS_sighandler_t) - - # Random - int _PyOS_URandom(void *buffer, Py_ssize_t size) - int _PyOS_URandomNonblock(void *buffer, Py_ssize_t size) + int Py_AtExit(void (*func)()) + + void Py_Exit(int) + + # Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. + void _Py_RestoreSignals() + + int Py_FdIsInteractive(FILE *, const char *) + + # Bootstrap __main__ (defined in Modules/main.c) + int Py_Main(int argc, wchar_t **argv) + + # In getpath.c + wchar_t *Py_GetProgramFullPath() + wchar_t *Py_GetPrefix() + wchar_t *Py_GetExecPrefix() + wchar_t *Py_GetPath() + void Py_SetPath(const wchar_t *) + int _Py_CheckPython3() + + # In their own files + const char *Py_GetVersion() + const char *Py_GetPlatform() + const char *Py_GetCopyright() + const char *Py_GetCompiler() + const char *Py_GetBuildInfo() + const char *_Py_gitidentifier() + const char *_Py_gitversion() + + ctypedef void (*PyOS_sighandler_t)(int) + PyOS_sighandler_t PyOS_getsig(int) + PyOS_sighandler_t PyOS_setsig(int, PyOS_sighandler_t) + + # Random + int _PyOS_URandom(void *buffer, Py_ssize_t size) + int _PyOS_URandomNonblock(void *buffer, Py_ssize_t size) diff --git a/contrib/tools/cython/Cython/Includes/cpython/pystate.pxd b/contrib/tools/cython/Cython/Includes/cpython/pystate.pxd index 07dcfda048..1af6307931 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/pystate.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/pystate.pxd @@ -1,14 +1,14 @@ # Thread and interpreter state structures and their interfaces -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": - # We make these an opaque types. If the user wants specific attributes, + # We make these an opaque types. If the user wants specific attributes, # they can be declared manually. - ctypedef long PY_INT64_T # FIXME: Py2.7+, not defined here but used here - + ctypedef long PY_INT64_T # FIXME: Py2.7+, not defined here but used here + ctypedef struct PyInterpreterState: pass @@ -20,8 +20,8 @@ cdef extern from "Python.h": # This is not actually a struct, but make sure it can never be coerced to # an int or used in arithmetic expressions - ctypedef struct PyGILState_STATE: - pass + ctypedef struct PyGILState_STATE: + pass # The type of the trace function registered using PyEval_SetProfile() and # PyEval_SetTrace(). @@ -42,14 +42,14 @@ cdef extern from "Python.h": PyInterpreterState * PyInterpreterState_New() void PyInterpreterState_Clear(PyInterpreterState *) void PyInterpreterState_Delete(PyInterpreterState *) - PY_INT64_T PyInterpreterState_GetID(PyInterpreterState *) + PY_INT64_T PyInterpreterState_GetID(PyInterpreterState *) PyThreadState * PyThreadState_New(PyInterpreterState *) void PyThreadState_Clear(PyThreadState *) void PyThreadState_Delete(PyThreadState *) PyThreadState * PyThreadState_Get() - PyThreadState * PyThreadState_Swap(PyThreadState *) # NOTE: DO NOT USE IN CYTHON CODE ! + PyThreadState * PyThreadState_Swap(PyThreadState *) # NOTE: DO NOT USE IN CYTHON CODE ! PyObject * PyThreadState_GetDict() int PyThreadState_SetAsyncExc(long, PyObject *) diff --git a/contrib/tools/cython/Cython/Includes/cpython/ref.pxd b/contrib/tools/cython/Cython/Includes/cpython/ref.pxd index e586ad5b2b..4bc9a7d7c8 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/ref.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/ref.pxd @@ -1,5 +1,5 @@ -from .object cimport PyObject, PyTypeObject, Py_TYPE # legacy imports for re-export - +from .object cimport PyObject, PyTypeObject, Py_TYPE # legacy imports for re-export + cdef extern from "Python.h": ##################################################################### # 3. Reference Counts diff --git a/contrib/tools/cython/Cython/Includes/cpython/sequence.pxd b/contrib/tools/cython/Cython/Includes/cpython/sequence.pxd index 4550d1711b..eb279968d2 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/sequence.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/sequence.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": diff --git a/contrib/tools/cython/Cython/Includes/cpython/slice.pxd b/contrib/tools/cython/Cython/Includes/cpython/slice.pxd index a4b26f0c81..202dea716c 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/slice.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/slice.pxd @@ -1,50 +1,50 @@ -cdef extern from "Python.h": - - # PyTypeObject PySlice_Type - # - # The type object for slice objects. This is the same as slice and types.SliceType - - bint PySlice_Check(object ob) - # - # Return true if ob is a slice object; ob must not be NULL. - - slice PySlice_New(object start, object stop, object step) - # - # Return a new slice object with the given values. The start, stop, and step - # parameters are used as the values of the slice object attributes of the same - # names. Any of the values may be NULL, in which case the None will be used - # for the corresponding attribute. Return NULL if the new object could not be - # allocated. - - int PySlice_GetIndices(object slice, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step) except? -1 - # - # Retrieve the start, stop and step indices from the slice object slice, - # assuming a sequence of length length. Treats indices greater than length - # as errors. - # - # Returns 0 on success and -1 on error with no exception set (unless one - # of the indices was not None and failed to be converted to an integer, - # in which case -1 is returned with an exception set). - # - # You probably do not want to use this function. - # - # Changed in version 3.2: The parameter type for the slice parameter was - # PySliceObject* before. - - int PySlice_GetIndicesEx(object slice, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, - Py_ssize_t *slicelength) except -1 - # - # Usable replacement for PySlice_GetIndices(). Retrieve the start, stop, and step - # indices from the slice object slice assuming a sequence of length length, and - # store the length of the slice in slicelength. Out of bounds indices are clipped - # in a manner consistent with the handling of normal slices. - # - # Returns 0 on success and -1 on error with exception set. - # - # Changed in version 3.2: The parameter type for the slice parameter was - # PySliceObject* before. +cdef extern from "Python.h": + + # PyTypeObject PySlice_Type + # + # The type object for slice objects. This is the same as slice and types.SliceType + + bint PySlice_Check(object ob) + # + # Return true if ob is a slice object; ob must not be NULL. + + slice PySlice_New(object start, object stop, object step) + # + # Return a new slice object with the given values. The start, stop, and step + # parameters are used as the values of the slice object attributes of the same + # names. Any of the values may be NULL, in which case the None will be used + # for the corresponding attribute. Return NULL if the new object could not be + # allocated. + + int PySlice_GetIndices(object slice, Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step) except? -1 + # + # Retrieve the start, stop and step indices from the slice object slice, + # assuming a sequence of length length. Treats indices greater than length + # as errors. + # + # Returns 0 on success and -1 on error with no exception set (unless one + # of the indices was not None and failed to be converted to an integer, + # in which case -1 is returned with an exception set). + # + # You probably do not want to use this function. + # + # Changed in version 3.2: The parameter type for the slice parameter was + # PySliceObject* before. + + int PySlice_GetIndicesEx(object slice, Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, + Py_ssize_t *slicelength) except -1 + # + # Usable replacement for PySlice_GetIndices(). Retrieve the start, stop, and step + # indices from the slice object slice assuming a sequence of length length, and + # store the length of the slice in slicelength. Out of bounds indices are clipped + # in a manner consistent with the handling of normal slices. + # + # Returns 0 on success and -1 on error with exception set. + # + # Changed in version 3.2: The parameter type for the slice parameter was + # PySliceObject* before. int PySlice_Unpack(object slice, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step) except -1 diff --git a/contrib/tools/cython/Cython/Includes/cpython/string.pxd b/contrib/tools/cython/Cython/Includes/cpython/string.pxd index d0476f0fb2..8af78f3dde 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/string.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/string.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": ctypedef struct va_list diff --git a/contrib/tools/cython/Cython/Includes/cpython/tuple.pxd b/contrib/tools/cython/Cython/Includes/cpython/tuple.pxd index 7e30fc796c..09c46e0b4b 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/tuple.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/tuple.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": diff --git a/contrib/tools/cython/Cython/Includes/cpython/unicode.pxd b/contrib/tools/cython/Cython/Includes/cpython/unicode.pxd index a4b6a39b3c..ad01ed64df 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/unicode.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/unicode.pxd @@ -36,60 +36,60 @@ cdef extern from *: char* PyUnicode_AS_DATA(object o) # Return 1 or 0 depending on whether ch is a whitespace character. - bint Py_UNICODE_ISSPACE(Py_UCS4 ch) + bint Py_UNICODE_ISSPACE(Py_UCS4 ch) # Return 1 or 0 depending on whether ch is a lowercase character. - bint Py_UNICODE_ISLOWER(Py_UCS4 ch) + bint Py_UNICODE_ISLOWER(Py_UCS4 ch) # Return 1 or 0 depending on whether ch is an uppercase character. - bint Py_UNICODE_ISUPPER(Py_UCS4 ch) + bint Py_UNICODE_ISUPPER(Py_UCS4 ch) # Return 1 or 0 depending on whether ch is a titlecase character. - bint Py_UNICODE_ISTITLE(Py_UCS4 ch) + bint Py_UNICODE_ISTITLE(Py_UCS4 ch) # Return 1 or 0 depending on whether ch is a linebreak character. - bint Py_UNICODE_ISLINEBREAK(Py_UCS4 ch) + bint Py_UNICODE_ISLINEBREAK(Py_UCS4 ch) # Return 1 or 0 depending on whether ch is a decimal character. - bint Py_UNICODE_ISDECIMAL(Py_UCS4 ch) + bint Py_UNICODE_ISDECIMAL(Py_UCS4 ch) # Return 1 or 0 depending on whether ch is a digit character. - bint Py_UNICODE_ISDIGIT(Py_UCS4 ch) + bint Py_UNICODE_ISDIGIT(Py_UCS4 ch) # Return 1 or 0 depending on whether ch is a numeric character. - bint Py_UNICODE_ISNUMERIC(Py_UCS4 ch) + bint Py_UNICODE_ISNUMERIC(Py_UCS4 ch) # Return 1 or 0 depending on whether ch is an alphabetic character. - bint Py_UNICODE_ISALPHA(Py_UCS4 ch) + bint Py_UNICODE_ISALPHA(Py_UCS4 ch) # Return 1 or 0 depending on whether ch is an alphanumeric character. - bint Py_UNICODE_ISALNUM(Py_UCS4 ch) + bint Py_UNICODE_ISALNUM(Py_UCS4 ch) # Return the character ch converted to lower case. - # Used to return a Py_UNICODE value before Py3.3. - Py_UCS4 Py_UNICODE_TOLOWER(Py_UCS4 ch) + # Used to return a Py_UNICODE value before Py3.3. + Py_UCS4 Py_UNICODE_TOLOWER(Py_UCS4 ch) # Return the character ch converted to upper case. - # Used to return a Py_UNICODE value before Py3.3. - Py_UCS4 Py_UNICODE_TOUPPER(Py_UCS4 ch) + # Used to return a Py_UNICODE value before Py3.3. + Py_UCS4 Py_UNICODE_TOUPPER(Py_UCS4 ch) # Return the character ch converted to title case. - # Used to return a Py_UNICODE value before Py3.3. - Py_UCS4 Py_UNICODE_TOTITLE(Py_UCS4 ch) + # Used to return a Py_UNICODE value before Py3.3. + Py_UCS4 Py_UNICODE_TOTITLE(Py_UCS4 ch) # Return the character ch converted to a decimal positive # integer. Return -1 if this is not possible. This macro does not # raise exceptions. - int Py_UNICODE_TODECIMAL(Py_UCS4 ch) + int Py_UNICODE_TODECIMAL(Py_UCS4 ch) # Return the character ch converted to a single digit # integer. Return -1 if this is not possible. This macro does not # raise exceptions. - int Py_UNICODE_TODIGIT(Py_UCS4 ch) + int Py_UNICODE_TODIGIT(Py_UCS4 ch) # Return the character ch converted to a double. Return -1.0 if # this is not possible. This macro does not raise exceptions. - double Py_UNICODE_TONUMERIC(Py_UCS4 ch) + double Py_UNICODE_TONUMERIC(Py_UCS4 ch) # To create Unicode objects and access their basic sequence # properties, use these APIs: @@ -145,131 +145,131 @@ cdef extern from *: #Py_ssize_t PyUnicode_AsWideChar(object o, wchar_t *w, Py_ssize_t size) - -# Unicode Methods - - # Concat two strings giving a new Unicode string. - # Return value: New reference. - unicode PyUnicode_Concat(object left, object right) - - # Split a string giving a list of Unicode strings. If sep is NULL, - # splitting will be done at all whitespace substrings. Otherwise, - # splits occur at the given separator. At most maxsplit splits will - # be done. If negative, no limit is set. Separators are not included - # in the resulting list. - # Return value: New reference. - list PyUnicode_Split(object s, object sep, Py_ssize_t maxsplit) - - # Split a Unicode string at line breaks, returning a list of Unicode - # strings. CRLF is considered to be one line break. If keepend is 0, - # the Line break characters are not included in the resulting strings. - # Return value: New reference. - list PyUnicode_Splitlines(object s, bint keepend) - - # Translate a string by applying a character mapping table to it and - # return the resulting Unicode object. - # - # The mapping table must map Unicode ordinal integers to Unicode ordinal - # integers or None (causing deletion of the character). - # - # Mapping tables need only provide the __getitem__() interface; - # dictionaries and sequences work well. Unmapped character ordinals (ones - # which cause a LookupError) are left untouched and are copied as-is. - # - # errors has the usual meaning for codecs. It may be NULL which indicates - # to use the default error handling. - # Return value: New reference. - unicode PyUnicode_Translate(object str, object table, const char *errors) - - # Join a sequence of strings using the given separator and return the - # resulting Unicode string. - # Return value: New reference. - unicode PyUnicode_Join(object separator, object seq) - - # Return 1 if substr matches str[start:end] at the given tail end - # (direction == -1 means to do a prefix match, direction == 1 a - # suffix match), 0 otherwise. - # Return -1 if an error occurred. - Py_ssize_t PyUnicode_Tailmatch(object str, object substr, - Py_ssize_t start, Py_ssize_t end, int direction) except -1 - - # Return the first position of substr in str[start:end] using the given - # direction (direction == 1 means to do a forward search, direction == -1 - # a backward search). The return value is the index of the first match; - # a value of -1 indicates that no match was found, and -2 indicates that an - # error occurred and an exception has been set. - Py_ssize_t PyUnicode_Find(object str, object substr, Py_ssize_t start, Py_ssize_t end, int direction) except -2 - - # Return the first position of the character ch in str[start:end] using - # the given direction (direction == 1 means to do a forward search, - # direction == -1 a backward search). The return value is the index of - # the first match; a value of -1 indicates that no match was found, and - # -2 indicates that an error occurred and an exception has been set. - # New in version 3.3. - Py_ssize_t PyUnicode_FindChar(object str, Py_UCS4 ch, Py_ssize_t start, Py_ssize_t end, int direction) except -2 - - # Return the number of non-overlapping occurrences of substr in - # str[start:end]. Return -1 if an error occurred. - Py_ssize_t PyUnicode_Count(object str, object substr, Py_ssize_t start, Py_ssize_t end) except -1 - - # Replace at most maxcount occurrences of substr in str with replstr and - # return the resulting Unicode object. maxcount == -1 means replace all - # occurrences. - # Return value: New reference. - unicode PyUnicode_Replace(object str, object substr, object replstr, Py_ssize_t maxcount) - - # Compare two strings and return -1, 0, 1 for less than, - # equal, and greater than, respectively. - int PyUnicode_Compare(object left, object right) except? -1 - - # Compare a unicode object, uni, with string and return -1, 0, 1 for less than, - # equal, and greater than, respectively. It is best to pass only ASCII-encoded - # strings, but the function interprets the input string as ISO-8859-1 if it - # contains non-ASCII characters. + +# Unicode Methods + + # Concat two strings giving a new Unicode string. + # Return value: New reference. + unicode PyUnicode_Concat(object left, object right) + + # Split a string giving a list of Unicode strings. If sep is NULL, + # splitting will be done at all whitespace substrings. Otherwise, + # splits occur at the given separator. At most maxsplit splits will + # be done. If negative, no limit is set. Separators are not included + # in the resulting list. + # Return value: New reference. + list PyUnicode_Split(object s, object sep, Py_ssize_t maxsplit) + + # Split a Unicode string at line breaks, returning a list of Unicode + # strings. CRLF is considered to be one line break. If keepend is 0, + # the Line break characters are not included in the resulting strings. + # Return value: New reference. + list PyUnicode_Splitlines(object s, bint keepend) + + # Translate a string by applying a character mapping table to it and + # return the resulting Unicode object. + # + # The mapping table must map Unicode ordinal integers to Unicode ordinal + # integers or None (causing deletion of the character). + # + # Mapping tables need only provide the __getitem__() interface; + # dictionaries and sequences work well. Unmapped character ordinals (ones + # which cause a LookupError) are left untouched and are copied as-is. + # + # errors has the usual meaning for codecs. It may be NULL which indicates + # to use the default error handling. + # Return value: New reference. + unicode PyUnicode_Translate(object str, object table, const char *errors) + + # Join a sequence of strings using the given separator and return the + # resulting Unicode string. + # Return value: New reference. + unicode PyUnicode_Join(object separator, object seq) + + # Return 1 if substr matches str[start:end] at the given tail end + # (direction == -1 means to do a prefix match, direction == 1 a + # suffix match), 0 otherwise. + # Return -1 if an error occurred. + Py_ssize_t PyUnicode_Tailmatch(object str, object substr, + Py_ssize_t start, Py_ssize_t end, int direction) except -1 + + # Return the first position of substr in str[start:end] using the given + # direction (direction == 1 means to do a forward search, direction == -1 + # a backward search). The return value is the index of the first match; + # a value of -1 indicates that no match was found, and -2 indicates that an + # error occurred and an exception has been set. + Py_ssize_t PyUnicode_Find(object str, object substr, Py_ssize_t start, Py_ssize_t end, int direction) except -2 + + # Return the first position of the character ch in str[start:end] using + # the given direction (direction == 1 means to do a forward search, + # direction == -1 a backward search). The return value is the index of + # the first match; a value of -1 indicates that no match was found, and + # -2 indicates that an error occurred and an exception has been set. + # New in version 3.3. + Py_ssize_t PyUnicode_FindChar(object str, Py_UCS4 ch, Py_ssize_t start, Py_ssize_t end, int direction) except -2 + + # Return the number of non-overlapping occurrences of substr in + # str[start:end]. Return -1 if an error occurred. + Py_ssize_t PyUnicode_Count(object str, object substr, Py_ssize_t start, Py_ssize_t end) except -1 + + # Replace at most maxcount occurrences of substr in str with replstr and + # return the resulting Unicode object. maxcount == -1 means replace all + # occurrences. + # Return value: New reference. + unicode PyUnicode_Replace(object str, object substr, object replstr, Py_ssize_t maxcount) + + # Compare two strings and return -1, 0, 1 for less than, + # equal, and greater than, respectively. + int PyUnicode_Compare(object left, object right) except? -1 + + # Compare a unicode object, uni, with string and return -1, 0, 1 for less than, + # equal, and greater than, respectively. It is best to pass only ASCII-encoded + # strings, but the function interprets the input string as ISO-8859-1 if it + # contains non-ASCII characters. int PyUnicode_CompareWithASCIIString(object uni, const char *string) - - # Rich compare two unicode strings and return one of the following: - # - # NULL in case an exception was raised - # Py_True or Py_False for successful comparisons - # Py_NotImplemented in case the type combination is unknown - # - # Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in case - # the conversion of the arguments to Unicode fails with a UnicodeDecodeError. - # - # Possible values for op are Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, and Py_LE. - object PyUnicode_RichCompare(object left, object right, int op) - - # Return a new string object from format and args; this is analogous to - # format % args. - # Return value: New reference. - unicode PyUnicode_Format(object format, object args) - - # Check whether element is contained in container and return true or false - # accordingly. - # - # element has to coerce to a one element Unicode string. -1 is returned - # if there was an error. - int PyUnicode_Contains(object container, object element) except -1 - - # Intern the argument *string in place. The argument must be the address - # of a pointer variable pointing to a Python unicode string object. If - # there is an existing interned string that is the same as *string, it sets - # *string to it (decrementing the reference count of the old string object - # and incrementing the reference count of the interned string object), - # otherwise it leaves *string alone and interns it (incrementing its reference - # count). (Clarification: even though there is a lot of talk about reference - # counts, think of this function as reference-count-neutral; you own the object - # after the call if and only if you owned it before the call.) - #void PyUnicode_InternInPlace(PyObject **string) - - # A combination of PyUnicode_FromString() and PyUnicode_InternInPlace(), - # returning either a new unicode string object that has been interned, or - # a new ("owned") reference to an earlier interned string object with the - # same value. - unicode PyUnicode_InternFromString(const char *v) - - + + # Rich compare two unicode strings and return one of the following: + # + # NULL in case an exception was raised + # Py_True or Py_False for successful comparisons + # Py_NotImplemented in case the type combination is unknown + # + # Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in case + # the conversion of the arguments to Unicode fails with a UnicodeDecodeError. + # + # Possible values for op are Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, and Py_LE. + object PyUnicode_RichCompare(object left, object right, int op) + + # Return a new string object from format and args; this is analogous to + # format % args. + # Return value: New reference. + unicode PyUnicode_Format(object format, object args) + + # Check whether element is contained in container and return true or false + # accordingly. + # + # element has to coerce to a one element Unicode string. -1 is returned + # if there was an error. + int PyUnicode_Contains(object container, object element) except -1 + + # Intern the argument *string in place. The argument must be the address + # of a pointer variable pointing to a Python unicode string object. If + # there is an existing interned string that is the same as *string, it sets + # *string to it (decrementing the reference count of the old string object + # and incrementing the reference count of the interned string object), + # otherwise it leaves *string alone and interns it (incrementing its reference + # count). (Clarification: even though there is a lot of talk about reference + # counts, think of this function as reference-count-neutral; you own the object + # after the call if and only if you owned it before the call.) + #void PyUnicode_InternInPlace(PyObject **string) + + # A combination of PyUnicode_FromString() and PyUnicode_InternInPlace(), + # returning either a new unicode string object that has been interned, or + # a new ("owned") reference to an earlier interned string object with the + # same value. + unicode PyUnicode_InternFromString(const char *v) + + # Codecs # Create a Unicode object by decoding size bytes of the encoded @@ -300,22 +300,22 @@ cdef extern from *: # Create a Unicode object by decoding size bytes of the UTF-8 # encoded string s. Return NULL if an exception was raised by the # codec. - unicode PyUnicode_DecodeUTF8(char *s, Py_ssize_t size, char *errors) + unicode PyUnicode_DecodeUTF8(char *s, Py_ssize_t size, char *errors) # If consumed is NULL, behave like PyUnicode_DecodeUTF8(). If # consumed is not NULL, trailing incomplete UTF-8 byte sequences # will not be treated as an error. Those bytes will not be decoded # and the number of bytes that have been decoded will be stored in # consumed. New in version 2.4. - unicode PyUnicode_DecodeUTF8Stateful(char *s, Py_ssize_t size, char *errors, Py_ssize_t *consumed) + unicode PyUnicode_DecodeUTF8Stateful(char *s, Py_ssize_t size, char *errors, Py_ssize_t *consumed) # Encode the Py_UNICODE buffer of the given size using UTF-8 and # return a Python string object. Return NULL if an exception was # raised by the codec. - bytes PyUnicode_EncodeUTF8(Py_UNICODE *s, Py_ssize_t size, char *errors) + bytes PyUnicode_EncodeUTF8(Py_UNICODE *s, Py_ssize_t size, char *errors) # Encode a Unicode objects using UTF-8 and return the result as Python string object. Error handling is ``strict''. Return NULL if an exception was raised by the codec. - bytes PyUnicode_AsUTF8String(object unicode) + bytes PyUnicode_AsUTF8String(object unicode) # These are the UTF-16 codec APIs: @@ -337,7 +337,7 @@ cdef extern from *: # order at the. # # If byteorder is NULL, the codec starts in native order mode. - unicode PyUnicode_DecodeUTF16(char *s, Py_ssize_t size, char *errors, int *byteorder) + unicode PyUnicode_DecodeUTF16(char *s, Py_ssize_t size, char *errors, int *byteorder) # If consumed is NULL, behave like PyUnicode_DecodeUTF16(). If # consumed is not NULL, PyUnicode_DecodeUTF16Stateful() will not @@ -345,7 +345,7 @@ cdef extern from *: # number of bytes or a split surrogate pair) as an error. Those # bytes will not be decoded and the number of bytes that have been # decoded will be stored in consumed. New in version 2.4. - unicode PyUnicode_DecodeUTF16Stateful(char *s, Py_ssize_t size, char *errors, int *byteorder, Py_ssize_t *consumed) + unicode PyUnicode_DecodeUTF16Stateful(char *s, Py_ssize_t size, char *errors, int *byteorder, Py_ssize_t *consumed) # Return a Python string object holding the UTF-16 encoded value # of the Unicode data in s. If byteorder is not 0, output is @@ -362,13 +362,13 @@ cdef extern from *: # If Py_UNICODE_WIDE is defined, a single Py_UNICODE value may get # represented as a surrogate pair. If it is not defined, each # Py_UNICODE values is interpreted as an UCS-2 character. - bytes PyUnicode_EncodeUTF16(Py_UNICODE *s, Py_ssize_t size, char *errors, int byteorder) + bytes PyUnicode_EncodeUTF16(Py_UNICODE *s, Py_ssize_t size, char *errors, int byteorder) # Return a Python string using the UTF-16 encoding in native byte # order. The string always starts with a BOM mark. Error handling # is ``strict''. Return NULL if an exception was raised by the # codec. - bytes PyUnicode_AsUTF16String(object unicode) + bytes PyUnicode_AsUTF16String(object unicode) # These are the ``Unicode Escape'' codec APIs: @@ -409,17 +409,17 @@ cdef extern from *: # Create a Unicode object by decoding size bytes of the Latin-1 # encoded string s. Return NULL if an exception was raised by the # codec. - unicode PyUnicode_DecodeLatin1(char *s, Py_ssize_t size, char *errors) + unicode PyUnicode_DecodeLatin1(char *s, Py_ssize_t size, char *errors) # Encode the Py_UNICODE buffer of the given size using Latin-1 and - # return a Python bytes object. Return NULL if an exception was + # return a Python bytes object. Return NULL if an exception was # raised by the codec. - bytes PyUnicode_EncodeLatin1(Py_UNICODE *s, Py_ssize_t size, char *errors) + bytes PyUnicode_EncodeLatin1(Py_UNICODE *s, Py_ssize_t size, char *errors) # Encode a Unicode objects using Latin-1 and return the result as - # Python bytes object. Error handling is ``strict''. Return NULL + # Python bytes object. Error handling is ``strict''. Return NULL # if an exception was raised by the codec. - bytes PyUnicode_AsLatin1String(object unicode) + bytes PyUnicode_AsLatin1String(object unicode) # These are the ASCII codec APIs. Only 7-bit ASCII data is # accepted. All other codes generate errors. @@ -427,17 +427,17 @@ cdef extern from *: # Create a Unicode object by decoding size bytes of the ASCII # encoded string s. Return NULL if an exception was raised by the # codec. - unicode PyUnicode_DecodeASCII(char *s, Py_ssize_t size, char *errors) + unicode PyUnicode_DecodeASCII(char *s, Py_ssize_t size, char *errors) # Encode the Py_UNICODE buffer of the given size using ASCII and - # return a Python bytes object. Return NULL if an exception was + # return a Python bytes object. Return NULL if an exception was # raised by the codec. - bytes PyUnicode_EncodeASCII(Py_UNICODE *s, Py_ssize_t size, char *errors) + bytes PyUnicode_EncodeASCII(Py_UNICODE *s, Py_ssize_t size, char *errors) # Encode a Unicode objects using ASCII and return the result as - # Python bytes object. Error handling is ``strict''. Return NULL + # Python bytes object. Error handling is ``strict''. Return NULL # if an exception was raised by the codec. - bytes PyUnicode_AsASCIIString(object o) + bytes PyUnicode_AsASCIIString(object o) # These are the mapping codec APIs: # @@ -478,8 +478,8 @@ cdef extern from *: # Encode the Py_UNICODE buffer of the given size using the given # mapping object and return a Python string object. Return NULL if # an exception was raised by the codec. - # - # Deprecated since version 3.3, will be removed in version 4.0. + # + # Deprecated since version 3.3, will be removed in version 4.0. object PyUnicode_EncodeCharmap(Py_UNICODE *s, Py_ssize_t size, object mapping, char *errors) # Encode a Unicode objects using the given mapping object and @@ -500,8 +500,8 @@ cdef extern from *: # dictionaries and sequences work well. Unmapped character # ordinals (ones which cause a LookupError) are left untouched and # are copied as-is. - # - # Deprecated since version 3.3, will be removed in version 4.0. + # + # Deprecated since version 3.3, will be removed in version 4.0. object PyUnicode_TranslateCharmap(Py_UNICODE *s, Py_ssize_t size, object table, char *errors) @@ -514,43 +514,43 @@ cdef extern from *: # Create a Unicode object by decoding size bytes of the MBCS # encoded string s. Return NULL if an exception was raised by the # codec. - unicode PyUnicode_DecodeMBCS(char *s, Py_ssize_t size, char *errors) + unicode PyUnicode_DecodeMBCS(char *s, Py_ssize_t size, char *errors) # If consumed is NULL, behave like PyUnicode_DecodeMBCS(). If # consumed is not NULL, PyUnicode_DecodeMBCSStateful() will not # decode trailing lead byte and the number of bytes that have been # decoded will be stored in consumed. New in version 2.5. # NOTE: Python 2.x uses 'int' values for 'size' and 'consumed' (changed in 3.0) - unicode PyUnicode_DecodeMBCSStateful(char *s, Py_ssize_t size, char *errors, Py_ssize_t *consumed) + unicode PyUnicode_DecodeMBCSStateful(char *s, Py_ssize_t size, char *errors, Py_ssize_t *consumed) # Encode the Py_UNICODE buffer of the given size using MBCS and # return a Python string object. Return NULL if an exception was # raised by the codec. - bytes PyUnicode_EncodeMBCS(Py_UNICODE *s, Py_ssize_t size, char *errors) + bytes PyUnicode_EncodeMBCS(Py_UNICODE *s, Py_ssize_t size, char *errors) # Encode a Unicode objects using MBCS and return the result as # Python string object. Error handling is ``strict''. Return NULL # if an exception was raised by the codec. - bytes PyUnicode_AsMBCSString(object o) - - # Encode the Unicode object using the specified code page and return - # a Python bytes object. Return NULL if an exception was raised by the - # codec. Use CP_ACP code page to get the MBCS encoder. - # - # New in version 3.3. - bytes PyUnicode_EncodeCodePage(int code_page, object unicode, const char *errors) - - -# Py_UCS4 helpers (new in CPython 3.3) - - # These utility functions work on strings of Py_UCS4 characters and - # otherwise behave like the C standard library functions with the same name. - - size_t Py_UCS4_strlen(const Py_UCS4 *u) - Py_UCS4* Py_UCS4_strcpy(Py_UCS4 *s1, const Py_UCS4 *s2) - Py_UCS4* Py_UCS4_strncpy(Py_UCS4 *s1, const Py_UCS4 *s2, size_t n) - Py_UCS4* Py_UCS4_strcat(Py_UCS4 *s1, const Py_UCS4 *s2) - int Py_UCS4_strcmp(const Py_UCS4 *s1, const Py_UCS4 *s2) - int Py_UCS4_strncmp(const Py_UCS4 *s1, const Py_UCS4 *s2, size_t n) - Py_UCS4* Py_UCS4_strchr(const Py_UCS4 *s, Py_UCS4 c) - Py_UCS4* Py_UCS4_strrchr(const Py_UCS4 *s, Py_UCS4 c) + bytes PyUnicode_AsMBCSString(object o) + + # Encode the Unicode object using the specified code page and return + # a Python bytes object. Return NULL if an exception was raised by the + # codec. Use CP_ACP code page to get the MBCS encoder. + # + # New in version 3.3. + bytes PyUnicode_EncodeCodePage(int code_page, object unicode, const char *errors) + + +# Py_UCS4 helpers (new in CPython 3.3) + + # These utility functions work on strings of Py_UCS4 characters and + # otherwise behave like the C standard library functions with the same name. + + size_t Py_UCS4_strlen(const Py_UCS4 *u) + Py_UCS4* Py_UCS4_strcpy(Py_UCS4 *s1, const Py_UCS4 *s2) + Py_UCS4* Py_UCS4_strncpy(Py_UCS4 *s1, const Py_UCS4 *s2, size_t n) + Py_UCS4* Py_UCS4_strcat(Py_UCS4 *s1, const Py_UCS4 *s2) + int Py_UCS4_strcmp(const Py_UCS4 *s1, const Py_UCS4 *s2) + int Py_UCS4_strncmp(const Py_UCS4 *s1, const Py_UCS4 *s2, size_t n) + Py_UCS4* Py_UCS4_strchr(const Py_UCS4 *s, Py_UCS4 c) + Py_UCS4* Py_UCS4_strrchr(const Py_UCS4 *s, Py_UCS4 c) diff --git a/contrib/tools/cython/Cython/Includes/cpython/weakref.pxd b/contrib/tools/cython/Cython/Includes/cpython/weakref.pxd index de5a28027a..9c4b50f564 100644 --- a/contrib/tools/cython/Cython/Includes/cpython/weakref.pxd +++ b/contrib/tools/cython/Cython/Includes/cpython/weakref.pxd @@ -1,4 +1,4 @@ -from .object cimport PyObject +from .object cimport PyObject cdef extern from "Python.h": diff --git a/contrib/tools/cython/Cython/Includes/libc/errno.pxd b/contrib/tools/cython/Cython/Includes/libc/errno.pxd index a4d0b6951a..191d47b3dc 100644 --- a/contrib/tools/cython/Cython/Includes/libc/errno.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/errno.pxd @@ -1,6 +1,6 @@ # 7.5 Errors <errno.h> -cdef extern from "<errno.h>" nogil: +cdef extern from "<errno.h>" nogil: enum: EPERM ENOENT @@ -61,7 +61,7 @@ cdef extern from "<errno.h>" nogil: EBFONT ENOSTR ENODATA - ENOATTR + ENOATTR ETIME ENOSR ENONET diff --git a/contrib/tools/cython/Cython/Includes/libc/float.pxd b/contrib/tools/cython/Cython/Includes/libc/float.pxd index ce1150d6ca..5e4e12d4f4 100644 --- a/contrib/tools/cython/Cython/Includes/libc/float.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/float.pxd @@ -1,43 +1,43 @@ # 5.2.4.2.2 Characteristics of floating types <float.h> -cdef extern from "<float.h>": +cdef extern from "<float.h>": - const float FLT_RADIX + const float FLT_RADIX - const float FLT_MANT_DIG - const double DBL_MANT_DIG - const long double LDBL_MANT_DIG + const float FLT_MANT_DIG + const double DBL_MANT_DIG + const long double LDBL_MANT_DIG - const double DECIMAL_DIG + const double DECIMAL_DIG - const float FLT_DIG - const double DBL_DIG - const long double LDBL_DIG + const float FLT_DIG + const double DBL_DIG + const long double LDBL_DIG - const float FLT_MIN_EXP - const double DBL_MIN_EXP - const long double LDBL_MIN_EXP + const float FLT_MIN_EXP + const double DBL_MIN_EXP + const long double LDBL_MIN_EXP - const float FLT_MIN_10_EXP - const double DBL_MIN_10_EXP - const long double LDBL_MIN_10_EXP + const float FLT_MIN_10_EXP + const double DBL_MIN_10_EXP + const long double LDBL_MIN_10_EXP - const float FLT_MAX_EXP - const double DBL_MAX_EXP - const long double LDBL_MAX_EXP + const float FLT_MAX_EXP + const double DBL_MAX_EXP + const long double LDBL_MAX_EXP - const float FLT_MAX_10_EXP - const double DBL_MAX_10_EXP - const long double LDBL_MAX_10_EXP + const float FLT_MAX_10_EXP + const double DBL_MAX_10_EXP + const long double LDBL_MAX_10_EXP - const float FLT_MAX - const double DBL_MAX - const long double LDBL_MAX + const float FLT_MAX + const double DBL_MAX + const long double LDBL_MAX - const float FLT_EPSILON - const double DBL_EPSILON - const long double LDBL_EPSILON + const float FLT_EPSILON + const double DBL_EPSILON + const long double LDBL_EPSILON - const float FLT_MIN - const double DBL_MIN - const long double LDBL_MIN + const float FLT_MIN + const double DBL_MIN + const long double LDBL_MIN diff --git a/contrib/tools/cython/Cython/Includes/libc/limits.pxd b/contrib/tools/cython/Cython/Includes/libc/limits.pxd index ed035e91fc..39d10a1ff9 100644 --- a/contrib/tools/cython/Cython/Includes/libc/limits.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/limits.pxd @@ -1,6 +1,6 @@ # 5.2.4.2.1 Sizes of integer types <limits.h> -cdef extern from "<limits.h>": +cdef extern from "<limits.h>": const int CHAR_BIT const int MB_LEN_MAX diff --git a/contrib/tools/cython/Cython/Includes/libc/locale.pxd b/contrib/tools/cython/Cython/Includes/libc/locale.pxd index 56af447e4d..5cbec953ef 100644 --- a/contrib/tools/cython/Cython/Includes/libc/locale.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/locale.pxd @@ -4,7 +4,7 @@ from libc.string cimport const_char -cdef extern from "<locale.h>" nogil: +cdef extern from "<locale.h>" nogil: struct lconv: char *decimal_point diff --git a/contrib/tools/cython/Cython/Includes/libc/math.pxd b/contrib/tools/cython/Cython/Includes/libc/math.pxd index ef9ef1a916..b002670b22 100644 --- a/contrib/tools/cython/Cython/Includes/libc/math.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/math.pxd @@ -1,27 +1,27 @@ -cdef extern from "<math.h>" nogil: - const double M_E - const double e "M_E" # as in Python's math module - const double M_LOG2E - const double M_LOG10E - const double M_LN2 - const double M_LN10 - const double M_PI - const double pi "M_PI" # as in Python's math module - const double M_PI_2 - const double M_PI_4 - const double M_1_PI - const double M_2_PI - const double M_2_SQRTPI - const double M_SQRT2 - const double M_SQRT1_2 +cdef extern from "<math.h>" nogil: + const double M_E + const double e "M_E" # as in Python's math module + const double M_LOG2E + const double M_LOG10E + const double M_LN2 + const double M_LN10 + const double M_PI + const double pi "M_PI" # as in Python's math module + const double M_PI_2 + const double M_PI_4 + const double M_1_PI + const double M_2_PI + const double M_2_SQRTPI + const double M_SQRT2 + const double M_SQRT1_2 # C99 constants - const float INFINITY - const float NAN - # note: not providing "nan" and "inf" aliases here as nan() is a function in C - const double HUGE_VAL - const float HUGE_VALF - const long double HUGE_VALL + const float INFINITY + const float NAN + # note: not providing "nan" and "inf" aliases here as nan() is a function in C + const double HUGE_VAL + const float HUGE_VALF + const long double HUGE_VALL double acos(double x) double asin(double x) @@ -91,19 +91,19 @@ cdef extern from "<math.h>" nogil: long double erfcl(long double) double fdim(double x, double y) - double fma(double x, double y, double z) + double fma(double x, double y, double z) double fmax(double x, double y) double fmin(double x, double y) double scalbln(double x, long n) double scalbn(double x, int n) double nan(const char*) - - int isinf(long double) # -1 / 0 / 1 + + int isinf(long double) # -1 / 0 / 1 bint isfinite(long double) - bint isnan(long double) + bint isnan(long double) bint isnormal(long double) - bint signbit(long double) + bint signbit(long double) int fpclassify(long double) const int FP_NAN const int FP_INFINITE diff --git a/contrib/tools/cython/Cython/Includes/libc/setjmp.pxd b/contrib/tools/cython/Cython/Includes/libc/setjmp.pxd index 9e8d47778a..6c11a534d4 100644 --- a/contrib/tools/cython/Cython/Includes/libc/setjmp.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/setjmp.pxd @@ -1,10 +1,10 @@ -cdef extern from "<setjmp.h>" nogil: +cdef extern from "<setjmp.h>" nogil: ctypedef struct jmp_buf: pass int setjmp(jmp_buf state) void longjmp(jmp_buf state, int value) - - ctypedef struct sigjmp_buf: - pass - int sigsetjmp(sigjmp_buf state, int savesigs) - void siglongjmp(sigjmp_buf state, int value) + + ctypedef struct sigjmp_buf: + pass + int sigsetjmp(sigjmp_buf state, int savesigs) + void siglongjmp(sigjmp_buf state, int value) diff --git a/contrib/tools/cython/Cython/Includes/libc/signal.pxd b/contrib/tools/cython/Cython/Includes/libc/signal.pxd index d515ad007e..5d34935543 100644 --- a/contrib/tools/cython/Cython/Includes/libc/signal.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/signal.pxd @@ -2,7 +2,7 @@ ctypedef void (*sighandler_t)(int SIGNUM) nogil -cdef extern from "<signal.h>" nogil: +cdef extern from "<signal.h>" nogil: ctypedef int sig_atomic_t diff --git a/contrib/tools/cython/Cython/Includes/libc/stddef.pxd b/contrib/tools/cython/Cython/Includes/libc/stddef.pxd index 61c1e4cc56..9b0f4c5fd2 100644 --- a/contrib/tools/cython/Cython/Includes/libc/stddef.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/stddef.pxd @@ -1,6 +1,6 @@ # 7.17 Common definitions <stddef.h> -cdef extern from "<stddef.h>": +cdef extern from "<stddef.h>": ctypedef signed int ptrdiff_t diff --git a/contrib/tools/cython/Cython/Includes/libc/stdint.pxd b/contrib/tools/cython/Cython/Includes/libc/stdint.pxd index 6140d6e712..ced3d46add 100644 --- a/contrib/tools/cython/Cython/Includes/libc/stdint.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/stdint.pxd @@ -2,7 +2,7 @@ # Actual compile time size used for conversions. # 7.18 Integer types <stdint.h> -cdef extern from "<stdint.h>" nogil: +cdef extern from "<stdint.h>" nogil: # 7.18.1 Integer types # 7.18.1.1 Exact-width integer types @@ -13,7 +13,7 @@ cdef extern from "<stdint.h>" nogil: ctypedef unsigned char uint8_t ctypedef unsigned short uint16_t ctypedef unsigned int uint32_t - ctypedef unsigned long long uint64_t + ctypedef unsigned long long uint64_t # 7.18.1.2 Minimum-width integer types ctypedef signed char int_least8_t ctypedef signed short int_least16_t @@ -22,7 +22,7 @@ cdef extern from "<stdint.h>" nogil: ctypedef unsigned char uint_least8_t ctypedef unsigned short uint_least16_t ctypedef unsigned int uint_least32_t - ctypedef unsigned long long uint_least64_t + ctypedef unsigned long long uint_least64_t # 7.18.1.3 Fastest minimum-width integer types ctypedef signed char int_fast8_t ctypedef signed short int_fast16_t @@ -31,7 +31,7 @@ cdef extern from "<stdint.h>" nogil: ctypedef unsigned char uint_fast8_t ctypedef unsigned short uint_fast16_t ctypedef unsigned int uint_fast32_t - ctypedef unsigned long long uint_fast64_t + ctypedef unsigned long long uint_fast64_t # 7.18.1.4 Integer types capable of holding object pointers ctypedef ssize_t intptr_t ctypedef size_t uintptr_t diff --git a/contrib/tools/cython/Cython/Includes/libc/stdio.pxd b/contrib/tools/cython/Cython/Includes/libc/stdio.pxd index f77418923b..1644a5a0ab 100644 --- a/contrib/tools/cython/Cython/Includes/libc/stdio.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/stdio.pxd @@ -5,7 +5,7 @@ from libc.string cimport const_char, const_void -cdef extern from "<stdio.h>" nogil: +cdef extern from "<stdio.h>" nogil: ctypedef struct FILE cdef FILE *stdin diff --git a/contrib/tools/cython/Cython/Includes/libc/stdlib.pxd b/contrib/tools/cython/Cython/Includes/libc/stdlib.pxd index 24d14a46a9..e6fac821c7 100644 --- a/contrib/tools/cython/Cython/Includes/libc/stdlib.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/stdlib.pxd @@ -4,7 +4,7 @@ from libc.string cimport const_char, const_void -cdef extern from "<stdlib.h>" nogil: +cdef extern from "<stdlib.h>" nogil: # 7.20.1 Numeric conversion functions int atoi (const char *string) diff --git a/contrib/tools/cython/Cython/Includes/libc/string.pxd b/contrib/tools/cython/Cython/Includes/libc/string.pxd index af1b9bf8a3..e6d96183f2 100644 --- a/contrib/tools/cython/Cython/Includes/libc/string.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/string.pxd @@ -7,7 +7,7 @@ cdef extern from *: ctypedef const unsigned char const_uchar "const unsigned char" ctypedef const void const_void "const void" -cdef extern from "<string.h>" nogil: +cdef extern from "<string.h>" nogil: void *memcpy (void *pto, const void *pfrom, size_t size) void *memmove (void *pto, const void *pfrom, size_t size) diff --git a/contrib/tools/cython/Cython/Includes/libc/time.pxd b/contrib/tools/cython/Cython/Includes/libc/time.pxd index 7c7ea4a987..3aa15a2eee 100644 --- a/contrib/tools/cython/Cython/Includes/libc/time.pxd +++ b/contrib/tools/cython/Cython/Includes/libc/time.pxd @@ -1,46 +1,46 @@ -# http://en.wikipedia.org/wiki/C_date_and_time_functions - -from libc.stddef cimport wchar_t - -cdef extern from "<time.h>" nogil: - ctypedef long clock_t - ctypedef long time_t - - enum: CLOCKS_PER_SEC - clock_t clock() # CPU time - time_t time(time_t *) # wall clock time since Unix epoch - - cdef struct tm: - int tm_sec - int tm_min - int tm_hour - int tm_mday - int tm_mon - int tm_year - int tm_wday - int tm_yday - int tm_isdst - char *tm_zone - long tm_gmtoff - - int daylight # global state - long timezone - char *tzname[2] - void tzset() - - char *asctime(const tm *) - char *asctime_r(const tm *, char *) - char *ctime(const time_t *) - char *ctime_r(const time_t *, char *) - double difftime(time_t, time_t) - tm *getdate(const char *) - tm *gmtime(const time_t *) - tm *gmtime_r(const time_t *, tm *) - tm *localtime(const time_t *) - tm *localtime_r(const time_t *, tm *) - time_t mktime(tm *) - size_t strftime(char *, size_t, const char *, const tm *) - size_t wcsftime(wchar_t *str, size_t cnt, const wchar_t *fmt, tm *time) - - # POSIX not stdC - char *strptime(const char *, const char *, tm *) +# http://en.wikipedia.org/wiki/C_date_and_time_functions + +from libc.stddef cimport wchar_t + +cdef extern from "<time.h>" nogil: + ctypedef long clock_t + ctypedef long time_t + + enum: CLOCKS_PER_SEC + clock_t clock() # CPU time + time_t time(time_t *) # wall clock time since Unix epoch + + cdef struct tm: + int tm_sec + int tm_min + int tm_hour + int tm_mday + int tm_mon + int tm_year + int tm_wday + int tm_yday + int tm_isdst + char *tm_zone + long tm_gmtoff + + int daylight # global state + long timezone + char *tzname[2] + void tzset() + + char *asctime(const tm *) + char *asctime_r(const tm *, char *) + char *ctime(const time_t *) + char *ctime_r(const time_t *, char *) + double difftime(time_t, time_t) + tm *getdate(const char *) + tm *gmtime(const time_t *) + tm *gmtime_r(const time_t *, tm *) + tm *localtime(const time_t *) + tm *localtime_r(const time_t *, tm *) + time_t mktime(tm *) + size_t strftime(char *, size_t, const char *, const tm *) + size_t wcsftime(wchar_t *str, size_t cnt, const wchar_t *fmt, tm *time) + + # POSIX not stdC + char *strptime(const char *, const char *, tm *) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/__init__.pxd b/contrib/tools/cython/Cython/Includes/libcpp/__init__.pxd index 842d72d1f2..111ea25c2f 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/__init__.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/__init__.pxd @@ -1,4 +1,4 @@ cdef extern from *: ctypedef bint bool - ctypedef void* nullptr_t - nullptr_t nullptr + ctypedef void* nullptr_t + nullptr_t nullptr diff --git a/contrib/tools/cython/Cython/Includes/libcpp/algorithm.pxd b/contrib/tools/cython/Cython/Includes/libcpp/algorithm.pxd index 7acc1b3b64..ec7c3835b4 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/algorithm.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/algorithm.pxd @@ -1,12 +1,12 @@ -from libcpp cimport bool - - +from libcpp cimport bool + + cdef extern from "<algorithm>" namespace "std" nogil: - # Sorting and searching - bool binary_search[Iter, T](Iter first, Iter last, const T& value) - bool binary_search[Iter, T, Compare](Iter first, Iter last, const T& value, - Compare comp) - + # Sorting and searching + bool binary_search[Iter, T](Iter first, Iter last, const T& value) + bool binary_search[Iter, T, Compare](Iter first, Iter last, const T& value, + Compare comp) + Iter lower_bound[Iter, T](Iter first, Iter last, const T& value) Iter lower_bound[Iter, T, Compare](Iter first, Iter last, const T& value, Compare comp) @@ -15,18 +15,18 @@ cdef extern from "<algorithm>" namespace "std" nogil: Iter upper_bound[Iter, T, Compare](Iter first, Iter last, const T& value, Compare comp) - void partial_sort[Iter](Iter first, Iter middle, Iter last) - void partial_sort[Iter, Compare](Iter first, Iter middle, Iter last, - Compare comp) - - void sort[Iter](Iter first, Iter last) - void sort[Iter, Compare](Iter first, Iter last, Compare comp) - + void partial_sort[Iter](Iter first, Iter middle, Iter last) + void partial_sort[Iter, Compare](Iter first, Iter middle, Iter last, + Compare comp) + + void sort[Iter](Iter first, Iter last) + void sort[Iter, Compare](Iter first, Iter last, Compare comp) + # Removing duplicates Iter unique[Iter](Iter first, Iter last) Iter unique[Iter, BinaryPredicate](Iter first, Iter last, BinaryPredicate p) - # Binary heaps (priority queues) + # Binary heaps (priority queues) void make_heap[Iter](Iter first, Iter last) void make_heap[Iter, Compare](Iter first, Iter last, Compare comp) @@ -38,6 +38,6 @@ cdef extern from "<algorithm>" namespace "std" nogil: void sort_heap[Iter](Iter first, Iter last) void sort_heap[Iter, Compare](Iter first, Iter last, Compare comp) - - # Copy - OutputIter copy[InputIter,OutputIter](InputIter,InputIter,OutputIter) + + # Copy + OutputIter copy[InputIter,OutputIter](InputIter,InputIter,OutputIter) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/cast.pxd b/contrib/tools/cython/Cython/Includes/libcpp/cast.pxd index b9b2e73ee5..c3a4d8978f 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/cast.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/cast.pxd @@ -5,7 +5,7 @@ # than the standard C cast operator which can be written "<T>(expression)" in # Cython. -cdef extern from * nogil: +cdef extern from * nogil: cdef T dynamic_cast[T](void *) except + # nullptr may also indicate failure cdef T static_cast[T](void *) cdef T reinterpret_cast[T](void *) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/complex.pxd b/contrib/tools/cython/Cython/Includes/libcpp/complex.pxd index 2c912e5f3a..c875d5e5bd 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/complex.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/complex.pxd @@ -39,63 +39,63 @@ cdef extern from "<complex>" namespace "std" nogil: void imag(T) # Return real part - T real[T](complex[T]&) + T real[T](complex[T]&) long double real(long double) double real(double) float real(float) # Return imaginary part - T imag[T](complex[T]&) + T imag[T](complex[T]&) long double imag(long double) double imag(double) float imag(float) - T abs[T](complex[T]&) - T arg[T](complex[T]&) + T abs[T](complex[T]&) + T arg[T](complex[T]&) long double arg(long double) double arg(double) float arg(float) - T norm[T](complex[T]) + T norm[T](complex[T]) long double norm(long double) double norm(double) float norm(float) - complex[T] conj[T](complex[T]&) + complex[T] conj[T](complex[T]&) complex[long double] conj(long double) complex[double] conj(double) complex[float] conj(float) - complex[T] proj[T](complex[T]) + complex[T] proj[T](complex[T]) complex[long double] proj(long double) complex[double] proj(double) complex[float] proj(float) - complex[T] polar[T](T&, T&) - complex[T] ploar[T](T&) + complex[T] polar[T](T&, T&) + complex[T] ploar[T](T&) - complex[T] exp[T](complex[T]&) - complex[T] log[T](complex[T]&) - complex[T] log10[T](complex[T]&) + complex[T] exp[T](complex[T]&) + complex[T] log[T](complex[T]&) + complex[T] log10[T](complex[T]&) - complex[T] pow[T](complex[T]&, complex[T]&) - complex[T] pow[T](complex[T]&, T&) - complex[T] pow[T](T&, complex[T]&) + complex[T] pow[T](complex[T]&, complex[T]&) + complex[T] pow[T](complex[T]&, T&) + complex[T] pow[T](T&, complex[T]&) # There are some promotion versions too - complex[T] sqrt[T](complex[T]&) + complex[T] sqrt[T](complex[T]&) - complex[T] sin[T](complex[T]&) - complex[T] cos[T](complex[T]&) - complex[T] tan[T](complex[T]&) - complex[T] asin[T](complex[T]&) - complex[T] acos[T](complex[T]&) - complex[T] atan[T](complex[T]&) + complex[T] sin[T](complex[T]&) + complex[T] cos[T](complex[T]&) + complex[T] tan[T](complex[T]&) + complex[T] asin[T](complex[T]&) + complex[T] acos[T](complex[T]&) + complex[T] atan[T](complex[T]&) - complex[T] sinh[T](complex[T]&) - complex[T] cosh[T](complex[T]&) - complex[T] tanh[T](complex[T]&) + complex[T] sinh[T](complex[T]&) + complex[T] cosh[T](complex[T]&) + complex[T] tanh[T](complex[T]&) - complex[T] asinh[T](complex[T]&) - complex[T] acosh[T](complex[T]&) - complex[T] atanh[T](complex[T]&) + complex[T] asinh[T](complex[T]&) + complex[T] acosh[T](complex[T]&) + complex[T] atanh[T](complex[T]&) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/deque.pxd b/contrib/tools/cython/Cython/Includes/libcpp/deque.pxd index 9b5ba89ae3..9e2b2291d0 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/deque.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/deque.pxd @@ -1,11 +1,11 @@ cdef extern from "<deque>" namespace "std" nogil: - cdef cppclass deque[T,ALLOCATOR=*]: + cdef cppclass deque[T,ALLOCATOR=*]: ctypedef T value_type ctypedef ALLOCATOR allocator_type # these should really be allocator_type.size_type and # allocator_type.difference_type to be true to the C++ definition - # but cython doesn't support deferred access on template arguments + # but cython doesn't support deferred access on template arguments ctypedef size_t size_type ctypedef ptrdiff_t difference_type @@ -35,8 +35,8 @@ cdef extern from "<deque>" namespace "std" nogil: bint operator>(reverse_iterator) bint operator<=(reverse_iterator) bint operator>=(reverse_iterator) - cppclass const_iterator(iterator): - pass + cppclass const_iterator(iterator): + pass cppclass const_reverse_iterator(reverse_iterator): pass deque() except + @@ -57,11 +57,11 @@ cdef extern from "<deque>" namespace "std" nogil: T& at(size_t) T& back() iterator begin() - const_iterator const_begin "begin"() + const_iterator const_begin "begin"() void clear() bint empty() iterator end() - const_iterator const_end "end"() + const_iterator const_end "end"() iterator erase(iterator) iterator erase(iterator, iterator) T& front() @@ -81,6 +81,6 @@ cdef extern from "<deque>" namespace "std" nogil: void resize(size_t, T&) size_t size() void swap(deque&) - - # C++11 methods - void shrink_to_fit() + + # C++11 methods + void shrink_to_fit() diff --git a/contrib/tools/cython/Cython/Includes/libcpp/forward_list.pxd b/contrib/tools/cython/Cython/Includes/libcpp/forward_list.pxd index b8c7ba19c2..8c3b240d04 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/forward_list.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/forward_list.pxd @@ -1,62 +1,62 @@ -cdef extern from "<forward_list>" namespace "std" nogil: - cdef cppclass forward_list[T,ALLOCATOR=*]: - ctypedef T value_type - ctypedef ALLOCATOR allocator_type - - # these should really be allocator_type.size_type and - # allocator_type.difference_type to be true to the C++ definition - # but cython doesn't support deferred access on template arguments - ctypedef size_t size_type - ctypedef ptrdiff_t difference_type - - cppclass iterator: - iterator() - iterator(iterator &) - T& operator*() - iterator operator++() - bint operator==(iterator) - bint operator!=(iterator) - cppclass const_iterator(iterator): - pass - forward_list() except + - forward_list(forward_list&) except + - forward_list(size_t, T&) except + - #forward_list& operator=(forward_list&) - bint operator==(forward_list&, forward_list&) - bint operator!=(forward_list&, forward_list&) - bint operator<(forward_list&, forward_list&) - bint operator>(forward_list&, forward_list&) - bint operator<=(forward_list&, forward_list&) - bint operator>=(forward_list&, forward_list&) - void assign(size_t, T&) - T& front() - iterator before_begin() - const_iterator const_before_begin "before_begin"() - iterator begin() - const_iterator const_begin "begin"() - iterator end() - const_iterator const_end "end"() - bint empty() - size_t max_size() - void clear() - iterator insert_after(iterator, T&) - void insert_after(iterator, size_t, T&) - iterator erase_after(iterator) - iterator erase_after(iterator, iterator) - void push_front(T&) - void pop_front() - void resize(size_t) - void resize(size_t, T&) - void swap(forward_list&) - void merge(forward_list&) - void merge[Compare](forward_list&, Compare) - void splice_after(iterator, forward_list&) - void splice_after(iterator, forward_list&, iterator) - void splice_after(iterator, forward_list&, iterator, iterator) - void remove(const T&) - void remove_if[Predicate](Predicate) - void reverse() - void unique() - void unique[Predicate](Predicate) - void sort() - void sort[Compare](Compare) +cdef extern from "<forward_list>" namespace "std" nogil: + cdef cppclass forward_list[T,ALLOCATOR=*]: + ctypedef T value_type + ctypedef ALLOCATOR allocator_type + + # these should really be allocator_type.size_type and + # allocator_type.difference_type to be true to the C++ definition + # but cython doesn't support deferred access on template arguments + ctypedef size_t size_type + ctypedef ptrdiff_t difference_type + + cppclass iterator: + iterator() + iterator(iterator &) + T& operator*() + iterator operator++() + bint operator==(iterator) + bint operator!=(iterator) + cppclass const_iterator(iterator): + pass + forward_list() except + + forward_list(forward_list&) except + + forward_list(size_t, T&) except + + #forward_list& operator=(forward_list&) + bint operator==(forward_list&, forward_list&) + bint operator!=(forward_list&, forward_list&) + bint operator<(forward_list&, forward_list&) + bint operator>(forward_list&, forward_list&) + bint operator<=(forward_list&, forward_list&) + bint operator>=(forward_list&, forward_list&) + void assign(size_t, T&) + T& front() + iterator before_begin() + const_iterator const_before_begin "before_begin"() + iterator begin() + const_iterator const_begin "begin"() + iterator end() + const_iterator const_end "end"() + bint empty() + size_t max_size() + void clear() + iterator insert_after(iterator, T&) + void insert_after(iterator, size_t, T&) + iterator erase_after(iterator) + iterator erase_after(iterator, iterator) + void push_front(T&) + void pop_front() + void resize(size_t) + void resize(size_t, T&) + void swap(forward_list&) + void merge(forward_list&) + void merge[Compare](forward_list&, Compare) + void splice_after(iterator, forward_list&) + void splice_after(iterator, forward_list&, iterator) + void splice_after(iterator, forward_list&, iterator, iterator) + void remove(const T&) + void remove_if[Predicate](Predicate) + void reverse() + void unique() + void unique[Predicate](Predicate) + void sort() + void sort[Compare](Compare) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/iterator.pxd b/contrib/tools/cython/Cython/Includes/libcpp/iterator.pxd index 8ce29b25e0..e0f8bd8d6e 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/iterator.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/iterator.pxd @@ -1,32 +1,32 @@ -#Basic reference: http://www.cplusplus.com/reference/iterator/ -#Most of these classes are in fact empty structs - -cdef extern from "<iterator>" namespace "std" nogil: - cdef cppclass iterator[Category,T,Distance,Pointer,Reference]: - pass - cdef cppclass output_iterator_tag: - pass - cdef cppclass input_iterator_tag: - pass - cdef cppclass forward_iterator_tag(input_iterator_tag): - pass - cdef cppclass bidirectional_iterator_tag(forward_iterator_tag): - pass - cdef cppclass random_access_iterator_tag(bidirectional_iterator_tag): - pass +#Basic reference: http://www.cplusplus.com/reference/iterator/ +#Most of these classes are in fact empty structs + +cdef extern from "<iterator>" namespace "std" nogil: + cdef cppclass iterator[Category,T,Distance,Pointer,Reference]: + pass + cdef cppclass output_iterator_tag: + pass + cdef cppclass input_iterator_tag: + pass + cdef cppclass forward_iterator_tag(input_iterator_tag): + pass + cdef cppclass bidirectional_iterator_tag(forward_iterator_tag): + pass + cdef cppclass random_access_iterator_tag(bidirectional_iterator_tag): + pass + + cdef cppclass back_insert_iterator[T](iterator[output_iterator_tag,void,void,void,void]): + pass + cdef cppclass front_insert_iterator[T](iterator[output_iterator_tag,void,void,void,void]): + pass + cdef cppclass insert_iterator[T](iterator[output_iterator_tag,void,void,void,void]): + pass + back_insert_iterator[CONTAINER] back_inserter[CONTAINER](CONTAINER &) + front_insert_iterator[CONTAINER] front_inserter[CONTAINER](CONTAINER &) + ##Note: this is the C++98 version of inserter. + ##The C++11 versions's prototype relies on typedef members of classes, which Cython doesn't currently support: + ##template <class Container> + ##insert_iterator<Container> inserter (Container& x, typename Container::iterator it) + insert_iterator[CONTAINER] inserter[CONTAINER,ITERATOR](CONTAINER &, ITERATOR) - cdef cppclass back_insert_iterator[T](iterator[output_iterator_tag,void,void,void,void]): - pass - cdef cppclass front_insert_iterator[T](iterator[output_iterator_tag,void,void,void,void]): - pass - cdef cppclass insert_iterator[T](iterator[output_iterator_tag,void,void,void,void]): - pass - back_insert_iterator[CONTAINER] back_inserter[CONTAINER](CONTAINER &) - front_insert_iterator[CONTAINER] front_inserter[CONTAINER](CONTAINER &) - ##Note: this is the C++98 version of inserter. - ##The C++11 versions's prototype relies on typedef members of classes, which Cython doesn't currently support: - ##template <class Container> - ##insert_iterator<Container> inserter (Container& x, typename Container::iterator it) - insert_iterator[CONTAINER] inserter[CONTAINER,ITERATOR](CONTAINER &, ITERATOR) - diff --git a/contrib/tools/cython/Cython/Includes/libcpp/limits.pxd b/contrib/tools/cython/Cython/Includes/libcpp/limits.pxd index a26bb20244..c325263b72 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/limits.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/limits.pxd @@ -1,61 +1,61 @@ -cdef extern from "<limits>" namespace "std" nogil: - enum float_round_style: - round_indeterminate = -1 - round_toward_zero = 0 - round_to_nearest = 1 - round_toward_infinity = 2 - round_toward_neg_infinity = 3 +cdef extern from "<limits>" namespace "std" nogil: + enum float_round_style: + round_indeterminate = -1 + round_toward_zero = 0 + round_to_nearest = 1 + round_toward_infinity = 2 + round_toward_neg_infinity = 3 - enum float_denorm_style: - denorm_indeterminate = -1 - denorm_absent = 0 - denorm_present = 1 - - #The static methods can be called as, e.g. numeric_limits[int].round_error(), etc. - #The const data members should be declared as static. Cython currently doesn't allow that - #and/or I can't figure it out, so you must instantiate an object to access, e.g. - #cdef numeric_limits[double] lm - #print lm.round_style - cdef cppclass numeric_limits[T]: - const bint is_specialized - @staticmethod - T min() - @staticmethod - T max() - const int digits - const int digits10 - const bint is_signed - const bint is_integer - const bint is_exact - const int radix - @staticmethod - T epsilon() - @staticmethod - T round_error() - - const int min_exponent - const int min_exponent10 - const int max_exponent - const int max_exponent10 + enum float_denorm_style: + denorm_indeterminate = -1 + denorm_absent = 0 + denorm_present = 1 - const bint has_infinity - const bint has_quiet_NaN - const bint has_signaling_NaN - const float_denorm_style has_denorm - const bint has_denorm_loss - @staticmethod - T infinity() - @staticmethod - T quiet_NaN() - @staticmethod - T signaling_NaN() - @staticmethod - T denorm_min() - - const bint is_iec559 - const bint is_bounded - const bint is_modulo - - const bint traps - const bint tinyness_before - const float_round_style round_style + #The static methods can be called as, e.g. numeric_limits[int].round_error(), etc. + #The const data members should be declared as static. Cython currently doesn't allow that + #and/or I can't figure it out, so you must instantiate an object to access, e.g. + #cdef numeric_limits[double] lm + #print lm.round_style + cdef cppclass numeric_limits[T]: + const bint is_specialized + @staticmethod + T min() + @staticmethod + T max() + const int digits + const int digits10 + const bint is_signed + const bint is_integer + const bint is_exact + const int radix + @staticmethod + T epsilon() + @staticmethod + T round_error() + + const int min_exponent + const int min_exponent10 + const int max_exponent + const int max_exponent10 + + const bint has_infinity + const bint has_quiet_NaN + const bint has_signaling_NaN + const float_denorm_style has_denorm + const bint has_denorm_loss + @staticmethod + T infinity() + @staticmethod + T quiet_NaN() + @staticmethod + T signaling_NaN() + @staticmethod + T denorm_min() + + const bint is_iec559 + const bint is_bounded + const bint is_modulo + + const bint traps + const bint tinyness_before + const float_round_style round_style diff --git a/contrib/tools/cython/Cython/Includes/libcpp/list.pxd b/contrib/tools/cython/Cython/Includes/libcpp/list.pxd index e350694da3..b5b0410ad8 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/list.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/list.pxd @@ -1,14 +1,14 @@ cdef extern from "<list>" namespace "std" nogil: - cdef cppclass list[T,ALLOCATOR=*]: - ctypedef T value_type - ctypedef ALLOCATOR allocator_type - - # these should really be allocator_type.size_type and - # allocator_type.difference_type to be true to the C++ definition - # but cython doesn't support deferred access on template arguments - ctypedef size_t size_type - ctypedef ptrdiff_t difference_type - + cdef cppclass list[T,ALLOCATOR=*]: + ctypedef T value_type + ctypedef ALLOCATOR allocator_type + + # these should really be allocator_type.size_type and + # allocator_type.difference_type to be true to the C++ definition + # but cython doesn't support deferred access on template arguments + ctypedef size_t size_type + ctypedef ptrdiff_t difference_type + cppclass iterator: iterator() iterator(iterator &) @@ -25,10 +25,10 @@ cdef extern from "<list>" namespace "std" nogil: reverse_iterator operator--() bint operator==(reverse_iterator) bint operator!=(reverse_iterator) - cppclass const_iterator(iterator): - pass - cppclass const_reverse_iterator(reverse_iterator): - pass + cppclass const_iterator(iterator): + pass + cppclass const_reverse_iterator(reverse_iterator): + pass list() except + list(list&) except + list(size_t, T&) except + @@ -42,11 +42,11 @@ cdef extern from "<list>" namespace "std" nogil: void assign(size_t, T&) T& back() iterator begin() - const_iterator const_begin "begin"() + const_iterator const_begin "begin"() void clear() bint empty() iterator end() - const_iterator const_end "end"() + const_iterator const_end "end"() iterator erase(iterator) iterator erase(iterator, iterator) T& front() @@ -60,11 +60,11 @@ cdef extern from "<list>" namespace "std" nogil: void push_back(T&) void push_front(T&) reverse_iterator rbegin() - const_reverse_iterator const_rbegin "rbegin"() + const_reverse_iterator const_rbegin "rbegin"() void remove(T&) #void remove_if(UnPred) reverse_iterator rend() - const_reverse_iterator const_rend "rend"() + const_reverse_iterator const_rend "rend"() void resize(size_t, T&) void reverse() size_t size() diff --git a/contrib/tools/cython/Cython/Includes/libcpp/map.pxd b/contrib/tools/cython/Cython/Includes/libcpp/map.pxd index 4507baf2a6..624a7ac026 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/map.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/map.pxd @@ -1,12 +1,12 @@ from .utility cimport pair cdef extern from "<map>" namespace "std" nogil: - cdef cppclass map[T, U, COMPARE=*, ALLOCATOR=*]: - ctypedef T key_type - ctypedef U mapped_type - ctypedef pair[const T, U] value_type - ctypedef COMPARE key_compare - ctypedef ALLOCATOR allocator_type + cdef cppclass map[T, U, COMPARE=*, ALLOCATOR=*]: + ctypedef T key_type + ctypedef U mapped_type + ctypedef pair[const T, U] value_type + ctypedef COMPARE key_compare + ctypedef ALLOCATOR allocator_type cppclass iterator: pair[T, U]& operator*() iterator operator++() @@ -19,10 +19,10 @@ cdef extern from "<map>" namespace "std" nogil: iterator operator--() bint operator==(reverse_iterator) bint operator!=(reverse_iterator) - cppclass const_iterator(iterator): - pass - cppclass const_reverse_iterator(reverse_iterator): - pass + cppclass const_iterator(iterator): + pass + cppclass const_reverse_iterator(reverse_iterator): + pass map() except + map(map&) except + #map(key_compare&) @@ -34,35 +34,35 @@ cdef extern from "<map>" namespace "std" nogil: bint operator>(map&, map&) bint operator<=(map&, map&) bint operator>=(map&, map&) - U& at(const T&) except + - const U& const_at "at"(const T&) except + + U& at(const T&) except + + const U& const_at "at"(const T&) except + iterator begin() const_iterator const_begin "begin" () void clear() - size_t count(const T&) + size_t count(const T&) bint empty() iterator end() const_iterator const_end "end" () - pair[iterator, iterator] equal_range(const T&) + pair[iterator, iterator] equal_range(const T&) #pair[const_iterator, const_iterator] equal_range(key_type&) void erase(iterator) void erase(iterator, iterator) - size_t erase(const T&) - iterator find(const T&) - const_iterator const_find "find" (const T&) - pair[iterator, bint] insert(pair[T, U]) except + # XXX pair[T,U]& - iterator insert(iterator, pair[T, U]) except + # XXX pair[T,U]& + size_t erase(const T&) + iterator find(const T&) + const_iterator const_find "find" (const T&) + pair[iterator, bint] insert(pair[T, U]) except + # XXX pair[T,U]& + iterator insert(iterator, pair[T, U]) except + # XXX pair[T,U]& #void insert(input_iterator, input_iterator) #key_compare key_comp() - iterator lower_bound(const T&) - const_iterator const_lower_bound "lower_bound"(const T&) + iterator lower_bound(const T&) + const_iterator const_lower_bound "lower_bound"(const T&) size_t max_size() reverse_iterator rbegin() - const_reverse_iterator const_rbegin "rbegin"() + const_reverse_iterator const_rbegin "rbegin"() reverse_iterator rend() - const_reverse_iterator const_rend "rend"() + const_reverse_iterator const_rend "rend"() size_t size() void swap(map&) - iterator upper_bound(const T&) - const_iterator const_upper_bound "upper_bound"(const T&) + iterator upper_bound(const T&) + const_iterator const_upper_bound "upper_bound"(const T&) #value_compare value_comp() diff --git a/contrib/tools/cython/Cython/Includes/libcpp/memory.pxd b/contrib/tools/cython/Cython/Includes/libcpp/memory.pxd index f8548011e4..2151c1ec7f 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/memory.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/memory.pxd @@ -1,115 +1,115 @@ -from libcpp cimport bool, nullptr_t, nullptr - -cdef extern from "<memory>" namespace "std" nogil: - cdef cppclass default_delete[T]: - default_delete() - - cdef cppclass allocator[T]: - allocator() - allocator(const allocator &) - #allocator(const allocator[U] &) #unique_ptr unit tests fail w/this - T * address(T &) - const T * address(const T &) const - T * allocate( size_t n ) # Not to standard. should be a second default argument - void deallocate(T * , size_t) - size_t max_size() const - void construct( T *, const T &) #C++98. The C++11 version is variadic AND perfect-forwarding - void destroy(T *) #C++98 - void destroy[U](U *) #unique_ptr unit tests fail w/this - - - cdef cppclass unique_ptr[T,DELETER=*]: - unique_ptr() - unique_ptr(nullptr_t) - unique_ptr(T*) - unique_ptr(unique_ptr[T]&) - - # Modifiers - T* release() - void reset() - void reset(nullptr_t) - void reset(T*) - void swap(unique_ptr&) - - # Observers - T* get() - T& operator*() - #T* operator->() # Not Supported - bool operator bool() - bool operator!() - - bool operator==(const unique_ptr&) - bool operator!=(const unique_ptr&) - bool operator<(const unique_ptr&) - bool operator>(const unique_ptr&) - bool operator<=(const unique_ptr&) - bool operator>=(const unique_ptr&) - - bool operator==(nullptr_t) - bool operator!=(nullptr_t) - - # Forward Declaration not working ("Compiler crash in AnalyseDeclarationsTransform") - #cdef cppclass weak_ptr[T] - - cdef cppclass shared_ptr[T]: - shared_ptr() - shared_ptr(nullptr_t) - shared_ptr(T*) - shared_ptr(shared_ptr[T]&) - shared_ptr(shared_ptr[T]&, T*) - shared_ptr(unique_ptr[T]&) - #shared_ptr(weak_ptr[T]&) # Not Supported - - # Modifiers - void reset() - void reset(T*) - void swap(shared_ptr&) - - # Observers - T* get() - T& operator*() - #T* operator->() # Not Supported - long use_count() - bool unique() - bool operator bool() - bool operator!() - #bool owner_before[Y](const weak_ptr[Y]&) # Not Supported - bool owner_before[Y](const shared_ptr[Y]&) - - bool operator==(const shared_ptr&) - bool operator!=(const shared_ptr&) - bool operator<(const shared_ptr&) - bool operator>(const shared_ptr&) - bool operator<=(const shared_ptr&) - bool operator>=(const shared_ptr&) - - bool operator==(nullptr_t) - bool operator!=(nullptr_t) - - cdef cppclass weak_ptr[T]: - weak_ptr() - weak_ptr(weak_ptr[T]&) - weak_ptr(shared_ptr[T]&) - - # Modifiers - void reset() - void swap(weak_ptr&) - - # Observers - long use_count() - bool expired() - shared_ptr[T] lock() - bool owner_before[Y](const weak_ptr[Y]&) - bool owner_before[Y](const shared_ptr[Y]&) - - # Smart pointer non-member operations - shared_ptr[T] make_shared[T](...) except + - - # Temporaries used for exception handling break generated code - unique_ptr[T] make_unique[T](...) # except + - - # No checking on the compatibility of T and U. - cdef shared_ptr[T] static_pointer_cast[T, U](const shared_ptr[U]&) - cdef shared_ptr[T] dynamic_pointer_cast[T, U](const shared_ptr[U]&) - cdef shared_ptr[T] const_pointer_cast[T, U](const shared_ptr[U]&) - cdef shared_ptr[T] reinterpret_pointer_cast[T, U](const shared_ptr[U]&) +from libcpp cimport bool, nullptr_t, nullptr + +cdef extern from "<memory>" namespace "std" nogil: + cdef cppclass default_delete[T]: + default_delete() + + cdef cppclass allocator[T]: + allocator() + allocator(const allocator &) + #allocator(const allocator[U] &) #unique_ptr unit tests fail w/this + T * address(T &) + const T * address(const T &) const + T * allocate( size_t n ) # Not to standard. should be a second default argument + void deallocate(T * , size_t) + size_t max_size() const + void construct( T *, const T &) #C++98. The C++11 version is variadic AND perfect-forwarding + void destroy(T *) #C++98 + void destroy[U](U *) #unique_ptr unit tests fail w/this + + + cdef cppclass unique_ptr[T,DELETER=*]: + unique_ptr() + unique_ptr(nullptr_t) + unique_ptr(T*) + unique_ptr(unique_ptr[T]&) + + # Modifiers + T* release() + void reset() + void reset(nullptr_t) + void reset(T*) + void swap(unique_ptr&) + + # Observers + T* get() + T& operator*() + #T* operator->() # Not Supported + bool operator bool() + bool operator!() + + bool operator==(const unique_ptr&) + bool operator!=(const unique_ptr&) + bool operator<(const unique_ptr&) + bool operator>(const unique_ptr&) + bool operator<=(const unique_ptr&) + bool operator>=(const unique_ptr&) + + bool operator==(nullptr_t) + bool operator!=(nullptr_t) + + # Forward Declaration not working ("Compiler crash in AnalyseDeclarationsTransform") + #cdef cppclass weak_ptr[T] + + cdef cppclass shared_ptr[T]: + shared_ptr() + shared_ptr(nullptr_t) + shared_ptr(T*) + shared_ptr(shared_ptr[T]&) + shared_ptr(shared_ptr[T]&, T*) + shared_ptr(unique_ptr[T]&) + #shared_ptr(weak_ptr[T]&) # Not Supported + + # Modifiers + void reset() + void reset(T*) + void swap(shared_ptr&) + + # Observers + T* get() + T& operator*() + #T* operator->() # Not Supported + long use_count() + bool unique() + bool operator bool() + bool operator!() + #bool owner_before[Y](const weak_ptr[Y]&) # Not Supported + bool owner_before[Y](const shared_ptr[Y]&) + + bool operator==(const shared_ptr&) + bool operator!=(const shared_ptr&) + bool operator<(const shared_ptr&) + bool operator>(const shared_ptr&) + bool operator<=(const shared_ptr&) + bool operator>=(const shared_ptr&) + + bool operator==(nullptr_t) + bool operator!=(nullptr_t) + + cdef cppclass weak_ptr[T]: + weak_ptr() + weak_ptr(weak_ptr[T]&) + weak_ptr(shared_ptr[T]&) + + # Modifiers + void reset() + void swap(weak_ptr&) + + # Observers + long use_count() + bool expired() + shared_ptr[T] lock() + bool owner_before[Y](const weak_ptr[Y]&) + bool owner_before[Y](const shared_ptr[Y]&) + + # Smart pointer non-member operations + shared_ptr[T] make_shared[T](...) except + + + # Temporaries used for exception handling break generated code + unique_ptr[T] make_unique[T](...) # except + + + # No checking on the compatibility of T and U. + cdef shared_ptr[T] static_pointer_cast[T, U](const shared_ptr[U]&) + cdef shared_ptr[T] dynamic_pointer_cast[T, U](const shared_ptr[U]&) + cdef shared_ptr[T] const_pointer_cast[T, U](const shared_ptr[U]&) + cdef shared_ptr[T] reinterpret_pointer_cast[T, U](const shared_ptr[U]&) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/queue.pxd b/contrib/tools/cython/Cython/Includes/libcpp/queue.pxd index f610249c52..578cbd9159 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/queue.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/queue.pxd @@ -9,9 +9,9 @@ cdef extern from "<queue>" namespace "std" nogil: void pop() void push(T&) size_t size() - # C++11 methods - void swap(queue&) - + # C++11 methods + void swap(queue&) + cdef cppclass priority_queue[T]: priority_queue() except + priority_queue(priority_queue&) except + @@ -21,5 +21,5 @@ cdef extern from "<queue>" namespace "std" nogil: void push(T&) size_t size() T& top() - # C++11 methods - void swap(priority_queue&) + # C++11 methods + void swap(priority_queue&) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/set.pxd b/contrib/tools/cython/Cython/Includes/libcpp/set.pxd index 2de86db1ea..1069be7466 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/set.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/set.pxd @@ -2,7 +2,7 @@ from .utility cimport pair cdef extern from "<set>" namespace "std" nogil: cdef cppclass set[T]: - ctypedef T value_type + ctypedef T value_type cppclass iterator: T& operator*() iterator operator++() @@ -15,10 +15,10 @@ cdef extern from "<set>" namespace "std" nogil: iterator operator--() bint operator==(reverse_iterator) bint operator!=(reverse_iterator) - cppclass const_iterator(iterator): - pass - cppclass const_reverse_iterator(reverse_iterator): - pass + cppclass const_iterator(iterator): + pass + cppclass const_reverse_iterator(reverse_iterator): + pass set() except + set(set&) except + #set(key_compare&) @@ -30,32 +30,32 @@ cdef extern from "<set>" namespace "std" nogil: bint operator<=(set&, set&) bint operator>=(set&, set&) iterator begin() - const_iterator const_begin "begin"() + const_iterator const_begin "begin"() void clear() - size_t count(const T&) + size_t count(const T&) bint empty() iterator end() - const_iterator const_end "end"() - pair[iterator, iterator] equal_range(const T&) + const_iterator const_end "end"() + pair[iterator, iterator] equal_range(const T&) #pair[const_iterator, const_iterator] equal_range(T&) - iterator erase(iterator) - iterator erase(iterator, iterator) + iterator erase(iterator) + iterator erase(iterator, iterator) size_t erase(T&) iterator find(T&) - const_iterator const_find "find"(T&) - pair[iterator, bint] insert(const T&) except + - iterator insert(iterator, const T&) except + - void insert(iterator, iterator) except + + const_iterator const_find "find"(T&) + pair[iterator, bint] insert(const T&) except + + iterator insert(iterator, const T&) except + + void insert(iterator, iterator) except + #key_compare key_comp() iterator lower_bound(T&) - const_iterator const_lower_bound "lower_bound"(T&) + const_iterator const_lower_bound "lower_bound"(T&) size_t max_size() reverse_iterator rbegin() - const_reverse_iterator const_rbegin "rbegin"() + const_reverse_iterator const_rbegin "rbegin"() reverse_iterator rend() - const_reverse_iterator const_rend "rend"() + const_reverse_iterator const_rend "rend"() size_t size() void swap(set&) - iterator upper_bound(const T&) - const_iterator const_upper_bound "upper_bound"(const T&) + iterator upper_bound(const T&) + const_iterator const_upper_bound "upper_bound"(const T&) #value_compare value_comp() diff --git a/contrib/tools/cython/Cython/Includes/libcpp/stack.pxd b/contrib/tools/cython/Cython/Includes/libcpp/stack.pxd index 4bfcf0593a..2dc80992b7 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/stack.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/stack.pxd @@ -1,6 +1,6 @@ cdef extern from "<stack>" namespace "std" nogil: cdef cppclass stack[T]: - ctypedef T value_type + ctypedef T value_type stack() except + stack(stack&) except + #stack(Container&) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/string.pxd b/contrib/tools/cython/Cython/Includes/libcpp/string.pxd index 1214a2a7c3..a894144f1f 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/string.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/string.pxd @@ -8,34 +8,34 @@ cdef extern from "<string>" namespace "std::string" nogil: cdef extern from "<string>" namespace "std" nogil: cdef cppclass string: - cppclass iterator: - iterator() - char& operator*() + cppclass iterator: + iterator() + char& operator*() iterator(iterator&) - iterator operator++() - iterator operator--() - bint operator==(iterator) - bint operator!=(iterator) - - cppclass reverse_iterator: - char& operator*() - iterator operator++() - iterator operator--() - iterator operator+(size_t) - iterator operator-(size_t) - bint operator==(reverse_iterator) - bint operator!=(reverse_iterator) - bint operator<(reverse_iterator) - bint operator>(reverse_iterator) - bint operator<=(reverse_iterator) - bint operator>=(reverse_iterator) - - cppclass const_iterator(iterator): - pass - - cppclass const_reverse_iterator(reverse_iterator): - pass - + iterator operator++() + iterator operator--() + bint operator==(iterator) + bint operator!=(iterator) + + cppclass reverse_iterator: + char& operator*() + iterator operator++() + iterator operator--() + iterator operator+(size_t) + iterator operator-(size_t) + bint operator==(reverse_iterator) + bint operator!=(reverse_iterator) + bint operator<(reverse_iterator) + bint operator>(reverse_iterator) + bint operator<=(reverse_iterator) + bint operator>=(reverse_iterator) + + cppclass const_iterator(iterator): + pass + + cppclass const_reverse_iterator(reverse_iterator): + pass + string() except + string(const string& s) except + string(const string& s, size_t pos) except + @@ -45,15 +45,15 @@ cdef extern from "<string>" namespace "std" nogil: string(size_t n, char c) except + string(iterator first, iterator last) except + - iterator begin() - const_iterator const_begin "begin"() - iterator end() - const_iterator const_end "end"() - reverse_iterator rbegin() - const_reverse_iterator const_rbegin "rbegin"() - reverse_iterator rend() - const_reverse_iterator const_rend "rend"() - + iterator begin() + const_iterator const_begin "begin"() + iterator end() + const_iterator const_end "end"() + reverse_iterator rbegin() + const_reverse_iterator const_rbegin "rbegin"() + reverse_iterator rend() + const_reverse_iterator const_rend "rend"() + const char* c_str() const char* data() size_t size() diff --git a/contrib/tools/cython/Cython/Includes/libcpp/typeindex.pxd b/contrib/tools/cython/Cython/Includes/libcpp/typeindex.pxd index 73f94e93a0..d5b7e9149f 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/typeindex.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/typeindex.pxd @@ -1,15 +1,15 @@ -from libcpp cimport bool -from .typeinfo cimport type_info - -# This class is C++11-only -cdef extern from "<typeindex>" namespace "std" nogil: - cdef cppclass type_index: - type_index(const type_info &) - const char* name() - size_t hash_code() - bool operator==(const type_index &) - bool operator!=(const type_index &) - bool operator<(const type_index &) - bool operator<=(const type_index &) - bool operator>(const type_index &) - bool operator>=(const type_index &) +from libcpp cimport bool +from .typeinfo cimport type_info + +# This class is C++11-only +cdef extern from "<typeindex>" namespace "std" nogil: + cdef cppclass type_index: + type_index(const type_info &) + const char* name() + size_t hash_code() + bool operator==(const type_index &) + bool operator!=(const type_index &) + bool operator<(const type_index &) + bool operator<=(const type_index &) + bool operator>(const type_index &) + bool operator>=(const type_index &) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/typeinfo.pxd b/contrib/tools/cython/Cython/Includes/libcpp/typeinfo.pxd index 989bce171c..9118e00649 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/typeinfo.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/typeinfo.pxd @@ -1,10 +1,10 @@ -from libcpp cimport bool - -cdef extern from "<typeinfo>" namespace "std" nogil: - cdef cppclass type_info: - const char* name() - int before(const type_info&) - bool operator==(const type_info&) - bool operator!=(const type_info&) - # C++11-only - size_t hash_code() +from libcpp cimport bool + +cdef extern from "<typeinfo>" namespace "std" nogil: + cdef cppclass type_info: + const char* name() + int before(const type_info&) + bool operator==(const type_info&) + bool operator!=(const type_info&) + # C++11-only + size_t hash_code() diff --git a/contrib/tools/cython/Cython/Includes/libcpp/unordered_map.pxd b/contrib/tools/cython/Cython/Includes/libcpp/unordered_map.pxd index 7db3ba0544..a00fbbed28 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/unordered_map.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/unordered_map.pxd @@ -2,9 +2,9 @@ from .utility cimport pair cdef extern from "<unordered_map>" namespace "std" nogil: cdef cppclass unordered_map[T, U, HASH=*, PRED=*, ALLOCATOR=*]: - ctypedef T key_type - ctypedef U mapped_type - ctypedef pair[const T, U] value_type + ctypedef T key_type + ctypedef U mapped_type + ctypedef pair[const T, U] value_type cppclass iterator: pair[T, U]& operator*() iterator operator++() @@ -17,10 +17,10 @@ cdef extern from "<unordered_map>" namespace "std" nogil: iterator operator--() bint operator==(reverse_iterator) bint operator!=(reverse_iterator) - cppclass const_iterator(iterator): - pass - cppclass const_reverse_iterator(reverse_iterator): - pass + cppclass const_iterator(iterator): + pass + cppclass const_reverse_iterator(reverse_iterator): + pass unordered_map() except + unordered_map(unordered_map&) except + #unordered_map(key_compare&) @@ -32,43 +32,43 @@ cdef extern from "<unordered_map>" namespace "std" nogil: bint operator>(unordered_map&, unordered_map&) bint operator<=(unordered_map&, unordered_map&) bint operator>=(unordered_map&, unordered_map&) - U& at(const T&) - const U& const_at "at"(const T&) + U& at(const T&) + const U& const_at "at"(const T&) iterator begin() - const_iterator const_begin "begin"() + const_iterator const_begin "begin"() void clear() size_t count(T&) bint empty() iterator end() - const_iterator const_end "end"() + const_iterator const_end "end"() pair[iterator, iterator] equal_range(T&) - pair[const_iterator, const_iterator] const_equal_range "equal_range"(const T&) + pair[const_iterator, const_iterator] const_equal_range "equal_range"(const T&) iterator erase(iterator) iterator erase(iterator, iterator) size_t erase(T&) iterator find(T&) - const_iterator const_find "find"(T&) + const_iterator const_find "find"(T&) pair[iterator, bint] insert(pair[T, U]) # XXX pair[T,U]& iterator insert(iterator, pair[T, U]) # XXX pair[T,U]& - iterator insert(iterator, iterator) + iterator insert(iterator, iterator) #key_compare key_comp() iterator lower_bound(T&) - const_iterator const_lower_bound "lower_bound"(T&) + const_iterator const_lower_bound "lower_bound"(T&) size_t max_size() reverse_iterator rbegin() - const_reverse_iterator const_rbegin "rbegin"() + const_reverse_iterator const_rbegin "rbegin"() reverse_iterator rend() - const_reverse_iterator const_rend "rend"() + const_reverse_iterator const_rend "rend"() size_t size() void swap(unordered_map&) iterator upper_bound(T&) - const_iterator const_upper_bound "upper_bound"(T&) + const_iterator const_upper_bound "upper_bound"(T&) #value_compare value_comp() - void max_load_factor(float) - float max_load_factor() - void rehash(size_t) - void reserve(size_t) - size_t bucket_count() - size_t max_bucket_count() - size_t bucket_size(size_t) - size_t bucket(const T&) + void max_load_factor(float) + float max_load_factor() + void rehash(size_t) + void reserve(size_t) + size_t bucket_count() + size_t max_bucket_count() + size_t bucket_size(size_t) + size_t bucket(const T&) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/unordered_set.pxd b/contrib/tools/cython/Cython/Includes/libcpp/unordered_set.pxd index 47101fb29f..5aa2417528 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/unordered_set.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/unordered_set.pxd @@ -1,8 +1,8 @@ from .utility cimport pair cdef extern from "<unordered_set>" namespace "std" nogil: - cdef cppclass unordered_set[T,HASH=*,PRED=*,ALLOCATOR=*]: - ctypedef T value_type + cdef cppclass unordered_set[T,HASH=*,PRED=*,ALLOCATOR=*]: + ctypedef T value_type cppclass iterator: T& operator*() iterator operator++() @@ -15,10 +15,10 @@ cdef extern from "<unordered_set>" namespace "std" nogil: iterator operator--() bint operator==(reverse_iterator) bint operator!=(reverse_iterator) - cppclass const_iterator(iterator): - pass - cppclass const_reverse_iterator(reverse_iterator): - pass + cppclass const_iterator(iterator): + pass + cppclass const_reverse_iterator(reverse_iterator): + pass unordered_set() except + unordered_set(unordered_set&) except + #unordered_set(key_compare&) @@ -30,40 +30,40 @@ cdef extern from "<unordered_set>" namespace "std" nogil: bint operator<=(unordered_set&, unordered_set&) bint operator>=(unordered_set&, unordered_set&) iterator begin() - const_iterator const_begin "begin"() + const_iterator const_begin "begin"() void clear() size_t count(T&) bint empty() iterator end() - const_iterator const_end "end"() + const_iterator const_end "end"() pair[iterator, iterator] equal_range(T&) - pair[const_iterator, const_iterator] const_equal_range "equal_range"(T&) - iterator erase(iterator) - iterator erase(iterator, iterator) + pair[const_iterator, const_iterator] const_equal_range "equal_range"(T&) + iterator erase(iterator) + iterator erase(iterator, iterator) size_t erase(T&) iterator find(T&) - const_iterator const_find "find"(T&) + const_iterator const_find "find"(T&) pair[iterator, bint] insert(T&) iterator insert(iterator, T&) #key_compare key_comp() - iterator insert(iterator, iterator) + iterator insert(iterator, iterator) iterator lower_bound(T&) - const_iterator const_lower_bound "lower_bound"(T&) + const_iterator const_lower_bound "lower_bound"(T&) size_t max_size() reverse_iterator rbegin() - const_reverse_iterator const_rbegin "rbegin"() + const_reverse_iterator const_rbegin "rbegin"() reverse_iterator rend() - const_reverse_iterator const_rend "rend"() + const_reverse_iterator const_rend "rend"() size_t size() void swap(unordered_set&) iterator upper_bound(T&) - const_iterator const_upper_bound "upper_bound"(T&) + const_iterator const_upper_bound "upper_bound"(T&) #value_compare value_comp() - void max_load_factor(float) - float max_load_factor() - void rehash(size_t) - void reserve(size_t) - size_t bucket_count() - size_t max_bucket_count() - size_t bucket_size(size_t) - size_t bucket(const T&) + void max_load_factor(float) + float max_load_factor() + void rehash(size_t) + void reserve(size_t) + size_t bucket_count() + size_t max_bucket_count() + size_t bucket_size(size_t) + size_t bucket(const T&) diff --git a/contrib/tools/cython/Cython/Includes/libcpp/utility.pxd b/contrib/tools/cython/Cython/Includes/libcpp/utility.pxd index fd306e0eeb..e0df69b166 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/utility.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/utility.pxd @@ -1,7 +1,7 @@ cdef extern from "<utility>" namespace "std" nogil: cdef cppclass pair[T, U]: - ctypedef T first_type - ctypedef U second_type + ctypedef T first_type + ctypedef U second_type T first U second pair() except + diff --git a/contrib/tools/cython/Cython/Includes/libcpp/vector.pxd b/contrib/tools/cython/Cython/Includes/libcpp/vector.pxd index 02f772326c..9b007dd0c7 100644 --- a/contrib/tools/cython/Cython/Includes/libcpp/vector.pxd +++ b/contrib/tools/cython/Cython/Includes/libcpp/vector.pxd @@ -1,11 +1,11 @@ cdef extern from "<vector>" namespace "std" nogil: - cdef cppclass vector[T,ALLOCATOR=*]: - ctypedef T value_type - ctypedef ALLOCATOR allocator_type + cdef cppclass vector[T,ALLOCATOR=*]: + ctypedef T value_type + ctypedef ALLOCATOR allocator_type # these should really be allocator_type.size_type and # allocator_type.difference_type to be true to the C++ definition - # but cython doesn't support deferred access on template arguments + # but cython doesn't support deferred access on template arguments ctypedef size_t size_type ctypedef ptrdiff_t difference_type @@ -35,10 +35,10 @@ cdef extern from "<vector>" namespace "std" nogil: bint operator>(reverse_iterator) bint operator<=(reverse_iterator) bint operator>=(reverse_iterator) - cppclass const_iterator(iterator): - pass - cppclass const_reverse_iterator(reverse_iterator): - pass + cppclass const_iterator(iterator): + pass + cppclass const_reverse_iterator(reverse_iterator): + pass vector() except + vector(vector&) except + vector(size_type) except + @@ -53,25 +53,25 @@ cdef extern from "<vector>" namespace "std" nogil: bint operator<=(vector&, vector&) bint operator>=(vector&, vector&) void assign(size_type, const T&) - void assign[input_iterator](input_iterator, input_iterator) except + + void assign[input_iterator](input_iterator, input_iterator) except + T& at(size_type) except + T& back() iterator begin() - const_iterator const_begin "begin"() + const_iterator const_begin "begin"() size_type capacity() void clear() bint empty() iterator end() - const_iterator const_end "end"() + const_iterator const_end "end"() iterator erase(iterator) iterator erase(iterator, iterator) T& front() - iterator insert(iterator, const T&) except + + iterator insert(iterator, const T&) except + iterator insert(iterator, size_type, const T&) except + iterator insert[Iter](iterator, Iter, Iter) except + size_type max_size() void pop_back() - void push_back(T&) except + + void push_back(T&) except + reverse_iterator rbegin() const_reverse_iterator const_rbegin "crbegin"() reverse_iterator rend() @@ -81,8 +81,8 @@ cdef extern from "<vector>" namespace "std" nogil: void resize(size_type, T&) except + size_type size() void swap(vector&) - - # C++11 methods + + # C++11 methods T* data() - const T* const_data "data"() + const T* const_data "data"() void shrink_to_fit() diff --git a/contrib/tools/cython/Cython/Includes/numpy.pxd b/contrib/tools/cython/Cython/Includes/numpy.pxd index 603c08b4f2..789669dac1 100644 --- a/contrib/tools/cython/Cython/Includes/numpy.pxd +++ b/contrib/tools/cython/Cython/Includes/numpy.pxd @@ -3,7 +3,7 @@ # If any of the PyArray_* functions are called, import_array must be # called first. # -# This also defines backwards-compatibility buffer acquisition +# This also defines backwards-compatibility buffer acquisition # code for use in Python 2.x (or Python <= 2.5 when NumPy starts # implementing PEP-3118 directly). # @@ -17,9 +17,9 @@ DEF _buffer_format_string_len = 255 cimport cpython.buffer as pybuf -from cpython.ref cimport Py_INCREF -from cpython.mem cimport PyObject_Malloc, PyObject_Free -from cpython.object cimport PyObject, PyTypeObject +from cpython.ref cimport Py_INCREF +from cpython.mem cimport PyObject_Malloc, PyObject_Free +from cpython.object cimport PyObject, PyTypeObject from cpython.type cimport type cimport libc.stdio as stdio @@ -52,8 +52,8 @@ cdef extern from "numpy/arrayobject.h": NPY_STRING NPY_UNICODE NPY_VOID - NPY_DATETIME - NPY_TIMEDELTA + NPY_DATETIME + NPY_TIMEDELTA NPY_NTYPES NPY_NOTYPE @@ -90,15 +90,15 @@ cdef extern from "numpy/arrayobject.h": NPY_ANYORDER NPY_CORDER NPY_FORTRANORDER - NPY_KEEPORDER - - ctypedef enum NPY_CASTING: - NPY_NO_CASTING - NPY_EQUIV_CASTING - NPY_SAFE_CASTING - NPY_SAME_KIND_CASTING - NPY_UNSAFE_CASTING - + NPY_KEEPORDER + + ctypedef enum NPY_CASTING: + NPY_NO_CASTING + NPY_EQUIV_CASTING + NPY_SAFE_CASTING + NPY_SAME_KIND_CASTING + NPY_UNSAFE_CASTING + ctypedef enum NPY_CLIPMODE: NPY_CLIP NPY_WRAP @@ -123,7 +123,7 @@ cdef extern from "numpy/arrayobject.h": NPY_SEARCHRIGHT enum: - # DEPRECATED since NumPy 1.7 ! Do not use in new code! + # DEPRECATED since NumPy 1.7 ! Do not use in new code! NPY_C_CONTIGUOUS NPY_F_CONTIGUOUS NPY_CONTIGUOUS @@ -156,37 +156,37 @@ cdef extern from "numpy/arrayobject.h": NPY_UPDATE_ALL - enum: - # Added in NumPy 1.7 to replace the deprecated enums above. - NPY_ARRAY_C_CONTIGUOUS - NPY_ARRAY_F_CONTIGUOUS - NPY_ARRAY_OWNDATA - NPY_ARRAY_FORCECAST - NPY_ARRAY_ENSURECOPY - NPY_ARRAY_ENSUREARRAY - NPY_ARRAY_ELEMENTSTRIDES - NPY_ARRAY_ALIGNED - NPY_ARRAY_NOTSWAPPED - NPY_ARRAY_WRITEABLE - NPY_ARRAY_UPDATEIFCOPY - - NPY_ARRAY_BEHAVED - NPY_ARRAY_BEHAVED_NS - NPY_ARRAY_CARRAY - NPY_ARRAY_CARRAY_RO - NPY_ARRAY_FARRAY - NPY_ARRAY_FARRAY_RO - NPY_ARRAY_DEFAULT - - NPY_ARRAY_IN_ARRAY - NPY_ARRAY_OUT_ARRAY - NPY_ARRAY_INOUT_ARRAY - NPY_ARRAY_IN_FARRAY - NPY_ARRAY_OUT_FARRAY - NPY_ARRAY_INOUT_FARRAY - - NPY_ARRAY_UPDATE_ALL - + enum: + # Added in NumPy 1.7 to replace the deprecated enums above. + NPY_ARRAY_C_CONTIGUOUS + NPY_ARRAY_F_CONTIGUOUS + NPY_ARRAY_OWNDATA + NPY_ARRAY_FORCECAST + NPY_ARRAY_ENSURECOPY + NPY_ARRAY_ENSUREARRAY + NPY_ARRAY_ELEMENTSTRIDES + NPY_ARRAY_ALIGNED + NPY_ARRAY_NOTSWAPPED + NPY_ARRAY_WRITEABLE + NPY_ARRAY_UPDATEIFCOPY + + NPY_ARRAY_BEHAVED + NPY_ARRAY_BEHAVED_NS + NPY_ARRAY_CARRAY + NPY_ARRAY_CARRAY_RO + NPY_ARRAY_FARRAY + NPY_ARRAY_FARRAY_RO + NPY_ARRAY_DEFAULT + + NPY_ARRAY_IN_ARRAY + NPY_ARRAY_OUT_ARRAY + NPY_ARRAY_INOUT_ARRAY + NPY_ARRAY_IN_FARRAY + NPY_ARRAY_OUT_FARRAY + NPY_ARRAY_INOUT_FARRAY + + NPY_ARRAY_UPDATE_ALL + cdef enum: NPY_MAXDIMS @@ -194,37 +194,37 @@ cdef extern from "numpy/arrayobject.h": ctypedef void (*PyArray_VectorUnaryFunc)(void *, void *, npy_intp, void *, void *) - ctypedef struct PyArray_ArrayDescr: - # shape is a tuple, but Cython doesn't support "tuple shape" - # inside a non-PyObject declaration, so we have to declare it - # as just a PyObject*. - PyObject* shape - - ctypedef struct PyArray_Descr: - pass - - ctypedef class numpy.dtype [object PyArray_Descr, check_size ignore]: + ctypedef struct PyArray_ArrayDescr: + # shape is a tuple, but Cython doesn't support "tuple shape" + # inside a non-PyObject declaration, so we have to declare it + # as just a PyObject*. + PyObject* shape + + ctypedef struct PyArray_Descr: + pass + + ctypedef class numpy.dtype [object PyArray_Descr, check_size ignore]: # Use PyDataType_* macros when possible, however there are no macros - # for accessing some of the fields, so some are defined. - cdef PyTypeObject* typeobj - cdef char kind - cdef char type - # Numpy sometimes mutates this without warning (e.g. it'll - # sometimes change "|" to "<" in shared dtype objects on - # little-endian machines). If this matters to you, use - # PyArray_IsNativeByteOrder(dtype.byteorder) instead of - # directly accessing this field. - cdef char byteorder - cdef char flags + # for accessing some of the fields, so some are defined. + cdef PyTypeObject* typeobj + cdef char kind + cdef char type + # Numpy sometimes mutates this without warning (e.g. it'll + # sometimes change "|" to "<" in shared dtype objects on + # little-endian machines). If this matters to you, use + # PyArray_IsNativeByteOrder(dtype.byteorder) instead of + # directly accessing this field. + cdef char byteorder + cdef char flags cdef int type_num cdef int itemsize "elsize" - cdef int alignment - cdef dict fields + cdef int alignment + cdef dict fields cdef tuple names - # Use PyDataType_HASSUBARRAY to test whether this field is - # valid (the pointer can be NULL). Most users should access - # this field via the inline helper method PyDataType_SHAPE. - cdef PyArray_ArrayDescr* subarray + # Use PyDataType_HASSUBARRAY to test whether this field is + # valid (the pointer can be NULL). Most users should access + # this field via the inline helper method PyDataType_SHAPE. + cdef PyArray_ArrayDescr* subarray ctypedef extern class numpy.flatiter [object PyArrayIterObject]: # Use through macros @@ -239,7 +239,7 @@ cdef extern from "numpy/arrayobject.h": # like PyArrayObject**. pass - ctypedef class numpy.ndarray [object PyArrayObject, check_size ignore]: + ctypedef class numpy.ndarray [object PyArrayObject, check_size ignore]: cdef __cythonbufferdefaults__ = {"mode": "strided"} cdef: @@ -249,7 +249,7 @@ cdef extern from "numpy/arrayobject.h": int ndim "nd" npy_intp *shape "dimensions" npy_intp *strides - dtype descr # deprecated since NumPy 1.7 ! + dtype descr # deprecated since NumPy 1.7 ! PyObject* base # Note: This syntax (function definition in pxd files) is an @@ -257,30 +257,30 @@ cdef extern from "numpy/arrayobject.h": # -- the details of this may change. def __getbuffer__(ndarray self, Py_buffer* info, int flags): # This implementation of getbuffer is geared towards Cython - # requirements, and does not yet fulfill the PEP. + # requirements, and does not yet fulfill the PEP. # In particular strided access is always provided regardless # of flags - cdef int i, ndim + cdef int i, ndim cdef int endian_detector = 1 cdef bint little_endian = ((<char*>&endian_detector)[0] != 0) ndim = PyArray_NDIM(self) if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) - and not PyArray_CHKFLAGS(self, NPY_ARRAY_C_CONTIGUOUS)): + and not PyArray_CHKFLAGS(self, NPY_ARRAY_C_CONTIGUOUS)): raise ValueError(u"ndarray is not C contiguous") if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) - and not PyArray_CHKFLAGS(self, NPY_ARRAY_F_CONTIGUOUS)): + and not PyArray_CHKFLAGS(self, NPY_ARRAY_F_CONTIGUOUS)): raise ValueError(u"ndarray is not Fortran contiguous") info.buf = PyArray_DATA(self) info.ndim = ndim - if sizeof(npy_intp) != sizeof(Py_ssize_t): + if sizeof(npy_intp) != sizeof(Py_ssize_t): # Allocate new buffer for strides and shape info. # This is allocated as one block, strides first. - info.strides = <Py_ssize_t*>PyObject_Malloc(sizeof(Py_ssize_t) * 2 * <size_t>ndim) + info.strides = <Py_ssize_t*>PyObject_Malloc(sizeof(Py_ssize_t) * 2 * <size_t>ndim) info.shape = info.strides + ndim for i in range(ndim): info.strides[i] = PyArray_STRIDES(self)[i] @@ -294,12 +294,12 @@ cdef extern from "numpy/arrayobject.h": cdef int t cdef char* f = NULL - cdef dtype descr = <dtype>PyArray_DESCR(self) + cdef dtype descr = <dtype>PyArray_DESCR(self) cdef int offset - info.obj = self + info.obj = self - if not PyDataType_HASFIELDS(descr): + if not PyDataType_HASFIELDS(descr): t = descr.type_num if ((descr.byteorder == c'>' and little_endian) or (descr.byteorder == c'<' and not little_endian)): @@ -326,7 +326,7 @@ cdef extern from "numpy/arrayobject.h": info.format = f return else: - info.format = <char*>PyObject_Malloc(_buffer_format_string_len) + info.format = <char*>PyObject_Malloc(_buffer_format_string_len) info.format[0] = c'^' # Native data types, manual alignment offset = 0 f = _util_dtypestring(descr, info.format + 1, @@ -336,13 +336,13 @@ cdef extern from "numpy/arrayobject.h": def __releasebuffer__(ndarray self, Py_buffer* info): if PyArray_HASFIELDS(self): - PyObject_Free(info.format) + PyObject_Free(info.format) if sizeof(npy_intp) != sizeof(Py_ssize_t): - PyObject_Free(info.strides) + PyObject_Free(info.strides) # info.shape was stored after info.strides in the same block - ctypedef unsigned char npy_bool + ctypedef unsigned char npy_bool ctypedef signed char npy_byte ctypedef signed short npy_short @@ -389,41 +389,41 @@ cdef extern from "numpy/arrayobject.h": double imag ctypedef struct npy_clongdouble: - long double real - long double imag + long double real + long double imag ctypedef struct npy_complex64: - float real - float imag + float real + float imag ctypedef struct npy_complex128: double real double imag ctypedef struct npy_complex160: - long double real - long double imag + long double real + long double imag ctypedef struct npy_complex192: - long double real - long double imag + long double real + long double imag ctypedef struct npy_complex256: - long double real - long double imag + long double real + long double imag ctypedef struct PyArray_Dims: npy_intp *ptr int len - int _import_array() except -1 + int _import_array() except -1 # # Macros from ndarrayobject.h # bint PyArray_CHKFLAGS(ndarray m, int flags) - bint PyArray_IS_C_CONTIGUOUS(ndarray arr) - bint PyArray_IS_F_CONTIGUOUS(ndarray arr) + bint PyArray_IS_C_CONTIGUOUS(ndarray arr) + bint PyArray_IS_F_CONTIGUOUS(ndarray arr) bint PyArray_ISCONTIGUOUS(ndarray m) bint PyArray_ISWRITEABLE(ndarray m) bint PyArray_ISALIGNED(ndarray m) @@ -440,8 +440,8 @@ cdef extern from "numpy/arrayobject.h": npy_intp PyArray_DIM(ndarray, size_t) npy_intp PyArray_STRIDE(ndarray, size_t) - PyObject *PyArray_BASE(ndarray) # returns borrowed reference! - PyArray_Descr *PyArray_DESCR(ndarray) # returns borrowed reference to dtype! + PyObject *PyArray_BASE(ndarray) # returns borrowed reference! + PyArray_Descr *PyArray_DESCR(ndarray) # returns borrowed reference to dtype! int PyArray_FLAGS(ndarray) npy_intp PyArray_ITEMSIZE(ndarray) int PyArray_TYPE(ndarray arr) @@ -477,7 +477,7 @@ cdef extern from "numpy/arrayobject.h": bint PyDataType_ISEXTENDED(dtype) bint PyDataType_ISOBJECT(dtype) bint PyDataType_HASFIELDS(dtype) - bint PyDataType_HASSUBARRAY(dtype) + bint PyDataType_HASSUBARRAY(dtype) bint PyArray_ISBOOL(ndarray) bint PyArray_ISUNSIGNED(ndarray) @@ -497,8 +497,8 @@ cdef extern from "numpy/arrayobject.h": bint PyArray_ISVARIABLE(ndarray) bint PyArray_SAFEALIGNEDCOPY(ndarray) - bint PyArray_ISNBO(char) # works on ndarray.byteorder - bint PyArray_IsNativeByteOrder(char) # works on ndarray.byteorder + bint PyArray_ISNBO(char) # works on ndarray.byteorder + bint PyArray_IsNativeByteOrder(char) # works on ndarray.byteorder bint PyArray_ISNOTSWAPPED(ndarray) bint PyArray_ISBYTESWAPPED(ndarray) @@ -540,8 +540,8 @@ cdef extern from "numpy/arrayobject.h": object PyArray_FROM_O(object) object PyArray_FROM_OF(object m, int flags) - object PyArray_FROM_OT(object m, int type) - object PyArray_FROM_OTF(object m, int type, int flags) + object PyArray_FROM_OT(object m, int type) + object PyArray_FROM_OTF(object m, int type, int flags) object PyArray_FROMANY(object m, int type, int min, int max, int flags) object PyArray_ZEROS(int nd, npy_intp* dims, int type, int fortran) object PyArray_EMPTY(int nd, npy_intp* dims, int type, int fortran) @@ -764,7 +764,7 @@ cdef extern from "numpy/arrayobject.h": object PyArray_CheckAxis (ndarray, int *, int) npy_intp PyArray_OverflowMultiplyList (npy_intp *, int) int PyArray_CompareString (char *, char *, size_t) - int PyArray_SetBaseObject(ndarray, base) # NOTE: steals a reference to base! Use "set_array_base()" instead. + int PyArray_SetBaseObject(ndarray, base) # NOTE: steals a reference to base! Use "set_array_base()" instead. # Typedefs that matches the runtime dtype objects in @@ -833,12 +833,12 @@ cdef inline object PyArray_MultiIterNew4(a, b, c, d): cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e) -cdef inline tuple PyDataType_SHAPE(dtype d): - if PyDataType_HASSUBARRAY(d): - return <tuple>d.subarray.shape - else: - return () - +cdef inline tuple PyDataType_SHAPE(dtype d): + if PyDataType_HASSUBARRAY(d): + return <tuple>d.subarray.shape + else: + return () + cdef inline char* _util_dtypestring(dtype descr, char* f, char* end, int* offset) except NULL: # Recursive utility function used in __getbuffer__ to get format # string. The new location in the format string is returned. @@ -852,7 +852,7 @@ cdef inline char* _util_dtypestring(dtype descr, char* f, char* end, int* offset fields = descr.fields[childname] child, new_offset = fields - if (end - f) - <int>(new_offset - offset[0]) < 15: + if (end - f) - <int>(new_offset - offset[0]) < 15: raise RuntimeError(u"Format string allocated too short, see comment in numpy.pxd") if ((child.byteorder == c'>' and little_endian) or @@ -1017,34 +1017,34 @@ cdef extern from "numpy/ufuncobject.h": (PyUFuncGenericFunction *, void **, char *, int, int, int, int, char *, char *, int, char *) - int _import_umath() except -1 + int _import_umath() except -1 cdef inline void set_array_base(ndarray arr, object base): - Py_INCREF(base) # important to do this before stealing the reference below! - PyArray_SetBaseObject(arr, base) + Py_INCREF(base) # important to do this before stealing the reference below! + PyArray_SetBaseObject(arr, base) cdef inline object get_array_base(ndarray arr): - base = PyArray_BASE(arr) - if base is NULL: + base = PyArray_BASE(arr) + if base is NULL: return None - return <object>base - -# Versions of the import_* functions which are more suitable for -# Cython code. -cdef inline int import_array() except -1: - try: - _import_array() - except Exception: - raise ImportError("numpy.core.multiarray failed to import") - -cdef inline int import_umath() except -1: - try: - _import_umath() - except Exception: - raise ImportError("numpy.core.umath failed to import") - -cdef inline int import_ufunc() except -1: - try: - _import_umath() - except Exception: - raise ImportError("numpy.core.umath failed to import") + return <object>base + +# Versions of the import_* functions which are more suitable for +# Cython code. +cdef inline int import_array() except -1: + try: + _import_array() + except Exception: + raise ImportError("numpy.core.multiarray failed to import") + +cdef inline int import_umath() except -1: + try: + _import_umath() + except Exception: + raise ImportError("numpy.core.umath failed to import") + +cdef inline int import_ufunc() except -1: + try: + _import_umath() + except Exception: + raise ImportError("numpy.core.umath failed to import") diff --git a/contrib/tools/cython/Cython/Includes/numpy/__init__.pxd b/contrib/tools/cython/Cython/Includes/numpy/__init__.pxd index fa8c763de2..15700c05ef 100644 --- a/contrib/tools/cython/Cython/Includes/numpy/__init__.pxd +++ b/contrib/tools/cython/Cython/Includes/numpy/__init__.pxd @@ -3,7 +3,7 @@ # If any of the PyArray_* functions are called, import_array must be # called first. # -# This also defines backwards-compatibility buffer acquisition +# This also defines backwards-compatibility buffer acquisition # code for use in Python 2.x (or Python <= 2.5 when NumPy starts # implementing PEP-3118 directly). # @@ -17,9 +17,9 @@ DEF _buffer_format_string_len = 255 cimport cpython.buffer as pybuf -from cpython.ref cimport Py_INCREF +from cpython.ref cimport Py_INCREF from cpython.mem cimport PyObject_Malloc, PyObject_Free -from cpython.object cimport PyObject, PyTypeObject +from cpython.object cimport PyObject, PyTypeObject from cpython.type cimport type cimport libc.stdio as stdio @@ -92,13 +92,13 @@ cdef extern from "numpy/arrayobject.h": NPY_FORTRANORDER NPY_KEEPORDER - ctypedef enum NPY_CASTING: - NPY_NO_CASTING - NPY_EQUIV_CASTING - NPY_SAFE_CASTING - NPY_SAME_KIND_CASTING - NPY_UNSAFE_CASTING - + ctypedef enum NPY_CASTING: + NPY_NO_CASTING + NPY_EQUIV_CASTING + NPY_SAFE_CASTING + NPY_SAME_KIND_CASTING + NPY_UNSAFE_CASTING + ctypedef enum NPY_CLIPMODE: NPY_CLIP NPY_WRAP @@ -123,7 +123,7 @@ cdef extern from "numpy/arrayobject.h": NPY_SEARCHRIGHT enum: - # DEPRECATED since NumPy 1.7 ! Do not use in new code! + # DEPRECATED since NumPy 1.7 ! Do not use in new code! NPY_C_CONTIGUOUS NPY_F_CONTIGUOUS NPY_CONTIGUOUS @@ -156,37 +156,37 @@ cdef extern from "numpy/arrayobject.h": NPY_UPDATE_ALL - enum: - # Added in NumPy 1.7 to replace the deprecated enums above. - NPY_ARRAY_C_CONTIGUOUS - NPY_ARRAY_F_CONTIGUOUS - NPY_ARRAY_OWNDATA - NPY_ARRAY_FORCECAST - NPY_ARRAY_ENSURECOPY - NPY_ARRAY_ENSUREARRAY - NPY_ARRAY_ELEMENTSTRIDES - NPY_ARRAY_ALIGNED - NPY_ARRAY_NOTSWAPPED - NPY_ARRAY_WRITEABLE - NPY_ARRAY_UPDATEIFCOPY - - NPY_ARRAY_BEHAVED - NPY_ARRAY_BEHAVED_NS - NPY_ARRAY_CARRAY - NPY_ARRAY_CARRAY_RO - NPY_ARRAY_FARRAY - NPY_ARRAY_FARRAY_RO - NPY_ARRAY_DEFAULT - - NPY_ARRAY_IN_ARRAY - NPY_ARRAY_OUT_ARRAY - NPY_ARRAY_INOUT_ARRAY - NPY_ARRAY_IN_FARRAY - NPY_ARRAY_OUT_FARRAY - NPY_ARRAY_INOUT_FARRAY - - NPY_ARRAY_UPDATE_ALL - + enum: + # Added in NumPy 1.7 to replace the deprecated enums above. + NPY_ARRAY_C_CONTIGUOUS + NPY_ARRAY_F_CONTIGUOUS + NPY_ARRAY_OWNDATA + NPY_ARRAY_FORCECAST + NPY_ARRAY_ENSURECOPY + NPY_ARRAY_ENSUREARRAY + NPY_ARRAY_ELEMENTSTRIDES + NPY_ARRAY_ALIGNED + NPY_ARRAY_NOTSWAPPED + NPY_ARRAY_WRITEABLE + NPY_ARRAY_UPDATEIFCOPY + + NPY_ARRAY_BEHAVED + NPY_ARRAY_BEHAVED_NS + NPY_ARRAY_CARRAY + NPY_ARRAY_CARRAY_RO + NPY_ARRAY_FARRAY + NPY_ARRAY_FARRAY_RO + NPY_ARRAY_DEFAULT + + NPY_ARRAY_IN_ARRAY + NPY_ARRAY_OUT_ARRAY + NPY_ARRAY_INOUT_ARRAY + NPY_ARRAY_IN_FARRAY + NPY_ARRAY_OUT_FARRAY + NPY_ARRAY_INOUT_FARRAY + + NPY_ARRAY_UPDATE_ALL + cdef enum: NPY_MAXDIMS @@ -200,26 +200,26 @@ cdef extern from "numpy/arrayobject.h": # as just a PyObject*. PyObject* shape - ctypedef struct PyArray_Descr: - pass - - ctypedef class numpy.dtype [object PyArray_Descr, check_size ignore]: + ctypedef struct PyArray_Descr: + pass + + ctypedef class numpy.dtype [object PyArray_Descr, check_size ignore]: # Use PyDataType_* macros when possible, however there are no macros - # for accessing some of the fields, so some are defined. - cdef PyTypeObject* typeobj - cdef char kind - cdef char type + # for accessing some of the fields, so some are defined. + cdef PyTypeObject* typeobj + cdef char kind + cdef char type # Numpy sometimes mutates this without warning (e.g. it'll # sometimes change "|" to "<" in shared dtype objects on # little-endian machines). If this matters to you, use # PyArray_IsNativeByteOrder(dtype.byteorder) instead of # directly accessing this field. - cdef char byteorder - cdef char flags + cdef char byteorder + cdef char flags cdef int type_num cdef int itemsize "elsize" - cdef int alignment - cdef dict fields + cdef int alignment + cdef dict fields cdef tuple names # Use PyDataType_HASSUBARRAY to test whether this field is # valid (the pointer can be NULL). Most users should access @@ -239,7 +239,7 @@ cdef extern from "numpy/arrayobject.h": # like PyArrayObject**. pass - ctypedef class numpy.ndarray [object PyArrayObject, check_size ignore]: + ctypedef class numpy.ndarray [object PyArrayObject, check_size ignore]: cdef __cythonbufferdefaults__ = {"mode": "strided"} cdef: @@ -249,7 +249,7 @@ cdef extern from "numpy/arrayobject.h": int ndim "nd" npy_intp *shape "dimensions" npy_intp *strides - dtype descr # deprecated since NumPy 1.7 ! + dtype descr # deprecated since NumPy 1.7 ! PyObject* base # Note: This syntax (function definition in pxd files) is an @@ -268,11 +268,11 @@ cdef extern from "numpy/arrayobject.h": ndim = PyArray_NDIM(self) if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) - and not PyArray_CHKFLAGS(self, NPY_ARRAY_C_CONTIGUOUS)): + and not PyArray_CHKFLAGS(self, NPY_ARRAY_C_CONTIGUOUS)): raise ValueError(u"ndarray is not C contiguous") if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) - and not PyArray_CHKFLAGS(self, NPY_ARRAY_F_CONTIGUOUS)): + and not PyArray_CHKFLAGS(self, NPY_ARRAY_F_CONTIGUOUS)): raise ValueError(u"ndarray is not Fortran contiguous") info.buf = PyArray_DATA(self) @@ -294,7 +294,7 @@ cdef extern from "numpy/arrayobject.h": cdef int t cdef char* f = NULL - cdef dtype descr = <dtype>PyArray_DESCR(self) + cdef dtype descr = <dtype>PyArray_DESCR(self) cdef int offset info.obj = self @@ -415,14 +415,14 @@ cdef extern from "numpy/arrayobject.h": npy_intp *ptr int len - int _import_array() except -1 + int _import_array() except -1 # # Macros from ndarrayobject.h # bint PyArray_CHKFLAGS(ndarray m, int flags) - bint PyArray_IS_C_CONTIGUOUS(ndarray arr) - bint PyArray_IS_F_CONTIGUOUS(ndarray arr) + bint PyArray_IS_C_CONTIGUOUS(ndarray arr) + bint PyArray_IS_F_CONTIGUOUS(ndarray arr) bint PyArray_ISCONTIGUOUS(ndarray m) bint PyArray_ISWRITEABLE(ndarray m) bint PyArray_ISALIGNED(ndarray m) @@ -439,8 +439,8 @@ cdef extern from "numpy/arrayobject.h": npy_intp PyArray_DIM(ndarray, size_t) npy_intp PyArray_STRIDE(ndarray, size_t) - PyObject *PyArray_BASE(ndarray) # returns borrowed reference! - PyArray_Descr *PyArray_DESCR(ndarray) # returns borrowed reference to dtype! + PyObject *PyArray_BASE(ndarray) # returns borrowed reference! + PyArray_Descr *PyArray_DESCR(ndarray) # returns borrowed reference to dtype! int PyArray_FLAGS(ndarray) npy_intp PyArray_ITEMSIZE(ndarray) int PyArray_TYPE(ndarray arr) @@ -763,7 +763,7 @@ cdef extern from "numpy/arrayobject.h": object PyArray_CheckAxis (ndarray, int *, int) npy_intp PyArray_OverflowMultiplyList (npy_intp *, int) int PyArray_CompareString (char *, char *, size_t) - int PyArray_SetBaseObject(ndarray, base) # NOTE: steals a reference to base! Use "set_array_base()" instead. + int PyArray_SetBaseObject(ndarray, base) # NOTE: steals a reference to base! Use "set_array_base()" instead. # Typedefs that matches the runtime dtype objects in @@ -1016,34 +1016,34 @@ cdef extern from "numpy/ufuncobject.h": (PyUFuncGenericFunction *, void **, char *, int, int, int, int, char *, char *, int, char *) - int _import_umath() except -1 + int _import_umath() except -1 cdef inline void set_array_base(ndarray arr, object base): - Py_INCREF(base) # important to do this before stealing the reference below! - PyArray_SetBaseObject(arr, base) + Py_INCREF(base) # important to do this before stealing the reference below! + PyArray_SetBaseObject(arr, base) cdef inline object get_array_base(ndarray arr): - base = PyArray_BASE(arr) - if base is NULL: + base = PyArray_BASE(arr) + if base is NULL: return None - return <object>base - -# Versions of the import_* functions which are more suitable for -# Cython code. -cdef inline int import_array() except -1: - try: - _import_array() - except Exception: - raise ImportError("numpy.core.multiarray failed to import") - -cdef inline int import_umath() except -1: - try: - _import_umath() - except Exception: - raise ImportError("numpy.core.umath failed to import") - -cdef inline int import_ufunc() except -1: - try: - _import_umath() - except Exception: - raise ImportError("numpy.core.umath failed to import") + return <object>base + +# Versions of the import_* functions which are more suitable for +# Cython code. +cdef inline int import_array() except -1: + try: + _import_array() + except Exception: + raise ImportError("numpy.core.multiarray failed to import") + +cdef inline int import_umath() except -1: + try: + _import_umath() + except Exception: + raise ImportError("numpy.core.umath failed to import") + +cdef inline int import_ufunc() except -1: + try: + _import_umath() + except Exception: + raise ImportError("numpy.core.umath failed to import") diff --git a/contrib/tools/cython/Cython/Includes/numpy/math.pxd b/contrib/tools/cython/Cython/Includes/numpy/math.pxd index 20cbe9f5f9..c16df1c51a 100644 --- a/contrib/tools/cython/Cython/Includes/numpy/math.pxd +++ b/contrib/tools/cython/Cython/Includes/numpy/math.pxd @@ -25,7 +25,7 @@ cdef extern from "numpy/npy_math.h" nogil: long double NZERO "NPY_NZERO" # negative zero # These four are actually macros and work on any floating-point type. - int isinf "npy_isinf"(long double) # -1 / 0 / 1 + int isinf "npy_isinf"(long double) # -1 / 0 / 1 bint isfinite "npy_isfinite"(long double) bint isnan "npy_isnan"(long double) bint signbit "npy_signbit"(long double) @@ -79,11 +79,11 @@ cdef extern from "numpy/npy_math.h" nogil: float log1pf "npy_log1pf"(float x) float exp2f "npy_exp2f"(float x) float log2f "npy_log2f"(float x) - float atan2f "npy_atan2f"(float x, float y) - float hypotf "npy_hypotf"(float x, float y) - float powf "npy_powf"(float x, float y) - float fmodf "npy_fmodf"(float x, float y) - float modff "npy_modff"(float x, float* y) + float atan2f "npy_atan2f"(float x, float y) + float hypotf "npy_hypotf"(float x, float y) + float powf "npy_powf"(float x, float y) + float fmodf "npy_fmodf"(float x, float y) + float modff "npy_modff"(float x, float* y) # Long double C99 functions long double sinl "npy_sinl"(long double x) @@ -110,24 +110,24 @@ cdef extern from "numpy/npy_math.h" nogil: long double log1pl "npy_log1pl"(long double x) long double exp2l "npy_exp2l"(long double x) long double log2l "npy_log2l"(long double x) - long double atan2l "npy_atan2l"(long double x, long double y) - long double hypotl "npy_hypotl"(long double x, long double y) - long double powl "npy_powl"(long double x, long double y) - long double fmodl "npy_fmodl"(long double x, long double y) - long double modfl "npy_modfl"(long double x, long double* y) + long double atan2l "npy_atan2l"(long double x, long double y) + long double hypotl "npy_hypotl"(long double x, long double y) + long double powl "npy_powl"(long double x, long double y) + long double fmodl "npy_fmodl"(long double x, long double y) + long double modfl "npy_modfl"(long double x, long double* y) # NumPy extensions float deg2radf "npy_deg2radf"(float x) float rad2degf "npy_rad2degf"(float x) - float logaddexpf "npy_logaddexpf"(float x, float y) - float logaddexp2f "npy_logaddexp2f"(float x, float y) + float logaddexpf "npy_logaddexpf"(float x, float y) + float logaddexp2f "npy_logaddexp2f"(float x, float y) double deg2rad "npy_deg2rad"(double x) double rad2deg "npy_rad2deg"(double x) - double logaddexp "npy_logaddexp"(double x, double y) - double logaddexp2 "npy_logaddexp2"(double x, double y) + double logaddexp "npy_logaddexp"(double x, double y) + double logaddexp2 "npy_logaddexp2"(double x, double y) long double deg2radl "npy_deg2radl"(long double x) long double rad2degl "npy_rad2degl"(long double x) - long double logaddexpl "npy_logaddexpl"(long double x, long double y) - long double logaddexp2l "npy_logaddexp2l"(long double x, long double y) + long double logaddexpl "npy_logaddexpl"(long double x, long double y) + long double logaddexp2l "npy_logaddexp2l"(long double x, long double y) diff --git a/contrib/tools/cython/Cython/Includes/openmp.pxd b/contrib/tools/cython/Cython/Includes/openmp.pxd index 767dcf6efd..30873a588b 100644 --- a/contrib/tools/cython/Cython/Includes/openmp.pxd +++ b/contrib/tools/cython/Cython/Includes/openmp.pxd @@ -1,4 +1,4 @@ -cdef extern from "<omp.h>": +cdef extern from "<omp.h>": ctypedef struct omp_lock_t: pass ctypedef struct omp_nest_lock_t: diff --git a/contrib/tools/cython/Cython/Includes/posix/dlfcn.pxd b/contrib/tools/cython/Cython/Includes/posix/dlfcn.pxd index cc0b6ab93a..cff5bea15a 100644 --- a/contrib/tools/cython/Cython/Includes/posix/dlfcn.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/dlfcn.pxd @@ -1,14 +1,14 @@ -# POSIX dynamic linking/loading interface. -# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/dlfcn.h.html - -cdef extern from "<dlfcn.h>" nogil: - void *dlopen(const char *, int) - char *dlerror() - void *dlsym(void *, const char *) - int dlclose(void *) - - enum: - RTLD_LAZY - RTLD_NOW - RTLD_GLOBAL - RTLD_LOCAL +# POSIX dynamic linking/loading interface. +# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/dlfcn.h.html + +cdef extern from "<dlfcn.h>" nogil: + void *dlopen(const char *, int) + char *dlerror() + void *dlsym(void *, const char *) + int dlclose(void *) + + enum: + RTLD_LAZY + RTLD_NOW + RTLD_GLOBAL + RTLD_LOCAL diff --git a/contrib/tools/cython/Cython/Includes/posix/fcntl.pxd b/contrib/tools/cython/Cython/Includes/posix/fcntl.pxd index 889b2d9b96..9afc33a368 100644 --- a/contrib/tools/cython/Cython/Includes/posix/fcntl.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/fcntl.pxd @@ -1,6 +1,6 @@ # http://www.opengroup.org/onlinepubs/009695399/basedefs/fcntl.h.html -cdef extern from "<fcntl.h>" nogil: +cdef extern from "<fcntl.h>" nogil: enum: F_DUPFD enum: F_GETFD diff --git a/contrib/tools/cython/Cython/Includes/posix/ioctl.pxd b/contrib/tools/cython/Cython/Includes/posix/ioctl.pxd index b9e8814b8f..dacbc307f3 100644 --- a/contrib/tools/cython/Cython/Includes/posix/ioctl.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/ioctl.pxd @@ -1,4 +1,4 @@ -cdef extern from "<sys/ioctl.h>" nogil: +cdef extern from "<sys/ioctl.h>" nogil: enum: FIONBIO int ioctl(int fd, int request, ...) diff --git a/contrib/tools/cython/Cython/Includes/posix/mman.pxd b/contrib/tools/cython/Cython/Includes/posix/mman.pxd index 483547621a..c810f431b3 100644 --- a/contrib/tools/cython/Cython/Includes/posix/mman.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/mman.pxd @@ -1,99 +1,99 @@ -# http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/mman.h.html - -from posix.types cimport off_t, mode_t - -cdef extern from "<sys/mman.h>" nogil: - enum: PROT_EXEC # protection bits for mmap/mprotect - enum: PROT_READ - enum: PROT_WRITE - enum: PROT_NONE - - enum: MAP_PRIVATE # flag bits for mmap - enum: MAP_SHARED - enum: MAP_FIXED - enum: MAP_ANON # These three are not in POSIX, but are - enum: MAP_ANONYMOUS # fairly common in spelling/semantics - enum: MAP_STACK - - enum: MAP_LOCKED # Typically available only on Linux - enum: MAP_HUGETLB - enum: MAP_POPULATE - enum: MAP_NORESERVE - enum: MAP_GROWSDOWN - - enum: MAP_NOCORE # Typically available only on BSD - enum: MAP_NOSYNC - - void *MAP_FAILED - - void *mmap(void *addr, size_t Len, int prot, int flags, int fd, off_t off) - int munmap(void *addr, size_t Len) - int mprotect(void *addr, size_t Len, int prot) - - enum: MS_ASYNC - enum: MS_SYNC - enum: MS_INVALIDATE - int msync(void *addr, size_t Len, int flags) - - enum: POSIX_MADV_NORMAL # POSIX advice flags - enum: POSIX_MADV_SEQUENTIAL - enum: POSIX_MADV_RANDOM - enum: POSIX_MADV_WILLNEED - enum: POSIX_MADV_DONTNEED - int posix_madvise(void *addr, size_t Len, int advice) - - enum: MCL_CURRENT - enum: MCL_FUTURE - int mlock(const void *addr, size_t Len) - int munlock(const void *addr, size_t Len) - int mlockall(int flags) - int munlockall() - # Linux-specific - enum: MLOCK_ONFAULT - enum: MCL_ONFAULT - int mlock2(const void *addr, size_t len, int flags) - - int shm_open(const char *name, int oflag, mode_t mode) - int shm_unlink(const char *name) - - # often available - enum: MADV_NORMAL # pre-POSIX advice flags; should translate 1-1 to POSIX_* - enum: MADV_RANDOM # but in practice it is not always the same. - enum: MADV_SEQUENTIAL - enum: MADV_WILLNEED - enum: MADV_DONTNEED - enum: MADV_REMOVE # other pre-POSIX advice flags; often available - enum: MADV_DONTFORK - enum: MADV_DOFORK - enum: MADV_HWPOISON - enum: MADV_MERGEABLE, - enum: MADV_UNMERGEABLE - enum: MADV_SOFT_OFFLINE - enum: MADV_HUGEPAGE - enum: MADV_NOHUGEPAGE - enum: MADV_DONTDUMP - enum: MADV_DODUMP - enum: MADV_FREE - enum: MADV_WIPEONFORK - enum: MADV_KEEPONFORK - int madvise(void *addr, size_t Len, int advice) - - # sometimes available - int mincore(void *addr, size_t Len, unsigned char *vec) - - # These two are Linux specific but sometimes very efficient - void *mremap(void *old_addr, size_t old_len, size_t new_len, int flags, ...) - int remap_file_pages(void *addr, size_t Len, int prot, - size_t pgoff, int flags) - - # The rare but standardized typed memory option - enum: POSIX_TYPED_MEM_ALLOCATE - enum: POSIX_TYPED_MEM_ALLOCATE_CONTIG - enum: POSIX_TYPED_MEM_MAP_ALLOCATABLE - int posix_typed_mem_open(const char *name, int oflag, int tflag) - int posix_mem_offset(const void *addr, size_t Len, off_t *off, - size_t *contig_len, int *fildes) - - cdef struct posix_typed_mem_info: - size_t posix_tmi_length - int posix_typed_mem_get_info(int fildes, posix_typed_mem_info *info) +# http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/mman.h.html + +from posix.types cimport off_t, mode_t + +cdef extern from "<sys/mman.h>" nogil: + enum: PROT_EXEC # protection bits for mmap/mprotect + enum: PROT_READ + enum: PROT_WRITE + enum: PROT_NONE + + enum: MAP_PRIVATE # flag bits for mmap + enum: MAP_SHARED + enum: MAP_FIXED + enum: MAP_ANON # These three are not in POSIX, but are + enum: MAP_ANONYMOUS # fairly common in spelling/semantics + enum: MAP_STACK + + enum: MAP_LOCKED # Typically available only on Linux + enum: MAP_HUGETLB + enum: MAP_POPULATE + enum: MAP_NORESERVE + enum: MAP_GROWSDOWN + + enum: MAP_NOCORE # Typically available only on BSD + enum: MAP_NOSYNC + + void *MAP_FAILED + + void *mmap(void *addr, size_t Len, int prot, int flags, int fd, off_t off) + int munmap(void *addr, size_t Len) + int mprotect(void *addr, size_t Len, int prot) + + enum: MS_ASYNC + enum: MS_SYNC + enum: MS_INVALIDATE + int msync(void *addr, size_t Len, int flags) + + enum: POSIX_MADV_NORMAL # POSIX advice flags + enum: POSIX_MADV_SEQUENTIAL + enum: POSIX_MADV_RANDOM + enum: POSIX_MADV_WILLNEED + enum: POSIX_MADV_DONTNEED + int posix_madvise(void *addr, size_t Len, int advice) + + enum: MCL_CURRENT + enum: MCL_FUTURE + int mlock(const void *addr, size_t Len) + int munlock(const void *addr, size_t Len) + int mlockall(int flags) + int munlockall() + # Linux-specific + enum: MLOCK_ONFAULT + enum: MCL_ONFAULT + int mlock2(const void *addr, size_t len, int flags) + + int shm_open(const char *name, int oflag, mode_t mode) + int shm_unlink(const char *name) + + # often available + enum: MADV_NORMAL # pre-POSIX advice flags; should translate 1-1 to POSIX_* + enum: MADV_RANDOM # but in practice it is not always the same. + enum: MADV_SEQUENTIAL + enum: MADV_WILLNEED + enum: MADV_DONTNEED + enum: MADV_REMOVE # other pre-POSIX advice flags; often available + enum: MADV_DONTFORK + enum: MADV_DOFORK + enum: MADV_HWPOISON + enum: MADV_MERGEABLE, + enum: MADV_UNMERGEABLE + enum: MADV_SOFT_OFFLINE + enum: MADV_HUGEPAGE + enum: MADV_NOHUGEPAGE + enum: MADV_DONTDUMP + enum: MADV_DODUMP + enum: MADV_FREE + enum: MADV_WIPEONFORK + enum: MADV_KEEPONFORK + int madvise(void *addr, size_t Len, int advice) + + # sometimes available + int mincore(void *addr, size_t Len, unsigned char *vec) + + # These two are Linux specific but sometimes very efficient + void *mremap(void *old_addr, size_t old_len, size_t new_len, int flags, ...) + int remap_file_pages(void *addr, size_t Len, int prot, + size_t pgoff, int flags) + + # The rare but standardized typed memory option + enum: POSIX_TYPED_MEM_ALLOCATE + enum: POSIX_TYPED_MEM_ALLOCATE_CONTIG + enum: POSIX_TYPED_MEM_MAP_ALLOCATABLE + int posix_typed_mem_open(const char *name, int oflag, int tflag) + int posix_mem_offset(const void *addr, size_t Len, off_t *off, + size_t *contig_len, int *fildes) + + cdef struct posix_typed_mem_info: + size_t posix_tmi_length + int posix_typed_mem_get_info(int fildes, posix_typed_mem_info *info) diff --git a/contrib/tools/cython/Cython/Includes/posix/resource.pxd b/contrib/tools/cython/Cython/Includes/posix/resource.pxd index 1227724323..9f55c6ab4e 100644 --- a/contrib/tools/cython/Cython/Includes/posix/resource.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/resource.pxd @@ -1,9 +1,9 @@ # http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/resource.h.html -from posix.time cimport timeval +from posix.time cimport timeval from posix.types cimport id_t -cdef extern from "<sys/resource.h>" nogil: +cdef extern from "<sys/resource.h>" nogil: enum: PRIO_PROCESS enum: PRIO_PGRP diff --git a/contrib/tools/cython/Cython/Includes/posix/select.pxd b/contrib/tools/cython/Cython/Includes/posix/select.pxd index af9509ea43..46703df104 100644 --- a/contrib/tools/cython/Cython/Includes/posix/select.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/select.pxd @@ -1,19 +1,19 @@ -from .types cimport sigset_t -from .time cimport timeval, timespec - -cdef extern from "<sys/select.h>" nogil: - ctypedef struct fd_set: - pass - - int FD_SETSIZE - void FD_SET(int, fd_set*) - void FD_CLR(int, fd_set*) - bint FD_ISSET(int, fd_set*) - void FD_ZERO(fd_set*) - - int select(int nfds, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, const timeval *timeout) - - int pselect(int nfds, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, const timespec *timeout, - const sigset_t *sigmask) +from .types cimport sigset_t +from .time cimport timeval, timespec + +cdef extern from "<sys/select.h>" nogil: + ctypedef struct fd_set: + pass + + int FD_SETSIZE + void FD_SET(int, fd_set*) + void FD_CLR(int, fd_set*) + bint FD_ISSET(int, fd_set*) + void FD_ZERO(fd_set*) + + int select(int nfds, fd_set *readfds, fd_set *writefds, + fd_set *exceptfds, const timeval *timeout) + + int pselect(int nfds, fd_set *readfds, fd_set *writefds, + fd_set *exceptfds, const timespec *timeout, + const sigset_t *sigmask) diff --git a/contrib/tools/cython/Cython/Includes/posix/signal.pxd b/contrib/tools/cython/Cython/Includes/posix/signal.pxd index eafb164313..9fe7d9c36c 100644 --- a/contrib/tools/cython/Cython/Includes/posix/signal.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/signal.pxd @@ -2,7 +2,7 @@ from posix.types cimport pid_t, sigset_t, uid_t -cdef extern from "<signal.h>" nogil: +cdef extern from "<signal.h>" nogil: cdef union sigval: int sival_int @@ -12,7 +12,7 @@ cdef extern from "<signal.h>" nogil: int sigev_notify int sigev_signo sigval sigev_value - void sigev_notify_function(sigval) + void sigev_notify_function(sigval) ctypedef struct siginfo_t: int si_signo @@ -26,8 +26,8 @@ cdef extern from "<signal.h>" nogil: sigval si_value cdef struct sigaction_t "sigaction": - void sa_handler(int) - void sa_sigaction(int, siginfo_t *, void *) + void sa_handler(int) + void sa_sigaction(int, siginfo_t *, void *) sigset_t sa_mask int sa_flags @@ -68,6 +68,6 @@ cdef extern from "<signal.h>" nogil: int sigdelset (sigset_t *, int) int sigemptyset (sigset_t *) int sigfillset (sigset_t *) - int sigismember (const sigset_t *, int) + int sigismember (const sigset_t *, int) int sigaltstack(const stack_t *, stack_t *) diff --git a/contrib/tools/cython/Cython/Includes/posix/stat.pxd b/contrib/tools/cython/Cython/Includes/posix/stat.pxd index 30f1791ba5..69c2eca166 100644 --- a/contrib/tools/cython/Cython/Includes/posix/stat.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/stat.pxd @@ -2,7 +2,7 @@ from posix.types cimport (blkcnt_t, blksize_t, dev_t, gid_t, ino_t, mode_t, nlink_t, off_t, time_t, uid_t) -cdef extern from "<sys/stat.h>" nogil: +cdef extern from "<sys/stat.h>" nogil: cdef struct struct_stat "stat": dev_t st_dev ino_t st_ino @@ -24,7 +24,7 @@ cdef extern from "<sys/stat.h>" nogil: time_t st_birthtime # POSIX prescribes including both <sys/stat.h> and <unistd.h> for these -cdef extern from "<unistd.h>" nogil: +cdef extern from "<unistd.h>" nogil: int fchmod(int, mode_t) int chmod(const char *, mode_t) diff --git a/contrib/tools/cython/Cython/Includes/posix/stdio.pxd b/contrib/tools/cython/Cython/Includes/posix/stdio.pxd index 327fbb3cb6..53913fdf45 100644 --- a/contrib/tools/cython/Cython/Includes/posix/stdio.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/stdio.pxd @@ -1,37 +1,37 @@ -# POSIX additions to <stdio.h>. -# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stdio.h.html - -from libc.stdio cimport FILE -from libc.stddef cimport wchar_t -from posix.types cimport off_t - -cdef extern from "<stdio.h>" nogil: - # File descriptors - FILE *fdopen(int, const char *) - int fileno(FILE *) - - # Pipes - FILE *popen(const char *, const char *) - int pclose(FILE *) - - # Memory streams (POSIX.2008) - FILE *fmemopen(void *, size_t, const char *) - FILE *open_memstream(char **, size_t *) - FILE *open_wmemstream(wchar_t **, size_t *) - - # Seek and tell with off_t - int fseeko(FILE *, off_t, int) - off_t ftello(FILE *) - - # Locking (for multithreading) - void flockfile(FILE *) - int ftrylockfile(FILE *) - void funlockfile(FILE *) - int getc_unlocked(FILE *) - int getchar_unlocked() - int putc_unlocked(int, FILE *) - int putchar_unlocked(int) - - # Reading lines and records (POSIX.2008) - ssize_t getline(char **, size_t *, FILE *) - ssize_t getdelim(char **, size_t *, int, FILE *) +# POSIX additions to <stdio.h>. +# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stdio.h.html + +from libc.stdio cimport FILE +from libc.stddef cimport wchar_t +from posix.types cimport off_t + +cdef extern from "<stdio.h>" nogil: + # File descriptors + FILE *fdopen(int, const char *) + int fileno(FILE *) + + # Pipes + FILE *popen(const char *, const char *) + int pclose(FILE *) + + # Memory streams (POSIX.2008) + FILE *fmemopen(void *, size_t, const char *) + FILE *open_memstream(char **, size_t *) + FILE *open_wmemstream(wchar_t **, size_t *) + + # Seek and tell with off_t + int fseeko(FILE *, off_t, int) + off_t ftello(FILE *) + + # Locking (for multithreading) + void flockfile(FILE *) + int ftrylockfile(FILE *) + void funlockfile(FILE *) + int getc_unlocked(FILE *) + int getchar_unlocked() + int putc_unlocked(int, FILE *) + int putchar_unlocked(int) + + # Reading lines and records (POSIX.2008) + ssize_t getline(char **, size_t *, FILE *) + ssize_t getdelim(char **, size_t *, int, FILE *) diff --git a/contrib/tools/cython/Cython/Includes/posix/stdlib.pxd b/contrib/tools/cython/Cython/Includes/posix/stdlib.pxd index e276ddac92..513de938a8 100644 --- a/contrib/tools/cython/Cython/Includes/posix/stdlib.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/stdlib.pxd @@ -1,7 +1,7 @@ # POSIX additions to <stdlib.h> # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stdlib.h.html -cdef extern from "<stdlib.h>" nogil: +cdef extern from "<stdlib.h>" nogil: void _Exit(int) double drand48() double erand48(unsigned short *) diff --git a/contrib/tools/cython/Cython/Includes/posix/strings.pxd b/contrib/tools/cython/Cython/Includes/posix/strings.pxd index 40d33e11eb..6ee48491eb 100644 --- a/contrib/tools/cython/Cython/Includes/posix/strings.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/strings.pxd @@ -1,9 +1,9 @@ -cdef extern from "<strings.h>" nogil: - int bcmp(const void *, const void *, size_t) - void bcopy(const void *, void *, size_t) - void bzero(void *, size_t) - int ffs(int) - char *index(const char *, int) - char *rindex(const char *, int) - int strcasecmp(const char *, const char *) - int strncasecmp(const char *, const char *, size_t) +cdef extern from "<strings.h>" nogil: + int bcmp(const void *, const void *, size_t) + void bcopy(const void *, void *, size_t) + void bzero(void *, size_t) + int ffs(int) + char *index(const char *, int) + char *rindex(const char *, int) + int strcasecmp(const char *, const char *) + int strncasecmp(const char *, const char *, size_t) diff --git a/contrib/tools/cython/Cython/Includes/posix/time.pxd b/contrib/tools/cython/Cython/Includes/posix/time.pxd index 0c67ddc3a4..6bc81bfea0 100644 --- a/contrib/tools/cython/Cython/Includes/posix/time.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/time.pxd @@ -1,9 +1,9 @@ # http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/time.h.html -from posix.types cimport suseconds_t, time_t, clockid_t, timer_t +from posix.types cimport suseconds_t, time_t, clockid_t, timer_t from posix.signal cimport sigevent -cdef extern from "<sys/time.h>" nogil: +cdef extern from "<sys/time.h>" nogil: enum: CLOCK_REALTIME enum: TIMER_ABSTIME enum: CLOCK_MONOTONIC @@ -32,18 +32,18 @@ cdef extern from "<sys/time.h>" nogil: enum: ITIMER_VIRTUAL enum: ITIMER_PROF - cdef struct timezone: - int tz_minuteswest - int dsttime - + cdef struct timezone: + int tz_minuteswest + int dsttime + cdef struct timeval: time_t tv_sec suseconds_t tv_usec - cdef struct timespec: - time_t tv_sec - long tv_nsec - + cdef struct timespec: + time_t tv_sec + long tv_nsec + cdef struct itimerval: timeval it_interval timeval it_value @@ -52,20 +52,20 @@ cdef extern from "<sys/time.h>" nogil: timespec it_interval timespec it_value - int nanosleep(const timespec *, timespec *) + int nanosleep(const timespec *, timespec *) + + int getitimer(int, itimerval *) + int gettimeofday(timeval *tp, timezone *tzp) + int setitimer(int, const itimerval *, itimerval *) - int getitimer(int, itimerval *) - int gettimeofday(timeval *tp, timezone *tzp) - int setitimer(int, const itimerval *, itimerval *) + int clock_getcpuclockid(pid_t, clockid_t *) + int clock_getres(clockid_t, timespec *) + int clock_gettime(clockid_t, timespec *) + int clock_nanosleep(clockid_t, int, const timespec *, timespec *) + int clock_settime(clockid_t, const timespec *) - int clock_getcpuclockid(pid_t, clockid_t *) - int clock_getres(clockid_t, timespec *) - int clock_gettime(clockid_t, timespec *) - int clock_nanosleep(clockid_t, int, const timespec *, timespec *) - int clock_settime(clockid_t, const timespec *) - - int timer_create(clockid_t, sigevent *, timer_t *) - int timer_delete(timer_t) - int timer_gettime(timer_t, itimerspec *) - int timer_getoverrun(timer_t) - int timer_settime(timer_t, int, const itimerspec *, itimerspec *) + int timer_create(clockid_t, sigevent *, timer_t *) + int timer_delete(timer_t) + int timer_gettime(timer_t, itimerspec *) + int timer_getoverrun(timer_t) + int timer_settime(timer_t, int, const itimerspec *, itimerspec *) diff --git a/contrib/tools/cython/Cython/Includes/posix/types.pxd b/contrib/tools/cython/Cython/Includes/posix/types.pxd index b74bba3a8f..308f2954ee 100644 --- a/contrib/tools/cython/Cython/Includes/posix/types.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/types.pxd @@ -1,23 +1,23 @@ -# Note that the actual size of these types is system-dependent, and -# can't be detected at C compile time. However, the generated C code -# will correctly use the actual size of these types *except* for -# determining promotion in binary arithmetic expressions involving -# mixed types. In this case, operands are promoted to the declared -# larger type, with a bias towards typedef types. Thus, with the -# declarations below, long + time_t will result in a time_t whereas -# long long + time_t will result in a long long which should be -# acceptable for either 32-bit or 64-bit signed time_t (though admittedly -# the POSIX standard doesn't even specify that time_t must be an integral -# type). - -cdef extern from "<sys/types.h>": +# Note that the actual size of these types is system-dependent, and +# can't be detected at C compile time. However, the generated C code +# will correctly use the actual size of these types *except* for +# determining promotion in binary arithmetic expressions involving +# mixed types. In this case, operands are promoted to the declared +# larger type, with a bias towards typedef types. Thus, with the +# declarations below, long + time_t will result in a time_t whereas +# long long + time_t will result in a long long which should be +# acceptable for either 32-bit or 64-bit signed time_t (though admittedly +# the POSIX standard doesn't even specify that time_t must be an integral +# type). + +cdef extern from "<sys/types.h>": ctypedef long blkcnt_t ctypedef long blksize_t ctypedef long clockid_t ctypedef long dev_t ctypedef long gid_t ctypedef long id_t - ctypedef unsigned long ino_t + ctypedef unsigned long ino_t ctypedef long mode_t ctypedef long nlink_t ctypedef long off_t diff --git a/contrib/tools/cython/Cython/Includes/posix/unistd.pxd b/contrib/tools/cython/Cython/Includes/posix/unistd.pxd index bd7c3daa49..1afeca3854 100644 --- a/contrib/tools/cython/Cython/Includes/posix/unistd.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/unistd.pxd @@ -2,7 +2,7 @@ from posix.types cimport gid_t, pid_t, off_t, uid_t -cdef extern from "<unistd.h>" nogil: +cdef extern from "<unistd.h>" nogil: #:NULL diff --git a/contrib/tools/cython/Cython/Includes/posix/wait.pxd b/contrib/tools/cython/Cython/Includes/posix/wait.pxd index 6041d02eb1..d18cff9cf8 100644 --- a/contrib/tools/cython/Cython/Includes/posix/wait.pxd +++ b/contrib/tools/cython/Cython/Includes/posix/wait.pxd @@ -1,38 +1,38 @@ -# http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/wait.h.html - -from posix.types cimport pid_t, id_t -from posix.signal cimport siginfo_t -from posix.resource cimport rusage - -cdef extern from "<sys/wait.h>" nogil: - enum: WNOHANG - enum: WUNTRACED - enum: WCONTINUED - enum: WEXITED - enum: WSTOPPED - enum: WNOWAIT - - int WEXITSTATUS(int status) - int WIFCONTINUED(int status) - int WIFEXITED(int status) - int WIFSIGNALED(int status) - int WIFSTOPPED(int status) - int WSTOPSIG(int status) - int WTERMSIG(int status) - - ctypedef int idtype_t - enum: P_ALL # idtype_t values - enum: P_PID - enum: P_PGID - - pid_t wait(int *stat_loc) - pid_t waitpid(pid_t pid, int *status, int options) - int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options) - -# wait3 was in POSIX until 2008 while wait4 was never standardized. -# Even so, these calls are in almost every Unix, always in sys/wait.h. -# Hence, posix.wait is the least surprising place to declare them for Cython. -# libc may require _XXX_SOURCE to be defined at C-compile time to provide them. - - pid_t wait3(int *status, int options, rusage *rusage) - pid_t wait4(pid_t pid, int *status, int options, rusage *rusage) +# http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/wait.h.html + +from posix.types cimport pid_t, id_t +from posix.signal cimport siginfo_t +from posix.resource cimport rusage + +cdef extern from "<sys/wait.h>" nogil: + enum: WNOHANG + enum: WUNTRACED + enum: WCONTINUED + enum: WEXITED + enum: WSTOPPED + enum: WNOWAIT + + int WEXITSTATUS(int status) + int WIFCONTINUED(int status) + int WIFEXITED(int status) + int WIFSIGNALED(int status) + int WIFSTOPPED(int status) + int WSTOPSIG(int status) + int WTERMSIG(int status) + + ctypedef int idtype_t + enum: P_ALL # idtype_t values + enum: P_PID + enum: P_PGID + + pid_t wait(int *stat_loc) + pid_t waitpid(pid_t pid, int *status, int options) + int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options) + +# wait3 was in POSIX until 2008 while wait4 was never standardized. +# Even so, these calls are in almost every Unix, always in sys/wait.h. +# Hence, posix.wait is the least surprising place to declare them for Cython. +# libc may require _XXX_SOURCE to be defined at C-compile time to provide them. + + pid_t wait3(int *status, int options, rusage *rusage) + pid_t wait4(pid_t pid, int *status, int options, rusage *rusage) |