diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 628f998..957ab50 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9, '3.10'] + python-version: ['3.10', '3.11', '3.12', '3.13', '3.14'] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c64eb5b..3930f64 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -4,19 +4,45 @@ on: push: branches: - master + pull_request: + release: + types: [published] jobs: + build_sdist: + name: Build source distribution + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - uses: actions/setup-python@v2 + with: + python-version: '3.10' + + - name: Build sdist + run: | + python -m pip install build + python -m build --sdist + + - uses: actions/upload-artifact@v4 + with: + name: cibw-sdist + path: dist/*.tar.gz + build_wheels: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macOS-latest] + os: [ubuntu-22.04, windows-2022, macos-14] env: CIBW_SKIP: pp* CIBW_ARCHS_MACOS: x86_64 arm64 CIBW_ARCHS_LINUX: x86_64 aarch64 + # Build only for Python 3.10 since we're using stable ABI + # The resulting abi3 wheels will work for Python 3.10+ + CIBW_BUILD: cp310-* steps: - uses: actions/checkout@v2 @@ -40,8 +66,10 @@ jobs: path: ./wheelhouse/*.whl upload_pypi: - needs: [build_wheels] + needs: [build_wheels, build_sdist] runs-on: ubuntu-latest + # Only upload to PyPI on releases + if: github.event_name == 'release' && github.event.action == 'published' steps: - uses: actions/download-artifact@v4 with: diff --git a/README.md b/README.md index ea3ff7d..6481b15 100644 --- a/README.md +++ b/README.md @@ -58,4 +58,4 @@ The wrapper was generated with [SWIG](http://www.swig.org/). Binary wheels are provided via [PyPI](https://pypi.python.org/pypi/rundec) for Linux, macOS, and Windows (built with [GitHub Actions](https://github.com/features/actions)). -The Windows wheels require Python 3.5+, on Linux and macOS Python 2.7+ is sufficient. +Python 3.10+ is supported. \ No newline at end of file diff --git a/_rundec.cc b/_rundec.cc index b2b6e1e..db27e7e 100644 --- a/_rundec.cc +++ b/_rundec.cc @@ -1,16 +1,20 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (https://www.swig.org). - * Version 4.2.0 + * Version 4.3.0 * * Do not make changes to this file unless you know what you are doing - modify * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ +#define Py_LIMITED_API 0x030A0000 -#define SWIG_VERSION 0x040200 + + +#define SWIG_VERSION 0x040300 #define SWIGPYTHON #define SWIG_PYTHON_DIRECTOR_NO_VTABLE +#define SWIG_name "_rundec" /* ----------------------------------------------------------------------------- * This section contains generic SWIG labels for method/variable * declarations/attributes, and other compiler dependent labels. @@ -135,12 +139,21 @@ # pragma warning disable 592 #endif -#if __cplusplus >=201103L +#if defined(__cplusplus) && __cplusplus >=201103L # define SWIG_NULLPTR nullptr #else # define SWIG_NULLPTR NULL #endif +/* ----------------------------------------------------------------------------- + * swigcompat.swg + * + * Macros to provide support compatibility with older C and C++ standards. + * + * Note that SWIG expects __cplusplus to be defined to the appropriate C++ standard. + * MSVC users are urged to check and examine the /Zc:__cplusplus compiler option. + * See https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus. + * ----------------------------------------------------------------------------- */ /* C99 and C++11 should provide snprintf, but define SWIG_NO_SNPRINTF * if you're missing it. @@ -161,7 +174,6 @@ #endif - #if defined(__GNUC__) && defined(_WIN32) && !defined(SWIG_PYTHON_NO_HYPOT_WORKAROUND) /* Workaround for '::hypot' has not been declared', see https://bugs.python.org/issue11566 */ # include @@ -194,10 +206,25 @@ # include #endif +#if !defined(SWIGPYTHON_BUILTIN) && PY_VERSION_HEX >= 0x03030000 +# define SWIG_HEAPTYPES + +/* Note: Currently this won't activate - it is in place ready for when the + * SWIGPYTHON_BUILTIN condition above gets removed. */ +# if PY_VERSION_HEX < 0x030c0000 && defined(SWIGPYTHON_BUILTIN) +# include +# define Py_READONLY READONLY +# define Py_T_PYSSIZET T_PYSSIZET +# endif +#endif + #if __GNUC__ >= 7 #pragma GCC diagnostic pop #endif +#include +#include + /* ----------------------------------------------------------------------------- * swigrun.swg * @@ -815,10 +842,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { #endif -#ifndef Py_TYPE -# define Py_TYPE(op) ((op)->ob_type) -#endif - /* SWIG APIs for compatibility of both Python 2 & 3 */ #if PY_VERSION_HEX >= 0x03000000 @@ -828,28 +851,30 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { #endif -SWIGINTERN char* -SWIG_Python_str_AsChar(PyObject *str) +/* Wrapper around PyUnicode_AsUTF8AndSize - call Py_XDECREF on the returned pbytes when finished with the returned string */ +SWIGINTERN const char * +SWIG_PyUnicode_AsUTF8AndSize(PyObject *str, Py_ssize_t *psize, PyObject **pbytes) { #if PY_VERSION_HEX >= 0x03030000 # if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030A0000 - return (char*)PyUnicode_AsUTF8AndSize(str, NULL); + *pbytes = NULL; + return PyUnicode_AsUTF8AndSize(str, psize); # else - PyObject* bytes = PyUnicode_AsUTF8String(str); - char* chars = PyBytes_AsString(bytes); - Py_DECREF(bytes); + const char *chars; + *pbytes = PyUnicode_AsUTF8String(str); + chars = *pbytes ? PyBytes_AsString(*pbytes) : NULL; + if (chars && psize) + *psize = PyBytes_Size(*pbytes); return chars; # endif #else - return PyString_AsString(str); + char *chars = NULL; + *pbytes = NULL; + PyString_AsStringAndSize(str, &chars, psize); + return chars; #endif } -/* Was useful for Python 3.0.x-3.2.x - now provided only for compatibility - * with any uses in user interface files. */ -#define SWIG_Python_str_DelForPy3(x) - - SWIGINTERN PyObject* SWIG_Python_str_FromChar(const char *c) { @@ -860,10 +885,6 @@ SWIG_Python_str_FromChar(const char *c) #endif } -#ifndef PyObject_DEL -# define PyObject_DEL PyObject_Del -#endif - /* SWIGPY_USE_CAPSULE is no longer used within SWIG itself, but some user interface files check for it. */ # define SWIGPY_USE_CAPSULE #ifdef SWIGPYTHON_BUILTIN @@ -879,6 +900,33 @@ SWIG_Python_str_FromChar(const char *c) #define Py_hash_t long #endif +#ifdef Py_LIMITED_API +# define PyTuple_GET_ITEM PyTuple_GetItem +/* Note that PyTuple_SetItem() has different semantics from PyTuple_SET_ITEM as it decref's the original tuple item, so in general they cannot be used + interchangeably. However in SWIG-generated code PyTuple_SET_ITEM is only used with newly initialized tuples without any items and for them this does work. */ +# define PyTuple_SET_ITEM PyTuple_SetItem +# define PyTuple_GET_SIZE PyTuple_Size +# define PyCFunction_GET_FLAGS PyCFunction_GetFlags +# define PyCFunction_GET_FUNCTION PyCFunction_GetFunction +# define PyCFunction_GET_SELF PyCFunction_GetSelf +# define PyList_GET_ITEM PyList_GetItem +# define PyList_SET_ITEM PyList_SetItem +# define PySliceObject PyObject +#endif + +/* Increment and Decrement wrappers - for portability when using the stable abi and for performance otherwise */ +#ifdef Py_LIMITED_API +# define SWIG_Py_INCREF Py_IncRef +# define SWIG_Py_XINCREF Py_IncRef +# define SWIG_Py_DECREF Py_DecRef +# define SWIG_Py_XDECREF Py_DecRef +#else +# define SWIG_Py_INCREF Py_INCREF +# define SWIG_Py_XINCREF Py_XINCREF +# define SWIG_Py_DECREF Py_DECREF +# define SWIG_Py_XDECREF Py_XDECREF +#endif + /* ----------------------------------------------------------------------------- * error manipulation * ----------------------------------------------------------------------------- */ @@ -920,6 +968,9 @@ SWIG_Python_ErrorType(int code) { case SWIG_AttributeError: type = PyExc_AttributeError; break; + case SWIG_NullReferenceError: + type = PyExc_TypeError; + break; default: type = PyExc_RuntimeError; } @@ -938,15 +989,17 @@ SWIG_Python_AddErrorMsg(const char* mesg) PyErr_Fetch(&type, &value, &traceback); if (value) { PyObject *old_str = PyObject_Str(value); - const char *tmp = SWIG_Python_str_AsChar(old_str); + PyObject *bytes = NULL; + const char *tmp = SWIG_PyUnicode_AsUTF8AndSize(old_str, NULL, &bytes); PyErr_Clear(); - Py_XINCREF(type); + SWIG_Py_XINCREF(type); if (tmp) PyErr_Format(type, "%s %s", tmp, mesg); else PyErr_Format(type, "%s", mesg); - Py_DECREF(old_str); - Py_DECREF(value); + SWIG_Py_XDECREF(bytes); + SWIG_Py_DECREF(old_str); + SWIG_Py_DECREF(value); } else { PyErr_SetString(PyExc_RuntimeError, mesg); } @@ -976,7 +1029,7 @@ SWIG_Python_RaiseOrModifyTypeError(const char *message) newvalue = PyString_FromFormat("%s\nAdditional information:\n%s", PyString_AsString(value), message); #endif if (newvalue) { - Py_XDECREF(value); + SWIG_Py_XDECREF(value); PyErr_Restore(type, newvalue, traceback); } else { PyErr_Restore(type, value, traceback); @@ -1017,7 +1070,7 @@ SWIG_Python_RaiseOrModifyTypeError(const char *message) bool status; PyThreadState *save; public: - void end() { if (status) { PyEval_RestoreThread(save); status = false; }} + void end() { if (status) { status = false; PyEval_RestoreThread(save); }} SWIG_Python_Thread_Allow() : status(true), save(PyEval_SaveThread()) {} ~SWIG_Python_Thread_Allow() { end(); } }; @@ -1161,7 +1214,7 @@ SWIGINTERN void SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) { SWIG_PYTHON_THREAD_BEGIN_BLOCK; PyErr_SetObject(errtype, obj); - Py_DECREF(obj); + SWIG_Py_DECREF(obj); SWIG_PYTHON_THREAD_END_BLOCK; } @@ -1182,13 +1235,13 @@ SWIGINTERN void SwigPyBuiltin_AddPublicSymbol(PyObject *seq, const char *key) { PyObject *s = PyString_InternFromString(key); PyList_Append(seq, s); - Py_DECREF(s); + SWIG_Py_DECREF(s); } SWIGINTERN void SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *name, PyObject *obj) { PyDict_SetItemString(d, name, obj); - Py_DECREF(obj); + SWIG_Py_DECREF(obj); if (public_interface) SwigPyBuiltin_AddPublicSymbol(public_interface, name); } @@ -1198,7 +1251,7 @@ SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *nam SWIGINTERN void SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) { PyDict_SetItemString(d, name, obj); - Py_DECREF(obj); + SWIG_Py_DECREF(obj); } #endif @@ -1206,11 +1259,11 @@ SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) { /* Append a value to the result obj */ SWIGINTERN PyObject* -SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) { +SWIG_Python_AppendOutput(PyObject* result, PyObject* obj, int is_void) { if (!result) { result = obj; - } else if (result == Py_None) { - Py_DECREF(result); + } else if (result == Py_None && is_void) { + SWIG_Py_DECREF(result); result = obj; } else { if (!PyList_Check(result)) { @@ -1219,12 +1272,12 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) { if (result) { PyList_SET_ITEM(result, 0, o2); } else { - Py_DECREF(obj); + SWIG_Py_DECREF(obj); return o2; } } PyList_Append(result,obj); - Py_DECREF(obj); + SWIG_Py_DECREF(obj); } return result; } @@ -1348,21 +1401,21 @@ swig_varlink_str(PyObject *o) { for (var = v->vars; var; var=var->next) { tail = PyUnicode_FromString(var->name); joined = PyUnicode_Concat(str, tail); - Py_DecRef(str); - Py_DecRef(tail); + SWIG_Py_DECREF(str); + SWIG_Py_DECREF(tail); str = joined; if (var->next) { tail = PyUnicode_InternFromString(", "); joined = PyUnicode_Concat(str, tail); - Py_DecRef(str); - Py_DecRef(tail); + SWIG_Py_DECREF(str); + SWIG_Py_DECREF(tail); str = joined; } } tail = PyUnicode_InternFromString(")"); joined = PyUnicode_Concat(str, tail); - Py_DecRef(str); - Py_DecRef(tail); + SWIG_Py_DECREF(str); + SWIG_Py_DECREF(tail); str = joined; #else PyObject *str = PyString_FromString("("); @@ -1427,6 +1480,7 @@ swig_varlink_setattr(PyObject *o, char *n, PyObject *p) { SWIGINTERN PyTypeObject* swig_varlink_type(void) { static char varlink__doc__[] = "Swig var link object"; +#ifndef SWIG_HEAPTYPES static PyTypeObject varlink_type; static int type_init = 0; if (!type_init) { @@ -1442,9 +1496,9 @@ swig_varlink_type(void) { 0, /* tp_itemsize */ (destructor) swig_varlink_dealloc, /* tp_dealloc */ #if PY_VERSION_HEX < 0x030800b4 - (printfunc)0, /*tp_print*/ + (printfunc)0, /* tp_print */ #else - (Py_ssize_t)0, /*tp_vectorcall_offset*/ + (Py_ssize_t)0, /* tp_vectorcall_offset */ #endif (getattrfunc) swig_varlink_getattr, /* tp_getattr */ (setattrfunc) swig_varlink_setattr, /* tp_setattr */ @@ -1477,6 +1531,12 @@ swig_varlink_type(void) { #if (PY_VERSION_HEX >= 0x03080000) && (PY_VERSION_HEX < 0x03090000) 0, /* tp_print */ #endif +#if PY_VERSION_HEX >= 0x030c0000 + 0, /* tp_watched */ +#endif +#if PY_VERSION_HEX >= 0x030d00a4 + 0, /* tp_versions_used */ +#endif #ifdef COUNT_ALLOCS 0, /* tp_allocs */ 0, /* tp_frees */ @@ -1491,12 +1551,31 @@ swig_varlink_type(void) { return NULL; } return &varlink_type; +#else + PyType_Slot slots[] = { + { Py_tp_dealloc, (void *)swig_varlink_dealloc }, + { Py_tp_repr, (void *)swig_varlink_repr }, + { Py_tp_getattr, (void *)swig_varlink_getattr }, + { Py_tp_setattr, (void *)swig_varlink_setattr }, + { Py_tp_str, (void *)swig_varlink_str }, + { Py_tp_doc, (void *)varlink__doc__ }, + { 0, NULL } + }; + PyType_Spec spec = { + "swigvarlink", + sizeof(swig_varlinkobject), + 0, + Py_TPFLAGS_DEFAULT, + slots + }; + return (PyTypeObject *)PyType_FromSpec(&spec); +#endif } /* Create a variable linking object for use later */ SWIGINTERN PyObject * SWIG_Python_newvarlink(void) { - swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type()); + swig_varlinkobject *result = PyObject_New(swig_varlinkobject, swig_varlink_type()); if (result) { result->vars = 0; } @@ -1558,7 +1637,7 @@ SWIGRUNTIMEINLINE PyObject * SWIG_Py_Void(void) { PyObject *none = Py_None; - Py_INCREF(none); + SWIG_Py_INCREF(none); return none; } @@ -1601,27 +1680,27 @@ SwigPyClientData_New(PyObject* obj) SwigPyClientData *data = (SwigPyClientData *)malloc(sizeof(SwigPyClientData)); /* the klass element */ data->klass = obj; - Py_INCREF(data->klass); + SWIG_Py_INCREF(data->klass); /* the newraw method and newargs arguments used to create a new raw instance */ if (PyClass_Check(obj)) { data->newraw = 0; - Py_INCREF(obj); + SWIG_Py_INCREF(obj); data->newargs = obj; } else { data->newraw = PyObject_GetAttrString(data->klass, "__new__"); if (data->newraw) { data->newargs = PyTuple_New(1); if (data->newargs) { - Py_INCREF(obj); + SWIG_Py_INCREF(obj); PyTuple_SET_ITEM(data->newargs, 0, obj); } else { - Py_DECREF(data->newraw); - Py_DECREF(data->klass); + SWIG_Py_DECREF(data->newraw); + SWIG_Py_DECREF(data->klass); free(data); return 0; } } else { - Py_INCREF(obj); + SWIG_Py_INCREF(obj); data->newargs = obj; } } @@ -1645,10 +1724,10 @@ SwigPyClientData_New(PyObject* obj) SWIGRUNTIME void SwigPyClientData_Del(SwigPyClientData *data) { - Py_XDECREF(data->klass); - Py_XDECREF(data->newraw); - Py_XDECREF(data->newargs); - Py_XDECREF(data->destroy); + SWIG_Py_XDECREF(data->klass); + SWIG_Py_XDECREF(data->newraw); + SWIG_Py_XDECREF(data->newargs); + SWIG_Py_XDECREF(data->destroy); free(data); } @@ -1676,7 +1755,7 @@ SwigPyObject_get___dict__(PyObject *v, PyObject *SWIGUNUSEDPARM(args)) if (!sobj->dict) sobj->dict = PyDict_New(); - Py_XINCREF(sobj->dict); + SWIG_Py_XINCREF(sobj->dict); return sobj->dict; } @@ -1705,10 +1784,10 @@ SwigPyObject_format(const char* fmt, SwigPyObject *v) #else res = PyString_Format(ofmt,args); #endif - Py_DECREF(ofmt); + SWIG_Py_DECREF(ofmt); } } - Py_DECREF(args); + SWIG_Py_DECREF(args); } return res; } @@ -1735,14 +1814,14 @@ SwigPyObject_repr(SwigPyObject *v) if (nrep) { # if PY_VERSION_HEX >= 0x03000000 PyObject *joined = PyUnicode_Concat(repr, nrep); - Py_DecRef(repr); - Py_DecRef(nrep); + SWIG_Py_DECREF(repr); + SWIG_Py_DECREF(nrep); repr = joined; # else PyString_ConcatAndDel(&repr,nrep); # endif } else { - Py_DecRef(repr); + SWIG_Py_DECREF(repr); repr = NULL; } } @@ -1769,12 +1848,14 @@ SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w) SWIGRUNTIME PyObject* SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op) { - PyObject* res; - if( op != Py_EQ && op != Py_NE ) { - Py_INCREF(Py_NotImplemented); - return Py_NotImplemented; + PyObject* res = NULL; + if (!PyErr_Occurred()) { + if (op != Py_EQ && op != Py_NE) { + SWIG_Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; + } + res = PyBool_FromLong( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) ? 1 : 0); } - res = PyBool_FromLong( (SwigPyObject_compare(v, w)==0) == (op == Py_EQ) ? 1 : 0); return res; } @@ -1802,14 +1883,29 @@ SwigPyObject_type(void) { SWIGRUNTIMEINLINE int SwigPyObject_Check(PyObject *op) { -#ifdef SWIGPYTHON_BUILTIN PyTypeObject *target_tp = SwigPyObject_type(); - if (PyType_IsSubtype(op->ob_type, target_tp)) + PyTypeObject *op_type = Py_TYPE(op); +#ifdef SWIGPYTHON_BUILTIN + if (PyType_IsSubtype(op_type, target_tp)) return 1; - return (strcmp(op->ob_type->tp_name, "SwigPyObject") == 0); + return (strcmp(op_type->tp_name, "SwigPyObject") == 0); #else - return (Py_TYPE(op) == SwigPyObject_type()) - || (strcmp(Py_TYPE(op)->tp_name,"SwigPyObject") == 0); +# ifdef Py_LIMITED_API + int cmp; + PyObject *tp_name; +#endif + if (op_type == target_tp) + return 1; +# ifdef Py_LIMITED_API + tp_name = PyObject_GetAttrString((PyObject *)op_type, "__name__"); + if (!tp_name) + return 0; + cmp = PyUnicode_CompareWithASCIIString(tp_name, "SwigPyObject"); + SWIG_Py_DECREF(tp_name); + return cmp == 0; +# else + return (strcmp(op_type->tp_name, "SwigPyObject") == 0); +# endif #endif } @@ -1849,7 +1945,7 @@ SwigPyObject_dealloc(PyObject *v) } else { res = 0; } - Py_XDECREF(tmp); + SWIG_Py_XDECREF(tmp); } else { PyCFunction meth = PyCFunction_GET_FUNCTION(destroy); PyObject *mself = PyCFunction_GET_SELF(destroy); @@ -1860,7 +1956,7 @@ SwigPyObject_dealloc(PyObject *v) PyErr_Restore(type, value, traceback); - Py_XDECREF(res); + SWIG_Py_XDECREF(res); } #if !defined(SWIG_PYTHON_SILENT_MEMLEAK) else { @@ -1868,13 +1964,13 @@ SwigPyObject_dealloc(PyObject *v) printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown")); } #endif - Py_XDECREF(Swig_Capsule_global); + SWIG_Py_XDECREF(Swig_Capsule_global); } - Py_XDECREF(next); + SWIG_Py_XDECREF(next); #ifdef SWIGPYTHON_BUILTIN - Py_XDECREF(sobj->dict); + SWIG_Py_XDECREF(sobj->dict); #endif - PyObject_DEL(v); + PyObject_Free(v); } SWIGRUNTIME PyObject* @@ -1887,7 +1983,7 @@ SwigPyObject_append(PyObject* v, PyObject* next) } ((SwigPyObject *)next)->next = sobj->next; sobj->next = next; - Py_INCREF(next); + SWIG_Py_INCREF(next); return SWIG_Py_Void(); } @@ -1896,7 +1992,7 @@ SwigPyObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) { SwigPyObject *sobj = (SwigPyObject *) v; if (sobj->next) { - Py_INCREF(sobj->next); + SWIG_Py_INCREF(sobj->next); return sobj->next; } else { return SWIG_Py_Void(); @@ -1930,9 +2026,9 @@ SwigPyObject_own(PyObject *v, PyObject *args) PyObject *obj = PyBool_FromLong(sobj->own); if (val) { if (PyObject_IsTrue(val)) { - Py_DECREF(SwigPyObject_acquire(v,args)); + SWIG_Py_DECREF(SwigPyObject_acquire(v,args)); } else { - Py_DECREF(SwigPyObject_disown(v,args)); + SWIG_Py_DECREF(SwigPyObject_disown(v,args)); } } return obj; @@ -1953,7 +2049,7 @@ swigobject_methods[] = { SWIGRUNTIME PyTypeObject* SwigPyObject_TypeOnce(void) { static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer"; - +#ifndef SWIG_HEAPTYPES static PyNumberMethods SwigPyObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -2013,9 +2109,9 @@ SwigPyObject_TypeOnce(void) { 0, /* tp_itemsize */ (destructor)SwigPyObject_dealloc, /* tp_dealloc */ #if PY_VERSION_HEX < 0x030800b4 - (printfunc)0, /*tp_print*/ + (printfunc)0, /* tp_print */ #else - (Py_ssize_t)0, /*tp_vectorcall_offset*/ + (Py_ssize_t)0, /* tp_vectorcall_offset */ #endif (getattrfunc)0, /* tp_getattr */ (setattrfunc)0, /* tp_setattr */ @@ -2071,6 +2167,12 @@ SwigPyObject_TypeOnce(void) { #if (PY_VERSION_HEX >= 0x03080000) && (PY_VERSION_HEX < 0x03090000) 0, /* tp_print */ #endif +#if PY_VERSION_HEX >= 0x030c0000 + 0, /* tp_watched */ +#endif +#if PY_VERSION_HEX >= 0x030d00a4 + 0, /* tp_versions_used */ +#endif #ifdef COUNT_ALLOCS 0, /* tp_allocs */ 0, /* tp_frees */ @@ -2085,12 +2187,32 @@ SwigPyObject_TypeOnce(void) { return NULL; } return &swigpyobject_type; +#else + PyType_Slot slots[] = { + { Py_tp_dealloc, (void *)SwigPyObject_dealloc }, + { Py_tp_repr, (void *)SwigPyObject_repr }, + { Py_tp_getattro, (void *)PyObject_GenericGetAttr }, + { Py_tp_doc, (void *)swigobject_doc }, + { Py_tp_richcompare, (void *)SwigPyObject_richcompare }, + { Py_tp_methods, (void *)swigobject_methods }, + { Py_nb_int, (void *)SwigPyObject_long }, + { 0, NULL } + }; + PyType_Spec spec = { + "SwigPyObject", + sizeof(SwigPyObject), + 0, + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + slots + }; + return (PyTypeObject *)PyType_FromSpec(&spec); +#endif } SWIGRUNTIME PyObject * SwigPyObject_New(void *ptr, swig_type_info *ty, int own) { - SwigPyObject *sobj = PyObject_NEW(SwigPyObject, SwigPyObject_type()); + SwigPyObject *sobj = PyObject_New(SwigPyObject, SwigPyObject_type()); if (sobj) { sobj->ptr = ptr; sobj->ty = ty; @@ -2103,7 +2225,7 @@ SwigPyObject_New(void *ptr, swig_type_info *ty, int own) /* Obtain a reference to the Python capsule wrapping the module information, so that the * module information is correctly destroyed after all SWIG python objects have been freed * by the GC (and corresponding destructors invoked) */ - Py_XINCREF(Swig_Capsule_global); + SWIG_Py_XINCREF(Swig_Capsule_global); } } return (PyObject *)sobj; @@ -2161,8 +2283,23 @@ SwigPyPacked_type(void) { SWIGRUNTIMEINLINE int SwigPyPacked_Check(PyObject *op) { - return ((op)->ob_type == SwigPyPacked_TypeOnce()) - || (strcmp((op)->ob_type->tp_name,"SwigPyPacked") == 0); +#ifdef Py_LIMITED_API + int cmp; + PyObject *tp_name; +#endif + PyTypeObject* op_type = Py_TYPE(op); + if (op_type == SwigPyPacked_TypeOnce()) + return 1; +#ifdef Py_LIMITED_API + tp_name = PyObject_GetAttrString((PyObject *)op_type, "__name__"); + if (!tp_name) + return 0; + cmp = PyUnicode_CompareWithASCIIString(tp_name, "SwigPyPacked"); + SWIG_Py_DECREF(tp_name); + return cmp == 0; +#else + return (strcmp(op_type->tp_name, "SwigPyPacked") == 0); +#endif } SWIGRUNTIME void @@ -2172,12 +2309,13 @@ SwigPyPacked_dealloc(PyObject *v) SwigPyPacked *sobj = (SwigPyPacked *) v; free(sobj->pack); } - PyObject_DEL(v); + PyObject_Free(v); } SWIGRUNTIME PyTypeObject* SwigPyPacked_TypeOnce(void) { static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer"; +#ifndef SWIG_HEAPTYPES static PyTypeObject swigpypacked_type; static int type_init = 0; if (!type_init) { @@ -2193,9 +2331,9 @@ SwigPyPacked_TypeOnce(void) { 0, /* tp_itemsize */ (destructor)SwigPyPacked_dealloc, /* tp_dealloc */ #if PY_VERSION_HEX < 0x030800b4 - (printfunc)0, /*tp_print*/ + (printfunc)0, /* tp_print */ #else - (Py_ssize_t)0, /*tp_vectorcall_offset*/ + (Py_ssize_t)0, /* tp_vectorcall_offset */ #endif (getattrfunc)0, /* tp_getattr */ (setattrfunc)0, /* tp_setattr */ @@ -2251,6 +2389,12 @@ SwigPyPacked_TypeOnce(void) { #if (PY_VERSION_HEX >= 0x03080000) && (PY_VERSION_HEX < 0x03090000) 0, /* tp_print */ #endif +#if PY_VERSION_HEX >= 0x030c0000 + 0, /* tp_watched */ +#endif +#if PY_VERSION_HEX >= 0x030d00a4 + 0, /* tp_versions_used */ +#endif #ifdef COUNT_ALLOCS 0, /* tp_allocs */ 0, /* tp_frees */ @@ -2265,12 +2409,30 @@ SwigPyPacked_TypeOnce(void) { return NULL; } return &swigpypacked_type; +#else + PyType_Slot slots[] = { + { Py_tp_dealloc, (void *)SwigPyPacked_dealloc }, + { Py_tp_repr, (void *)SwigPyPacked_repr }, + { Py_tp_str, (void *)SwigPyPacked_str }, + { Py_tp_getattro, (void *)PyObject_GenericGetAttr }, + { Py_tp_doc, (void *)swigpacked_doc }, + { 0, NULL } + }; + PyType_Spec spec = { + "SwigPyPacked", + sizeof(SwigPyPacked), + 0, + Py_TPFLAGS_DEFAULT, + slots + }; + return (PyTypeObject *)PyType_FromSpec(&spec); +#endif } SWIGRUNTIME PyObject * SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty) { - SwigPyPacked *sobj = PyObject_NEW(SwigPyPacked, SwigPyPacked_type()); + SwigPyPacked *sobj = PyObject_New(SwigPyPacked, SwigPyPacked_type()); if (sobj) { void *pack = malloc(size); if (pack) { @@ -2279,7 +2441,7 @@ SwigPyPacked_New(void *ptr, size_t size, swig_type_info *ty) sobj->ty = ty; sobj->size = size; } else { - PyObject_DEL((PyObject *) sobj); + PyObject_Free((PyObject *)sobj); sobj = 0; } } @@ -2332,7 +2494,12 @@ SWIG_Python_GetSwigThis(PyObject *pyobj) (void)obj; # ifdef PyWeakref_CheckProxy if (PyWeakref_CheckProxy(pyobj)) { +#if PY_VERSION_HEX >= 0x030d0000 + PyWeakref_GetRef(pyobj, &pyobj); + Py_DECREF(pyobj); +#else pyobj = PyWeakref_GET_OBJECT(pyobj); +#endif if (pyobj && SwigPyObject_Check(pyobj)) return (SwigPyObject*) pyobj; } @@ -2359,7 +2526,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj) #endif obj = PyObject_GetAttr(pyobj,SWIG_This()); if (obj) { - Py_DECREF(obj); + SWIG_Py_DECREF(obj); } else { if (PyErr_Occurred()) PyErr_Clear(); return 0; @@ -2369,7 +2536,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj) #else obj = PyObject_GetAttr(pyobj,SWIG_This()); if (obj) { - Py_DECREF(obj); + SWIG_Py_DECREF(obj); } else { if (PyErr_Occurred()) PyErr_Clear(); return 0; @@ -2495,7 +2662,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int } } } - Py_DECREF(impconv); + SWIG_Py_DECREF(impconv); } } } @@ -2522,10 +2689,20 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) { swig_cast_info *tc; /* here we get the method pointer for callbacks */ +#ifndef Py_LIMITED_API const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); +#else + PyObject* pystr_doc = PyObject_GetAttrString(obj, "__doc__"); + PyObject *bytes = NULL; + const char *doc = pystr_doc ? SWIG_PyUnicode_AsUTF8AndSize(pystr_doc, NULL, &bytes) : 0; +#endif const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0; if (desc) desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0; +#ifdef Py_LIMITED_API + SWIG_Py_XDECREF(bytes); + SWIG_Py_XDECREF(pystr_doc); +#endif if (!desc) return SWIG_ERROR; tc = SWIG_TypeCheck(desc,ty); @@ -2584,13 +2761,13 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) if (dict) { PyDict_SetItem(dict, SWIG_This(), swig_this); } else{ - Py_DECREF(inst); + SWIG_Py_DECREF(inst); inst = 0; } } #else if (PyObject_SetAttr(inst, SWIG_This(), swig_this) == -1) { - Py_DECREF(inst); + SWIG_Py_DECREF(inst); inst = 0; } #endif @@ -2601,25 +2778,30 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) if (empty_args) { PyObject *empty_kwargs = PyDict_New(); if (empty_kwargs) { - inst = ((PyTypeObject *)data->newargs)->tp_new((PyTypeObject *)data->newargs, empty_args, empty_kwargs); - Py_DECREF(empty_kwargs); +#ifndef Py_LIMITED_API + newfunc newfn = ((PyTypeObject *)data->newargs)->tp_new; +#else + newfunc newfn = (newfunc)PyType_GetSlot((PyTypeObject *)data->newargs, Py_tp_new); +#endif + inst = newfn((PyTypeObject *)data->newargs, empty_args, empty_kwargs); + SWIG_Py_DECREF(empty_kwargs); if (inst) { if (PyObject_SetAttr(inst, SWIG_This(), swig_this) == -1) { - Py_DECREF(inst); + SWIG_Py_DECREF(inst); inst = 0; } else { PyType_Modified(Py_TYPE(inst)); } } } - Py_DECREF(empty_args); + SWIG_Py_DECREF(empty_args); } #else PyObject *dict = PyDict_New(); if (dict) { PyDict_SetItem(dict, SWIG_This(), swig_this); inst = PyInstance_NewRaw(data->newargs, dict); - Py_DECREF(dict); + SWIG_Py_DECREF(dict); } #endif } @@ -2656,7 +2838,7 @@ SWIG_Python_InitShadowInstance(PyObject *args) { } else { SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]); if (sthis) { - Py_DECREF(SwigPyObject_append((PyObject*) sthis, obj[1])); + SWIG_Py_DECREF(SwigPyObject_append((PyObject*) sthis, obj[1])); } else { if (SWIG_Python_SetSwigThis(obj[0], obj[1]) != 0) return NULL; @@ -2683,7 +2865,12 @@ SWIG_Python_NewPointerObj(PyObject *self, void *ptr, swig_type_info *type, int f if (flags & SWIG_BUILTIN_TP_INIT) { newobj = (SwigPyObject*) self; if (newobj->ptr) { - PyObject *next_self = clientdata->pytype->tp_alloc(clientdata->pytype, 0); +#ifndef Py_LIMITED_API + allocfunc alloc = clientdata->pytype->tp_alloc; +#else + allocfunc alloc = (allocfunc)PyType_GetSlot(clientdata->pytype, Py_tp_alloc); +#endif + PyObject *next_self = alloc(clientdata->pytype, 0); while (newobj->next) newobj = (SwigPyObject *) newobj->next; newobj->next = next_self; @@ -2715,7 +2902,7 @@ SWIG_Python_NewPointerObj(PyObject *self, void *ptr, swig_type_info *type, int f robj = SwigPyObject_New(ptr, type, own); if (robj && clientdata && !(flags & SWIG_POINTER_NOSHADOW)) { PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj); - Py_DECREF(robj); + SWIG_Py_DECREF(robj); robj = inst; } return robj; @@ -2766,7 +2953,7 @@ SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) { } -static int interpreter_counter = 0; // how many (sub-)interpreters are using swig_module's types +static int interpreter_counter = 0; /* how many (sub-)interpreters are using swig_module's types */ SWIGRUNTIME void SWIG_Python_DestroyModule(PyObject *obj) @@ -2774,7 +2961,7 @@ SWIG_Python_DestroyModule(PyObject *obj) swig_module_info *swig_module = (swig_module_info *) PyCapsule_GetPointer(obj, SWIGPY_CAPSULE_NAME); swig_type_info **types = swig_module->types; size_t i; - if (--interpreter_counter != 0) // another sub-interpreter may still be using the swig_module's types + if (--interpreter_counter != 0) /* another sub-interpreter may still be using the swig_module's types */ return; for (i =0; i < swig_module->size; ++i) { swig_type_info *ty = types[i]; @@ -2784,11 +2971,11 @@ SWIG_Python_DestroyModule(PyObject *obj) if (data) SwigPyClientData_Del(data); } } - Py_DECREF(SWIG_This()); + SWIG_Py_DECREF(SWIG_This()); Swig_This_global = NULL; - Py_DECREF(SWIG_globals()); + SWIG_Py_DECREF(SWIG_globals()); Swig_Globals_global = NULL; - Py_DECREF(SWIG_Python_TypeCache()); + SWIG_Py_DECREF(SWIG_Python_TypeCache()); Swig_TypeCache_global = NULL; Swig_Capsule_global = NULL; } @@ -2808,10 +2995,10 @@ SWIG_Python_SetModule(swig_module_info *swig_module) { ++interpreter_counter; Swig_Capsule_global = pointer; } else { - Py_DECREF(pointer); + SWIG_Py_DECREF(pointer); } } else { - Py_XDECREF(pointer); + SWIG_Py_XDECREF(pointer); } } @@ -2831,11 +3018,11 @@ SWIG_Python_TypeQuery(const char *type) obj = PyCapsule_New((void*) descriptor, NULL, NULL); if (obj) { PyDict_SetItem(cache, key, obj); - Py_DECREF(obj); + SWIG_Py_DECREF(obj); } } } - Py_DECREF(key); + SWIG_Py_DECREF(key); return descriptor; } @@ -2856,16 +3043,18 @@ SWIG_Python_AddErrMesg(const char* mesg, int infront) PyErr_Fetch(&type, &value, &traceback); if (value) { PyObject *old_str = PyObject_Str(value); - const char *tmp = SWIG_Python_str_AsChar(old_str); + PyObject *bytes = NULL; + const char *tmp = SWIG_PyUnicode_AsUTF8AndSize(old_str, NULL, &bytes); const char *errmesg = tmp ? tmp : "Invalid error message"; - Py_XINCREF(type); + SWIG_Py_XINCREF(type); PyErr_Clear(); if (infront) { PyErr_Format(type, "%s %s", mesg, errmesg); } else { PyErr_Format(type, "%s %s", errmesg, mesg); } - Py_DECREF(old_str); + SWIG_Py_XDECREF(bytes); + SWIG_Py_DECREF(old_str); } return 1; } else { @@ -2897,6 +3086,7 @@ SwigPyObject_GetDesc(PyObject *self) SWIGRUNTIME void SWIG_Python_TypeError(const char *type, PyObject *obj) { + (void) obj; if (type) { #if defined(SWIG_COBJECT_TYPES) if (obj && SwigPyObject_Check(obj)) { @@ -2909,10 +3099,13 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) } else #endif { +#ifndef Py_LIMITED_API + /* tp_name is not accessible */ const char *otype = (obj ? obj->ob_type->tp_name : 0); if (otype) { PyObject *str = PyObject_Str(obj); - const char *cstr = str ? SWIG_Python_str_AsChar(str) : 0; + PyObject *bytes = NULL; + const char *cstr = str ? SWIG_PyUnicode_AsUTF8AndSize(str, NULL, &bytes) : 0; if (cstr) { PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received", type, otype, cstr); @@ -2920,9 +3113,11 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", type, otype); } - Py_XDECREF(str); + SWIG_Py_XDECREF(bytes); + SWIG_Py_XDECREF(str); return; } +#endif } PyErr_Format(PyExc_TypeError, "a '%s' is expected", type); } else { @@ -2963,7 +3158,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { PyErr_Format(PyExc_TypeError, "attribute name must be string, not '%.200s'", name->ob_type->tp_name); return -1; } else { - Py_INCREF(name); + SWIG_Py_INCREF(name); } if (!tp->tp_dict) { @@ -2978,20 +3173,20 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { if (!f) { if (PyString_Check(name)) { encoded_name = name; - Py_INCREF(name); + SWIG_Py_INCREF(name); } else { encoded_name = PyUnicode_AsUTF8String(name); if (!encoded_name) goto done; } PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name)); - Py_DECREF(encoded_name); + SWIG_Py_DECREF(encoded_name); } else { res = f(descr, obj, value); } done: - Py_DECREF(name); + SWIG_Py_DECREF(name); return res; } #endif @@ -3057,7 +3252,6 @@ static swig_module_info swig_module = {swig_types, 21, 0, 0, 0, 0}; # define SWIG_init init_rundec #endif -#define SWIG_name "_rundec" #ifdef __cplusplus #include @@ -3127,7 +3321,7 @@ namespace swig { SwigPtr_PyObject(const SwigPtr_PyObject& item) : _obj(item._obj) { SWIG_PYTHON_THREAD_BEGIN_BLOCK; - Py_XINCREF(_obj); + SWIG_Py_XINCREF(_obj); SWIG_PYTHON_THREAD_END_BLOCK; } @@ -3135,7 +3329,7 @@ namespace swig { { if (initial_ref) { SWIG_PYTHON_THREAD_BEGIN_BLOCK; - Py_XINCREF(_obj); + SWIG_Py_XINCREF(_obj); SWIG_PYTHON_THREAD_END_BLOCK; } } @@ -3143,8 +3337,8 @@ namespace swig { SwigPtr_PyObject & operator=(const SwigPtr_PyObject& item) { SWIG_PYTHON_THREAD_BEGIN_BLOCK; - Py_XINCREF(item._obj); - Py_XDECREF(_obj); + SWIG_Py_XINCREF(item._obj); + SWIG_Py_XDECREF(_obj); _obj = item._obj; SWIG_PYTHON_THREAD_END_BLOCK; return *this; @@ -3153,7 +3347,7 @@ namespace swig { ~SwigPtr_PyObject() { SWIG_PYTHON_THREAD_BEGIN_BLOCK; - Py_XDECREF(_obj); + SWIG_Py_XDECREF(_obj); SWIG_PYTHON_THREAD_END_BLOCK; } @@ -3176,7 +3370,7 @@ namespace swig { SwigVar_PyObject & operator = (PyObject* obj) { - Py_XDECREF(_obj); + SWIG_Py_XDECREF(_obj); _obj = obj; return *this; } @@ -3213,9 +3407,9 @@ namespace swig { #include #if PY_VERSION_HEX >= 0x03020000 -# define SWIGPY_SLICEOBJECT PyObject +# define SWIGPY_SLICE_ARG(obj) ((PyObject*) (obj)) #else -# define SWIGPY_SLICEOBJECT PySliceObject +# define SWIGPY_SLICE_ARG(obj) ((PySliceObject*) (obj)) #endif @@ -3326,12 +3520,7 @@ namespace swig { } static swig_type_info* descriptor() { - static int init = 0; - static swig_type_info* desc = 0; - if (!init) { - desc = SWIG_TypeQuery("swig::SwigPyIterator *"); - init = 1; - } + static swig_type_info* desc = SWIG_TypeQuery("swig::SwigPyIterator *"); return desc; } }; @@ -3339,7 +3528,7 @@ namespace swig { #if defined(SWIGPYTHON_BUILTIN) inline PyObject* make_output_iterator_builtin (PyObject *pyself) { - Py_INCREF(pyself); + SWIG_Py_INCREF(pyself); return pyself; } #endif @@ -3467,7 +3656,11 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) if (!dispatch) { double d; int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d)); - if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ULONG_MAX)) { + // Largest double not larger than ULONG_MAX (not portably calculated easily) + // Note that double(ULONG_MAX) is stored in a double rounded up by one (for 64-bit unsigned long) + // 0xfffffffffffff800ULL == (uint64_t)std::nextafter(double(__uint128_t(ULONG_MAX)+1), double(0)) + const double ulong_max = sizeof(unsigned long) == 8 ? 0xfffffffffffff800ULL : ULONG_MAX; + if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ulong_max)) { if (val) *val = (unsigned long)(d); return res; } @@ -3623,7 +3816,12 @@ SWIG_AsVal_long (PyObject *obj, long* val) if (!dispatch) { double d; int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d)); - if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, LONG_MIN, LONG_MAX)) { + // Largest double not larger than LONG_MAX (not portably calculated easily) + // Note that double(LONG_MAX) is stored in a double rounded up by one (for 64-bit long) + // 0x7ffffffffffffc00LL == (int64_t)std::nextafter(double(__uint128_t(LONG_MAX)+1), double(0)) + const double long_max = sizeof(long) == 8 ? 0x7ffffffffffffc00LL : LONG_MAX; + // No equivalent needed for 64-bit double(LONG_MIN) is exactly LONG_MIN + if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, LONG_MIN, long_max)) { if (val) *val = (long)(d); return res; } @@ -4511,7 +4709,7 @@ namespace swig { template <> struct traits_from { typedef PyObject * value_type; static PyObject *from(const value_type& val) { - Py_XINCREF(val); + SWIG_Py_XINCREF(val); return val; } }; @@ -4763,7 +4961,7 @@ namespace swig { } static bool check(PyObject *obj) { - int ret = false; + bool ret = false; SwigVar_PyObject iter = PyObject_GetIter(obj); if (iter) { SwigVar_PyObject item = PyIter_Next(iter); @@ -4944,46 +5142,46 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____delslice__( SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____delitem____SWIG_0(std::vector< std::pair< double,double > > *self,std::vector< std::pair< double,double > >::difference_type i){ swig::erase(self, swig::getpos(self, i)); } -SWIGINTERN std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____getitem____SWIG_0(std::vector< std::pair< double,double > > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____getitem____SWIG_0(std::vector< std::pair< double,double > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return NULL; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >::difference_type id = i; std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } -SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setitem____SWIG_0(std::vector< std::pair< double,double > > *self,SWIGPY_SLICEOBJECT *slice,std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &v){ +SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setitem____SWIG_0(std::vector< std::pair< double,double > > *self,PySliceObject *slice,std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &v){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >::difference_type id = i; std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } -SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setitem____SWIG_1(std::vector< std::pair< double,double > > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setitem____SWIG_1(std::vector< std::pair< double,double > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >::difference_type id = i; std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } -SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____delitem____SWIG_1(std::vector< std::pair< double,double > > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____delitem____SWIG_1(std::vector< std::pair< double,double > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >::difference_type id = i; std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > >::difference_type jd = j; swig::delslice(self, id, jd, step); @@ -5203,7 +5401,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *self, Py_ssize_ } arg2 = static_cast< size_t >(val2); try { - result = (swig::SwigPyIterator *)(arg1)->incr(arg2); + result = (swig::SwigPyIterator *)(arg1)->incr(SWIG_STD_MOVE(arg2)); } catch(swig::stop_iteration &_e) { { (void)_e; @@ -5313,7 +5511,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *self, Py_ssize_ } arg2 = static_cast< size_t >(val2); try { - result = (swig::SwigPyIterator *)(arg1)->decr(arg2); + result = (swig::SwigPyIterator *)(arg1)->decr(SWIG_STD_MOVE(arg2)); } catch(swig::stop_iteration &_e) { { (void)_e; @@ -5423,7 +5621,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *self, PyObject *arg SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator_distance" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SwigPyIterator_distance" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "SwigPyIterator_distance" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); } arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2); try { @@ -5461,7 +5659,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *self, PyObject *args) SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator_equal" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SwigPyIterator_equal" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "SwigPyIterator_equal" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); } arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2); try { @@ -5620,7 +5818,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_advance(PyObject *self, PyObject *args } arg2 = static_cast< ptrdiff_t >(val2); try { - result = (swig::SwigPyIterator *)(arg1)->advance(arg2); + result = (swig::SwigPyIterator *)(arg1)->advance(SWIG_STD_MOVE(arg2)); } catch(swig::stop_iteration &_e) { { (void)_e; @@ -5658,15 +5856,18 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *self, PyObject *args) SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___eq__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SwigPyIterator___eq__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "SwigPyIterator___eq__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); } arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2); result = (bool)((swig::SwigPyIterator const *)arg1)->operator ==((swig::SwigPyIterator const &)*arg2); resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: + if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_TypeError)) { + return NULL; + } PyErr_Clear(); - Py_INCREF(Py_NotImplemented); + SWIG_Py_INCREF(Py_NotImplemented); return Py_NotImplemented; } @@ -5694,15 +5895,18 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *self, PyObject *args) SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___ne__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SwigPyIterator___ne__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "SwigPyIterator___ne__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); } arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2); result = (bool)((swig::SwigPyIterator const *)arg1)->operator !=((swig::SwigPyIterator const &)*arg2); resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: + if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_TypeError)) { + return NULL; + } PyErr_Clear(); - Py_INCREF(Py_NotImplemented); + SWIG_Py_INCREF(Py_NotImplemented); return Py_NotImplemented; } @@ -5731,7 +5935,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___iadd__(PyObject *self, PyObject *arg } arg2 = static_cast< ptrdiff_t >(val2); try { - result = (swig::SwigPyIterator *) &(arg1)->operator +=(arg2); + result = (swig::SwigPyIterator *) &(arg1)->operator +=(SWIG_STD_MOVE(arg2)); } catch(swig::stop_iteration &_e) { { (void)_e; @@ -5770,7 +5974,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___isub__(PyObject *self, PyObject *arg } arg2 = static_cast< ptrdiff_t >(val2); try { - result = (swig::SwigPyIterator *) &(arg1)->operator -=(arg2); + result = (swig::SwigPyIterator *) &(arg1)->operator -=(SWIG_STD_MOVE(arg2)); } catch(swig::stop_iteration &_e) { { (void)_e; @@ -5809,7 +6013,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___add__(PyObject *self, PyObject *args } arg2 = static_cast< ptrdiff_t >(val2); try { - result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator +(arg2); + result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator +(SWIG_STD_MOVE(arg2)); } catch(swig::stop_iteration &_e) { { (void)_e; @@ -5820,8 +6024,11 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___add__(PyObject *self, PyObject *args resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN | 0 ); return resultobj; fail: + if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_TypeError)) { + return NULL; + } PyErr_Clear(); - Py_INCREF(Py_NotImplemented); + SWIG_Py_INCREF(Py_NotImplemented); return Py_NotImplemented; } @@ -5849,7 +6056,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *self, Py_ssi } arg2 = static_cast< ptrdiff_t >(val2); try { - result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator -(arg2); + result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator -(SWIG_STD_MOVE(arg2)); } catch(swig::stop_iteration &_e) { { (void)_e; @@ -5860,8 +6067,11 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *self, Py_ssi resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN | 0 ); return resultobj; fail: + if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_TypeError)) { + return NULL; + } PyErr_Clear(); - Py_INCREF(Py_NotImplemented); + SWIG_Py_INCREF(Py_NotImplemented); return Py_NotImplemented; } @@ -5888,15 +6098,18 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *self, Py_ssi SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SwigPyIterator___sub__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SwigPyIterator___sub__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "SwigPyIterator___sub__" "', argument " "2"" of type '" "swig::SwigPyIterator const &""'"); } arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2); result = ((swig::SwigPyIterator const *)arg1)->operator -((swig::SwigPyIterator const &)*arg2); resultobj = SWIG_From_ptrdiff_t(static_cast< ptrdiff_t >(result)); return resultobj; fail: + if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_TypeError)) { + return NULL; + } PyErr_Clear(); - Py_INCREF(Py_NotImplemented); + SWIG_Py_INCREF(Py_NotImplemented); return Py_NotImplemented; } @@ -5939,13 +6152,13 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args } fail: - Py_INCREF(Py_NotImplemented); + SWIG_Py_INCREF(Py_NotImplemented); return Py_NotImplemented; } SWIGINTERN PyObject *SwigPyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; + PyObject *obj = NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_swig__SwigPyIterator, SWIG_NewClientData(obj)); return SWIG_Py_Void(); @@ -6010,7 +6223,7 @@ SWIGINTERN PyObject *_wrap_new_PairDouble__SWIG_2(PyObject *self, Py_ssize_t nob SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PairDouble" "', argument " "1"" of type '" "std::pair< double,double > const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PairDouble" "', argument " "1"" of type '" "std::pair< double,double > const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "new_PairDouble" "', argument " "1"" of type '" "std::pair< double,double > const &""'"); } arg1 = ptr; } @@ -6202,7 +6415,7 @@ SWIGINTERN PyObject *_wrap_delete_PairDouble(PyObject *self, PyObject *args) { SWIGINTERN PyObject *PairDouble_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; + PyObject *obj = NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__pairT_double_double_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); @@ -6436,7 +6649,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setslice____SWIG_1(PyObject *self, SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "PairDoubleVector___setslice__" "', argument " "4"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PairDoubleVector___setslice__" "', argument " "4"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector___setslice__" "', argument " "4"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'"); } arg4 = ptr; } @@ -6600,7 +6813,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___delitem____SWIG_0(PyObject *self, SWIGINTERN PyObject *_wrap_PairDoubleVector___getitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *result = 0 ; @@ -6614,9 +6827,9 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___getitem____SWIG_0(PyObject *self, arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "PairDoubleVector___getitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "PairDoubleVector___getitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { result = (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *)std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____getitem____SWIG_0(arg1,arg2); @@ -6635,7 +6848,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___getitem____SWIG_0(PyObject *self, SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -6650,9 +6863,9 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem____SWIG_0(PyObject *self, arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "PairDoubleVector___setitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "PairDoubleVector___setitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } { std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *ptr = (std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *)0; @@ -6661,7 +6874,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem____SWIG_0(PyObject *self, SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PairDoubleVector___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &""'"); } arg3 = ptr; } @@ -6684,7 +6897,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem____SWIG_0(PyObject *self, SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -6697,9 +6910,9 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem____SWIG_1(PyObject *self, arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "PairDoubleVector___setitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "PairDoubleVector___setitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setitem____SWIG_1(arg1,arg2); @@ -6718,7 +6931,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem____SWIG_1(PyObject *self, SWIGINTERN PyObject *_wrap_PairDoubleVector___delitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -6731,9 +6944,9 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___delitem____SWIG_1(PyObject *self, arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "PairDoubleVector___delitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "PairDoubleVector___delitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____delitem____SWIG_1(arg1,arg2); @@ -6789,7 +7002,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___delitem__(PyObject *self, PyObject SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'PairDoubleVector___delitem__'.\n" " Possible C/C++ prototypes are:\n" " std::vector< std::pair< double,double > >::__delitem__(std::vector< std::pair< double,double > >::difference_type)\n" - " std::vector< std::pair< double,double > >::__delitem__(SWIGPY_SLICEOBJECT *)\n"); + " std::vector< std::pair< double,double > >::__delitem__(PySliceObject *)\n"); return 0; } @@ -6868,7 +7081,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___getitem__(PyObject *self, PyObject fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'PairDoubleVector___getitem__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< std::pair< double,double > >::__getitem__(SWIGPY_SLICEOBJECT *)\n" + " std::vector< std::pair< double,double > >::__getitem__(PySliceObject *)\n" " std::vector< std::pair< double,double > >::__getitem__(std::vector< std::pair< double,double > >::difference_type) const\n"); return 0; } @@ -6904,7 +7117,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem____SWIG_2(PyObject *self, SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PairDoubleVector___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } arg3 = ptr; } @@ -6982,8 +7195,8 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem__(PyObject *self, PyObject fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'PairDoubleVector___setitem__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< std::pair< double,double > >::__setitem__(SWIGPY_SLICEOBJECT *,std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &)\n" - " std::vector< std::pair< double,double > >::__setitem__(SWIGPY_SLICEOBJECT *)\n" + " std::vector< std::pair< double,double > >::__setitem__(PySliceObject *,std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > const &)\n" + " std::vector< std::pair< double,double > >::__setitem__(PySliceObject *)\n" " std::vector< std::pair< double,double > >::__setitem__(std::vector< std::pair< double,double > >::difference_type,std::vector< std::pair< double,double > >::value_type const &)\n"); return 0; } @@ -7040,7 +7253,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_append(PyObject *self, PyObject *arg SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PairDoubleVector_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PairDoubleVector_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } arg2 = ptr; } @@ -7083,7 +7296,7 @@ SWIGINTERN PyObject *_wrap_new_PairDoubleVector__SWIG_1(PyObject *self, Py_ssize SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PairDoubleVector" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PairDoubleVector" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "new_PairDoubleVector" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const &""'"); } arg1 = ptr; } @@ -7167,7 +7380,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_swap(PyObject *self, PyObject *args) SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PairDoubleVector_swap" "', argument " "2"" of type '" "std::vector< std::pair< double,double > > &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PairDoubleVector_swap" "', argument " "2"" of type '" "std::vector< std::pair< double,double > > &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_swap" "', argument " "2"" of type '" "std::vector< std::pair< double,double > > &""'"); } arg2 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp2); (arg1)->swap(*arg2); @@ -7339,7 +7552,7 @@ SWIGINTERN PyObject *_wrap_new_PairDoubleVector__SWIG_2(PyObject *self, Py_ssize SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_PairDoubleVector" "', argument " "1"" of type '" "std::vector< std::pair< double,double > >::size_type""'"); } arg1 = static_cast< std::vector< std::pair< double,double > >::size_type >(val1); - result = (std::vector< std::pair< double,double > > *)new std::vector< std::pair< double,double > >(arg1); + result = (std::vector< std::pair< double,double > > *)new std::vector< std::pair< double,double > >(SWIG_STD_MOVE(arg1)); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, SWIG_POINTER_NEW | 0 ); return resultobj; fail: @@ -7391,7 +7604,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_resize__SWIG_0(PyObject *self, Py_ss SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PairDoubleVector_resize" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'"); } arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2); - (arg1)->resize(arg2); + (arg1)->resize(SWIG_STD_MOVE(arg2)); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -7559,11 +7772,11 @@ SWIGINTERN PyObject *_wrap_new_PairDoubleVector__SWIG_3(PyObject *self, Py_ssize SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_PairDoubleVector" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_PairDoubleVector" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "new_PairDoubleVector" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } arg2 = ptr; } - result = (std::vector< std::pair< double,double > > *)new std::vector< std::pair< double,double > >(arg1,(std::vector< std::pair< double,double > >::value_type const &)*arg2); + result = (std::vector< std::pair< double,double > > *)new std::vector< std::pair< double,double > >(SWIG_STD_MOVE(arg1),(std::vector< std::pair< double,double > >::value_type const &)*arg2); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, SWIG_POINTER_NEW | 0 ); if (SWIG_IsNewObj(res2)) delete arg2; return resultobj; @@ -7651,7 +7864,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_push_back(PyObject *self, PyObject * SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PairDoubleVector_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PairDoubleVector_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } arg2 = ptr; } @@ -7746,11 +7959,11 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_assign(PyObject *self, PyObject *arg SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PairDoubleVector_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } arg3 = ptr; } - (arg1)->assign(arg2,(std::vector< std::pair< double,double > >::value_type const &)*arg3); + (arg1)->assign(SWIG_STD_MOVE(arg2),(std::vector< std::pair< double,double > >::value_type const &)*arg3); resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res3)) delete arg3; return resultobj; @@ -7790,11 +8003,11 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_resize__SWIG_1(PyObject *self, Py_ss SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PairDoubleVector_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } arg3 = ptr; } - (arg1)->resize(arg2,(std::vector< std::pair< double,double > >::value_type const &)*arg3); + (arg1)->resize(SWIG_STD_MOVE(arg2),(std::vector< std::pair< double,double > >::value_type const &)*arg3); resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res3)) delete arg3; return resultobj; @@ -7891,7 +8104,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_insert__SWIG_0(PyObject *self, Py_ss SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PairDoubleVector_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } arg3 = ptr; } @@ -7950,7 +8163,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_insert__SWIG_1(PyObject *self, Py_ss SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "PairDoubleVector_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PairDoubleVector_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); } arg4 = ptr; } @@ -8044,7 +8257,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_reserve(PyObject *self, PyObject *ar SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PairDoubleVector_reserve" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'"); } arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2); - (arg1)->reserve(arg2); + (arg1)->reserve(SWIG_STD_MOVE(arg2)); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -8100,7 +8313,7 @@ SWIGINTERN PyObject *_wrap_delete_PairDoubleVector(PyObject *self, PyObject *arg SWIGINTERN PyObject *PairDoubleVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; + PyObject *obj = NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, SWIG_NewClientData(obj)); return SWIG_Py_Void(); @@ -8219,7 +8432,7 @@ SWIGINTERN PyObject *_wrap_TriplenfMmuArray___setitem__(PyObject *self, PyObject SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TriplenfMmuArray___setitem__" "', argument " "3"" of type '" "TriplenfMmu""'"); } if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TriplenfMmuArray___setitem__" "', argument " "3"" of type '" "TriplenfMmu""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "TriplenfMmuArray___setitem__" "', argument " "3"" of type '" "TriplenfMmu""'"); } else { TriplenfMmu * temp = reinterpret_cast< TriplenfMmu * >(argp3); arg3 = *temp; @@ -8283,7 +8496,7 @@ SWIGINTERN PyObject *_wrap_TriplenfMmuArray_frompointer(PyObject *self, PyObject SWIGINTERN PyObject *TriplenfMmuArray_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; + PyObject *obj = NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_TriplenfMmuArray, SWIG_NewClientData(obj)); return SWIG_Py_Void(); @@ -8402,7 +8615,7 @@ SWIGINTERN PyObject *_wrap_RunDecPairArray___setitem__(PyObject *self, PyObject SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RunDecPairArray___setitem__" "', argument " "3"" of type '" "RunDecPair""'"); } if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RunDecPairArray___setitem__" "', argument " "3"" of type '" "RunDecPair""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "RunDecPairArray___setitem__" "', argument " "3"" of type '" "RunDecPair""'"); } else { RunDecPair * temp = reinterpret_cast< RunDecPair * >(argp3); arg3 = *temp; @@ -8466,7 +8679,7 @@ SWIGINTERN PyObject *_wrap_RunDecPairArray_frompointer(PyObject *self, PyObject SWIGINTERN PyObject *RunDecPairArray_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; + PyObject *obj = NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_RunDecPairArray, SWIG_NewClientData(obj)); return SWIG_Py_Void(); @@ -9108,7 +9321,7 @@ SWIGINTERN PyObject *_wrap_delete_RunDec_values(PyObject *self, PyObject *args) SWIGINTERN PyObject *RunDec_values_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; + PyObject *obj = NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_RunDec_values, SWIG_NewClientData(obj)); return SWIG_Py_Void(); @@ -9126,7 +9339,7 @@ SWIGINTERN int Swig_var_NumDef_set(PyObject *_val) { SWIG_exception_fail(SWIG_ArgError(res), "in variable '""NumDef""' of type '""RunDec_values""'"); } if (!argp) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""NumDef""' of type '""RunDec_values""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in variable '""NumDef""' of type '""RunDec_values""'"); } else { RunDec_values * temp; temp = reinterpret_cast< RunDec_values * >(argp); @@ -9348,7 +9561,7 @@ SWIGINTERN PyObject *_wrap_delete_TriplenfMmu(PyObject *self, PyObject *args) { SWIGINTERN PyObject *TriplenfMmu_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; + PyObject *obj = NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_TriplenfMmu, SWIG_NewClientData(obj)); return SWIG_Py_Void(); @@ -9504,7 +9717,7 @@ SWIGINTERN PyObject *_wrap_delete_RunDecPair(PyObject *self, PyObject *args) { SWIGINTERN PyObject *RunDecPair_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; + PyObject *obj = NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_RunDecPair, SWIG_NewClientData(obj)); return SWIG_Py_Void(); @@ -9660,7 +9873,7 @@ SWIGINTERN PyObject *_wrap_delete_AsmMS(PyObject *self, PyObject *args) { SWIGINTERN PyObject *AsmMS_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; + PyObject *obj = NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_AsmMS, SWIG_NewClientData(obj)); return SWIG_Py_Void(); @@ -9692,7 +9905,7 @@ SWIGINTERN PyObject *_wrap_fSetdydx(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydx" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydx" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydx" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -9739,7 +9952,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxa1(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydxa1" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydxa1" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydxa1" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -9786,7 +9999,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxM1(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydxM1" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydxM1" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydxM1" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -9833,7 +10046,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxa2(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydxa2" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydxa2" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydxa2" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -9880,7 +10093,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxM2(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydxM2" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydxM2" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydxM2" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -9927,7 +10140,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxa3(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydxa3" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydxa3" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydxa3" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -9974,7 +10187,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxM3(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydxM3" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydxM3" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydxM3" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -10021,7 +10234,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxa4(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydxa4" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydxa4" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydxa4" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -10068,7 +10281,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxM4(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydxM4" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydxM4" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydxM4" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -10115,7 +10328,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxa5(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydxa5" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydxa5" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydxa5" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -10162,7 +10375,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxM5(PyObject *self, PyObject *args) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fSetdydxM5" "', argument " "1"" of type '" "CRunDec""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fSetdydxM5" "', argument " "1"" of type '" "CRunDec""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "fSetdydxM5" "', argument " "1"" of type '" "CRunDec""'"); } else { CRunDec * temp = reinterpret_cast< CRunDec * >(argp1); arg1 = *temp; @@ -10257,7 +10470,7 @@ SWIGINTERN PyObject *_wrap_new_CRunDec(PyObject *self, PyObject *args) { SWIGINTERN PyObject *_wrap_CRunDec_mq_set(PyObject *self, PyObject *args) { PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; - RunDecPair *arg2 ; + RunDecPair *arg2 = (RunDecPair *) (RunDecPair *)0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -10281,7 +10494,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mq_set(PyObject *self, PyObject *args) { size_t ii = 0; for (; ii < (size_t)4; ++ii) *(RunDecPair *)&arg1->mq[ii] = *((RunDecPair *)arg2 + ii); } else { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""mq""' of type '""RunDecPair [4]""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in variable '""mq""' of type '""RunDecPair [4]""'"); } } resultobj = SWIG_Py_Void(); @@ -10318,7 +10531,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mq_get(PyObject *self, PyObject *args) { SWIGINTERN PyObject *_wrap_CRunDec_nfMmu_set(PyObject *self, PyObject *args) { PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; - TriplenfMmu *arg2 ; + TriplenfMmu *arg2 = (TriplenfMmu *) (TriplenfMmu *)0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -10342,7 +10555,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_nfMmu_set(PyObject *self, PyObject *args) { size_t ii = 0; for (; ii < (size_t)4; ++ii) *(TriplenfMmu *)&arg1->nfMmu[ii] = *((TriplenfMmu *)arg2 + ii); } else { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""nfMmu""' of type '""TriplenfMmu [4]""'"); + SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in variable '""nfMmu""' of type '""TriplenfMmu [4]""'"); } } resultobj = SWIG_Py_Void(); @@ -11810,7 +12023,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_AlH2AlL(PyObject *self, PyObject *args) { CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; double arg3 ; - TriplenfMmu *arg4 ; + TriplenfMmu *arg4 = (TriplenfMmu *) (TriplenfMmu *)0 ; double arg5 ; int arg6 ; void *argp1 = 0 ; @@ -11874,7 +12087,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mL2mH(PyObject *self, PyObject *args) { double arg2 ; double arg3 ; double arg4 ; - TriplenfMmu *arg5 ; + TriplenfMmu *arg5 = (TriplenfMmu *) (TriplenfMmu *)0 ; double arg6 ; int arg7 ; void *argp1 = 0 ; @@ -11945,7 +12158,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mH2mL(PyObject *self, PyObject *args) { double arg2 ; double arg3 ; double arg4 ; - TriplenfMmu *arg5 ; + TriplenfMmu *arg5 = (TriplenfMmu *) (TriplenfMmu *)0 ; double arg6 ; int arg7 ; void *argp1 = 0 ; @@ -12014,7 +12227,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -12092,7 +12305,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -12162,7 +12375,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -12240,7 +12453,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -12534,7 +12747,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; int arg5 ; int arg6 ; @@ -12604,7 +12817,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; int arg5 ; int arg6 ; @@ -12666,7 +12879,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun__SWIG_0(PyObject *self, Py_ssize_t PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -12736,7 +12949,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun__SWIG_0(PyObject *self, Py_ssize_t PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -12860,7 +13073,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit__SWIG_0(PyObject *self, Py_ssize_t PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -12984,7 +13197,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mPS(PyObject *self, PyObject *args) { PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -13063,7 +13276,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -13149,7 +13362,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -13351,7 +13564,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -13437,7 +13650,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -13639,7 +13852,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double (*arg4)(double) = (double (*)(double)) 0 ; double arg5 ; int arg6 ; @@ -13716,7 +13929,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double (*arg4)(double) = (double (*)(double)) 0 ; double arg5 ; int arg6 ; @@ -13895,7 +14108,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2m1S(PyObject *self, PyObject *args) { PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -13966,7 +14179,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -14044,7 +14257,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -14226,7 +14439,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -14304,7 +14517,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -14486,7 +14699,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double (*arg4)(double) = (double (*)(double)) 0 ; int arg5 ; int arg6 ; @@ -14555,7 +14768,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double (*arg4)(double) = (double (*)(double)) 0 ; int arg5 ; int arg6 ; @@ -14714,7 +14927,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -14800,7 +15013,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -14894,7 +15107,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -14988,7 +15201,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_0(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double (*arg4)(double) = (double (*)(double)) 0 ; double arg5 ; int arg6 ; @@ -15073,7 +15286,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -15275,7 +15488,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -15361,7 +15574,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_2(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -15626,7 +15839,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -15712,7 +15925,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_2(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -15977,7 +16190,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_1(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double (*arg4)(double) = (double (*)(double)) 0 ; double arg5 ; int arg6 ; @@ -16054,7 +16267,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_2(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double (*arg4)(double) = (double (*)(double)) 0 ; double arg5 ; int arg6 ; @@ -16289,7 +16502,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRSp(PyObject *self, PyObject *args) { PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -16368,7 +16581,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp__SWIG_0(PyObject *self, Py_ssize_t n PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -16454,7 +16667,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp__SWIG_1(PyObject *self, Py_ssize_t n PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -16656,7 +16869,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS__SWIG_0(PyObject *self, Py_ssize_t n PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -16742,7 +16955,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS__SWIG_1(PyObject *self, Py_ssize_t n PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -16944,7 +17157,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI__SWIG_0(PyObject *self, Py_ssize_t n PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double (*arg4)(double) = (double (*)(double)) 0 ; double arg5 ; int arg6 ; @@ -17021,7 +17234,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI__SWIG_1(PyObject *self, Py_ssize_t n PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double (*arg4)(double) = (double (*)(double)) 0 ; double arg5 ; int arg6 ; @@ -17200,7 +17413,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN__SWIG_0(PyObject *self, Py_ssize_t n PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -17294,7 +17507,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS__SWIG_0(PyObject *self, Py_ssize_t n PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -20060,7 +20273,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_2(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -20130,7 +20343,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_3(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -20388,7 +20601,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_2(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -20458,7 +20671,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_3(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -21232,7 +21445,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_2(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; int arg5 ; double arg6 ; @@ -21294,7 +21507,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_3(PyObject *self, Py_ssize_t no PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; int arg5 ; void *argp1 = 0 ; @@ -21520,7 +21733,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun__SWIG_1(PyObject *self, Py_ssize_t PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -21682,7 +21895,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun__SWIG_1(PyObject *self, Py_ssize_t PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -21968,7 +22181,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit__SWIG_1(PyObject *self, Py_ssize_t PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; int arg6 ; @@ -22254,7 +22467,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN__SWIG_1(PyObject *self, Py_ssize_t n PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -22462,7 +22675,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS__SWIG_1(PyObject *self, Py_ssize_t n PyObject *resultobj = 0; CRunDec *arg1 = (CRunDec *) 0 ; double arg2 ; - RunDecPair *arg3 ; + RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ; double arg4 ; double arg5 ; double arg6 ; @@ -22690,7 +22903,7 @@ SWIGINTERN PyObject *_wrap_delete_CRunDec(PyObject *self, PyObject *args) { SWIGINTERN PyObject *CRunDec_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; + PyObject *obj = NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CRunDec, SWIG_NewClientData(obj)); return SWIG_Py_Void(); @@ -23283,7 +23496,7 @@ extern "C" { } if (obj) { PyDict_SetItemString(d, constants[i].name, obj); - Py_DECREF(obj); + SWIG_Py_DECREF(obj); } } } @@ -23466,7 +23679,7 @@ SWIG_init(void) { (void)public_symbol; PyDict_SetItemString(md, "__all__", public_interface); - Py_DECREF(public_interface); + SWIG_Py_DECREF(public_interface); for (i = 0; SwigMethods[i].ml_name != NULL; ++i) SwigPyBuiltin_AddPublicSymbol(public_interface, SwigMethods[i].ml_name); for (i = 0; swig_const_table[i].name != 0; ++i) diff --git a/rundec.i b/rundec.i index 3f881a6..bb3b886 100644 --- a/rundec.i +++ b/rundec.i @@ -1,5 +1,9 @@ %module rundec +%begin %{ +#define Py_LIMITED_API 0x030A0000 +%} + %{ #include #include diff --git a/rundec.py b/rundec.py index ecaae13..5a69430 100644 --- a/rundec.py +++ b/rundec.py @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (https://www.swig.org). -# Version 4.2.0 +# Version 4.3.0 # # Do not make changes to this file unless you know what you are doing - modify # the SWIG interface file instead. diff --git a/setup.py b/setup.py index 50faf44..f66fae2 100644 --- a/setup.py +++ b/setup.py @@ -2,12 +2,14 @@ ext_mod = Extension("_rundec", sources=["_rundec.cc", "CRunDec3/CRunDec.3.1.cpp"], + define_macros=[('Py_LIMITED_API', '0x030A0000')], + py_limited_api=True, ) setup(name="rundec", - version="0.6", + version="0.7", author="David M. Straub", - author_email="david.straub@tum.de", + author_email="david.straub@hm.edu", url="https://github.com/DavidMStraub/rundec-python", description="A Python wrapper around the CRunDec package for the " " running and decoupling of the strong coupling constant "