diff --git a/.github/workflows/build-wheel.yml b/.github/workflows/build-wheel.yml index 0628dc1..b93f924 100644 --- a/.github/workflows/build-wheel.yml +++ b/.github/workflows/build-wheel.yml @@ -17,7 +17,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.22.0 env: - CIBW_BUILD: cp310-* cp311-* cp312-* + CIBW_BUILD: cp310-* cp311-* cp312-* cp313-* CIBW_BEFORE_BUILD_LINUX: | yum install -y wget tar wget -nv -O boost_1_75_0.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz @@ -53,7 +53,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.10', '3.11','3.12'] + python-version: ['3.10', '3.11', '3.12', '3.13'] os: [windows-latest] steps: diff --git a/README.rst b/README.rst index a214df3..422d180 100644 --- a/README.rst +++ b/README.rst @@ -44,12 +44,12 @@ dump Dictionaries (10 loops) ============= ========= ======== Package Seconds Size ============= ========= ======== -larch-pickle 0.291857 9356357 -marshal 0.344505 15975952 -msgpack 0.368878 9810043 -ujson 0.550575 13101307 -json 0.815204 14365311 -Pickle-3.12.2 1.16181 10276493 +larch-pickle 0.30802 9714411 +marshal 0.354808 15975952 +msgpack 0.428291 9810043 +ujson 0.555553 13101307 +json 0.857648 14365311 +Pickle-3.13.1 1.14954 10276493 ============= ========= ======== @@ -59,12 +59,12 @@ load Dictionaries (10 loops) ============= ========= Package Seconds ============= ========= -larch-pickle 0.719275 -marshal 0.767289 -msgpack 0.817542 -Pickle-3.12.2 0.847736 -json 0.91282 -ujson 0.930489 +larch-pickle 0.766926 +marshal 0.814134 +Pickle-3.13.1 0.819185 +msgpack 0.844517 +json 0.904898 +ujson 0.913147 ============= ========= @@ -74,8 +74,8 @@ dump Objects (10 loops) ============= ========= ======== Package Seconds Size ============= ========= ======== -larch-pickle 0.337152 9656364 -Pickle-3.12.2 1.15342 10416542 +larch-pickle 0.359494 10014419 +Pickle-3.13.1 1.18986 10416542 ============= ========= ======== @@ -85,8 +85,8 @@ load Objects (10 loops) ============= ========= Package Seconds ============= ========= -larch-pickle 0.794334 -Pickle-3.12.2 0.820135 +larch-pickle 0.847492 +Pickle-3.13.1 0.85291 ============= ========= @@ -96,12 +96,12 @@ dump Strings (10 loops) ============= ========= ======== Package Seconds Size ============= ========= ======== -marshal 0.215026 32481517 -msgpack 0.251937 28782143 -larch-pickle 0.418834 10885236 -json 0.513742 31701248 -ujson 0.537478 30722275 -Pickle-3.12.2 0.633869 17726498 +msgpack 0.19541 28782143 +marshal 0.308926 32481517 +larch-pickle 0.450725 10885236 +Pickle-3.13.1 0.546272 17726498 +ujson 0.547605 30722275 +json 0.583875 31701248 ============= ========= ======== @@ -111,10 +111,40 @@ load Strings (10 loops) ============= ========= Package Seconds ============= ========= -larch-pickle 0.206729 -Pickle-3.12.2 0.253017 -marshal 0.359512 -msgpack 0.360152 -json 0.527622 -ujson 0.673696 +larch-pickle 0.17225 +Pickle-3.13.1 0.306568 +msgpack 0.435994 +marshal 0.436601 +json 0.549098 +ujson 0.729321 +============= ========= + + +dump Lists (10 loops) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +============= ========= ======== +Package Seconds Size +============= ========= ======== +marshal 0.455435 42358637 +larch-pickle 0.742083 14836084 +msgpack 0.839755 30757567 +ujson 1.26378 34673123 +json 1.71007 35652096 +Pickle-3.13.1 2.96611 23654090 +============= ========= ======== + + +load Lists (10 loops) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +============= ========= +Package Seconds +============= ========= +larch-pickle 1.00482 +msgpack 1.25386 +marshal 1.26315 +json 1.54972 +Pickle-3.13.1 1.70148 +ujson 1.72284 ============= ========= \ No newline at end of file diff --git a/larch/pickle/pickle.cpp b/larch/pickle/pickle.cpp index 8c930d3..87a8c61 100644 --- a/larch/pickle/pickle.cpp +++ b/larch/pickle/pickle.cpp @@ -1,4 +1,4 @@ -/* Generated by Cython 3.0.8 */ +/* Generated by Cython 3.0.11 */ /* BEGIN: Cython Metadata { @@ -29,8 +29,8 @@ ], "include_dirs": [ "larch/pickle", - "/home/michael/src/larch-pickle/.conda/include", - "/home/michael/src/larch-pickle/.conda/include", + "/home/michael/miniconda3/envs/larch13/include", + "/home/michael/miniconda3/envs/larch13/include", "larch/pickle" ], "language": "c++", @@ -72,10 +72,10 @@ END: Cython Metadata */ #else #define __PYX_EXTRA_ABI_MODULE_NAME "" #endif -#define CYTHON_ABI "3_0_8" __PYX_EXTRA_ABI_MODULE_NAME +#define CYTHON_ABI "3_0_11" __PYX_EXTRA_ABI_MODULE_NAME #define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI #define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "." -#define CYTHON_HEX_VERSION 0x030008F0 +#define CYTHON_HEX_VERSION 0x03000BF0 #define CYTHON_FUTURE_DIVISION 1 #include #ifndef offsetof @@ -167,6 +167,8 @@ END: Cython Metadata */ #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC #define CYTHON_UPDATE_DESCRIPTOR_DOC 0 #endif + #undef CYTHON_USE_FREELISTS + #define CYTHON_USE_FREELISTS 0 #elif defined(PYPY_VERSION) #define CYTHON_COMPILING_IN_PYPY 1 #define CYTHON_COMPILING_IN_CPYTHON 0 @@ -228,6 +230,8 @@ END: Cython Metadata */ #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC #define CYTHON_UPDATE_DESCRIPTOR_DOC 0 #endif + #undef CYTHON_USE_FREELISTS + #define CYTHON_USE_FREELISTS 0 #elif defined(CYTHON_LIMITED_API) #ifdef Py_LIMITED_API #undef __PYX_LIMITED_VERSION_HEX @@ -289,6 +293,8 @@ END: Cython Metadata */ #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC #define CYTHON_UPDATE_DESCRIPTOR_DOC 0 #endif + #undef CYTHON_USE_FREELISTS + #define CYTHON_USE_FREELISTS 0 #elif defined(Py_GIL_DISABLED) || defined(Py_NOGIL) #define CYTHON_COMPILING_IN_PYPY 0 #define CYTHON_COMPILING_IN_CPYTHON 0 @@ -298,11 +304,17 @@ END: Cython Metadata */ #ifndef CYTHON_USE_TYPE_SLOTS #define CYTHON_USE_TYPE_SLOTS 1 #endif + #ifndef CYTHON_USE_TYPE_SPECS + #define CYTHON_USE_TYPE_SPECS 0 + #endif #undef CYTHON_USE_PYTYPE_LOOKUP #define CYTHON_USE_PYTYPE_LOOKUP 0 #ifndef CYTHON_USE_ASYNC_SLOTS #define CYTHON_USE_ASYNC_SLOTS 1 #endif + #ifndef CYTHON_USE_PYLONG_INTERNALS + #define CYTHON_USE_PYLONG_INTERNALS 0 + #endif #undef CYTHON_USE_PYLIST_INTERNALS #define CYTHON_USE_PYLIST_INTERNALS 0 #ifndef CYTHON_USE_UNICODE_INTERNALS @@ -310,8 +322,6 @@ END: Cython Metadata */ #endif #undef CYTHON_USE_UNICODE_WRITER #define CYTHON_USE_UNICODE_WRITER 0 - #undef CYTHON_USE_PYLONG_INTERNALS - #define CYTHON_USE_PYLONG_INTERNALS 0 #ifndef CYTHON_AVOID_BORROWED_REFS #define CYTHON_AVOID_BORROWED_REFS 0 #endif @@ -323,11 +333,22 @@ END: Cython Metadata */ #endif #undef CYTHON_FAST_THREAD_STATE #define CYTHON_FAST_THREAD_STATE 0 + #undef CYTHON_FAST_GIL + #define CYTHON_FAST_GIL 0 + #ifndef CYTHON_METH_FASTCALL + #define CYTHON_METH_FASTCALL 1 + #endif #undef CYTHON_FAST_PYCALL #define CYTHON_FAST_PYCALL 0 + #ifndef CYTHON_PEP487_INIT_SUBCLASS + #define CYTHON_PEP487_INIT_SUBCLASS 1 + #endif #ifndef CYTHON_PEP489_MULTI_PHASE_INIT #define CYTHON_PEP489_MULTI_PHASE_INIT 1 #endif + #ifndef CYTHON_USE_MODULE_STATE + #define CYTHON_USE_MODULE_STATE 0 + #endif #ifndef CYTHON_USE_TP_FINALIZE #define CYTHON_USE_TP_FINALIZE 1 #endif @@ -335,6 +356,12 @@ END: Cython Metadata */ #define CYTHON_USE_DICT_VERSIONS 0 #undef CYTHON_USE_EXC_INFO_STACK #define CYTHON_USE_EXC_INFO_STACK 0 + #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC + #define CYTHON_UPDATE_DESCRIPTOR_DOC 1 + #endif + #ifndef CYTHON_USE_FREELISTS + #define CYTHON_USE_FREELISTS 0 + #endif #else #define CYTHON_COMPILING_IN_PYPY 0 #define CYTHON_COMPILING_IN_CPYTHON 1 @@ -425,6 +452,9 @@ END: Cython Metadata */ #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC #define CYTHON_UPDATE_DESCRIPTOR_DOC 1 #endif + #ifndef CYTHON_USE_FREELISTS + #define CYTHON_USE_FREELISTS 1 + #endif #endif #if !defined(CYTHON_FAST_PYCCALL) #define CYTHON_FAST_PYCCALL (CYTHON_FAST_PYCALL && PY_VERSION_HEX >= 0x030600B1) @@ -784,8 +814,13 @@ class __Pyx_FakeReference { typedef PyObject *(*__Pyx_PyCFunctionFastWithKeywords) (PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames); #else - #define __Pyx_PyCFunctionFast _PyCFunctionFast - #define __Pyx_PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords + #if PY_VERSION_HEX >= 0x030d00A4 + # define __Pyx_PyCFunctionFast PyCFunctionFast + # define __Pyx_PyCFunctionFastWithKeywords PyCFunctionFastWithKeywords + #else + # define __Pyx_PyCFunctionFast _PyCFunctionFast + # define __Pyx_PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords + #endif #endif #if CYTHON_METH_FASTCALL #define __Pyx_METH_FASTCALL METH_FASTCALL @@ -1137,7 +1172,7 @@ static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict, #define __Pyx_PyBytes_GET_SIZE(o) PyBytes_Size(o) #define __Pyx_PyByteArray_GET_SIZE(o) PyByteArray_Size(o) #endif -#if PY_VERSION_HEX >= 0x030d00A1 +#if __PYX_LIMITED_VERSION_HEX >= 0x030d00A1 #define __Pyx_PyImport_AddModuleRef(name) PyImport_AddModuleRef(name) #else static CYTHON_INLINE PyObject *__Pyx_PyImport_AddModuleRef(const char *name) { @@ -1224,7 +1259,7 @@ static CYTHON_INLINE float __PYX_NAN() { #endif #define __PYX_MARK_ERR_POS(f_index, lineno) \ - { __pyx_filename = __pyx_f[f_index]; (void)__pyx_filename; __pyx_lineno = lineno; (void)__pyx_lineno; __pyx_clineno = __LINE__; (void)__pyx_clineno; } + { __pyx_filename = __pyx_f[f_index]; (void)__pyx_filename; __pyx_lineno = lineno; (void)__pyx_lineno; __pyx_clineno = __LINE__; (void)__pyx_clineno; } #define __PYX_ERR(f_index, lineno, Ln_error) \ { __PYX_MARK_ERR_POS(f_index, lineno) goto Ln_error; } @@ -1334,24 +1369,7 @@ static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(const char*); #define __Pyx_PyByteArray_FromCString(s) __Pyx_PyByteArray_FromString((const char*)s) #define __Pyx_PyStr_FromCString(s) __Pyx_PyStr_FromString((const char*)s) #define __Pyx_PyUnicode_FromCString(s) __Pyx_PyUnicode_FromString((const char*)s) -#if CYTHON_COMPILING_IN_LIMITED_API -static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const wchar_t *u) -{ - const wchar_t *u_end = u; - while (*u_end++) ; - return (size_t)(u_end - u - 1); -} -#else -static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const Py_UNICODE *u) -{ - const Py_UNICODE *u_end = u; - while (*u_end++) ; - return (size_t)(u_end - u - 1); -} -#endif #define __Pyx_PyUnicode_FromOrdinal(o) PyUnicode_FromOrdinal((int)o) -#define __Pyx_PyUnicode_FromUnicode(u) PyUnicode_FromUnicode(u, __Pyx_Py_UNICODE_strlen(u)) -#define __Pyx_PyUnicode_FromUnicodeAndLength PyUnicode_FromUnicode #define __Pyx_PyUnicode_AsUnicode PyUnicode_AsUnicode #define __Pyx_NewRef(obj) (Py_INCREF(obj), obj) #define __Pyx_Owned_Py_None(b) __Pyx_NewRef(Py_None) @@ -1521,7 +1539,7 @@ static const char *__pyx_filename; static const char *__pyx_f[] = { "larch/pickle/pickle.pyx", - ".conda/lib/python3.12/site-packages/Cython/Includes/cpython/type.pxd", + "type.pxd", }; /* #### Code section: utility_code_proto_before_types ### */ /* ForceInitThreads.proto */ @@ -1546,7 +1564,7 @@ struct __pyx_opt_args_5larch_6pickle_6pickle_dump; struct __pyx_opt_args_5larch_6pickle_6pickle_load; struct __pyx_opt_args_5larch_6pickle_6pickle_loads; -/* "larch/pickle/pickle.pyx":268 +/* "larch/pickle/pickle.pyx":270 * * * ctypedef int (*write_file_t)(object file, void *data, size_t size) # <<<<<<<<<<<<<< @@ -1555,7 +1573,7 @@ struct __pyx_opt_args_5larch_6pickle_6pickle_loads; */ typedef int (*__pyx_t_5larch_6pickle_6pickle_write_file_t)(PyObject *, void *, size_t); -/* "larch/pickle/pickle.pyx":271 +/* "larch/pickle/pickle.pyx":273 * """writes data to file""" * * ctypedef int (*read_file_t)(object file, void *data, size_t size) # <<<<<<<<<<<<<< @@ -1564,7 +1582,7 @@ typedef int (*__pyx_t_5larch_6pickle_6pickle_write_file_t)(PyObject *, void *, s */ typedef int (*__pyx_t_5larch_6pickle_6pickle_read_file_t)(PyObject *, void *, size_t); -/* "larch/pickle/pickle.pyx":664 +/* "larch/pickle/pickle.pyx":666 * # ----------------------------------- * * ctypedef int (*pack_import_names_t)(Packer* p, module, name) except -1 # <<<<<<<<<<<<<< @@ -1573,7 +1591,7 @@ typedef int (*__pyx_t_5larch_6pickle_6pickle_read_file_t)(PyObject *, void *, si */ typedef int (*__pyx_t_5larch_6pickle_6pickle_pack_import_names_t)(Packer *, PyObject *, PyObject *); -/* "larch/pickle/pickle.pyx":945 +/* "larch/pickle/pickle.pyx":947 * * * cdef _register_unpickle(unpack_t loader, codes, int offset=0): # <<<<<<<<<<<<<< @@ -1585,7 +1603,7 @@ struct __pyx_opt_args_5larch_6pickle_6pickle__register_unpickle { int offset; }; -/* "larch/pickle/pickle.pyx":1001 +/* "larch/pickle/pickle.pyx":1003 * cdef class Unpickler * * ctypedef object (*find_class_t)(Unpickler unpickler, module, name) # <<<<<<<<<<<<<< @@ -1594,7 +1612,7 @@ struct __pyx_opt_args_5larch_6pickle_6pickle__register_unpickle { */ typedef PyObject *(*__pyx_t_5larch_6pickle_6pickle_find_class_t)(struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *, PyObject *, PyObject *); -/* "larch/pickle/pickle.pyx":1011 +/* "larch/pickle/pickle.pyx":1013 * * * ctypedef object (*default_find_class_t)(module, name) # <<<<<<<<<<<<<< @@ -1603,7 +1621,7 @@ typedef PyObject *(*__pyx_t_5larch_6pickle_6pickle_find_class_t)(struct __pyx_ob */ typedef PyObject *(*__pyx_t_5larch_6pickle_6pickle_default_find_class_t)(PyObject *, PyObject *); -/* "larch/pickle/pickle.pyx":1176 +/* "larch/pickle/pickle.pyx":1178 * * * cpdef dumps(obj, protocol=-1, with_refs=True): # <<<<<<<<<<<<<< @@ -1616,7 +1634,7 @@ struct __pyx_opt_args_5larch_6pickle_6pickle_dumps { PyObject *with_refs; }; -/* "larch/pickle/pickle.pyx":1181 +/* "larch/pickle/pickle.pyx":1183 * * * cpdef dump(obj, file, protocol=-1): # <<<<<<<<<<<<<< @@ -1628,7 +1646,7 @@ struct __pyx_opt_args_5larch_6pickle_6pickle_dump { PyObject *protocol; }; -/* "larch/pickle/pickle.pyx":1185 +/* "larch/pickle/pickle.pyx":1187 * * * cpdef load(file, secure=False): # <<<<<<<<<<<<<< @@ -1640,7 +1658,7 @@ struct __pyx_opt_args_5larch_6pickle_6pickle_load { PyObject *secure; }; -/* "larch/pickle/pickle.pyx":1190 +/* "larch/pickle/pickle.pyx":1192 * * * cpdef loads(bytes obj, secure=False): # <<<<<<<<<<<<<< @@ -1652,7 +1670,7 @@ struct __pyx_opt_args_5larch_6pickle_6pickle_loads { PyObject *secure; }; -/* "larch/pickle/pickle.pyx":281 +/* "larch/pickle/pickle.pyx":283 * # String Buffer * @cython.auto_pickle(False) * cdef class OutputBuffer: # <<<<<<<<<<<<<< @@ -1666,7 +1684,7 @@ struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer { }; -/* "larch/pickle/pickle.pyx":302 +/* "larch/pickle/pickle.pyx":304 * * @cython.auto_pickle(False) * cdef class _BufferContainer: # <<<<<<<<<<<<<< @@ -1680,7 +1698,7 @@ struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer { }; -/* "larch/pickle/pickle.pyx":318 +/* "larch/pickle/pickle.pyx":320 * # Python Filelike * @cython.auto_pickle(False) * cdef class _FileLike: # <<<<<<<<<<<<<< @@ -1694,7 +1712,7 @@ struct __pyx_obj_5larch_6pickle_6pickle__FileLike { }; -/* "larch/pickle/pickle.pyx":347 +/* "larch/pickle/pickle.pyx":349 * # External (cython) filelike * @cython.auto_pickle(False) * cdef class ExternFileLike: # <<<<<<<<<<<<<< @@ -1709,7 +1727,7 @@ struct __pyx_obj_5larch_6pickle_6pickle_ExternFileLike { }; -/* "larch/pickle/pickle.pyx":264 +/* "larch/pickle/pickle.pyx":266 * * * cdef class Pickler # <<<<<<<<<<<<<< @@ -1728,7 +1746,7 @@ struct __pyx_obj_5larch_6pickle_6pickle_Pickler { }; -/* "larch/pickle/pickle.pyx":265 +/* "larch/pickle/pickle.pyx":267 * * cdef class Pickler * cdef class Unpickler # <<<<<<<<<<<<<< @@ -1749,7 +1767,7 @@ struct __pyx_obj_5larch_6pickle_6pickle_Unpickler { -/* "larch/pickle/pickle.pyx":685 +/* "larch/pickle/pickle.pyx":687 * * @cython.auto_pickle(False) * cdef class Pickler: # <<<<<<<<<<<<<< @@ -1766,7 +1784,7 @@ struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler { static struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *__pyx_vtabptr_5larch_6pickle_6pickle_Pickler; -/* "larch/pickle/pickle.pyx":1052 +/* "larch/pickle/pickle.pyx":1054 * * @cython.auto_pickle(False) * cdef class Unpickler: # <<<<<<<<<<<<<< @@ -1783,7 +1801,7 @@ struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler { static struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *__pyx_vtabptr_5larch_6pickle_6pickle_Unpickler; -/* "larch/pickle/pickle.pyx":281 +/* "larch/pickle/pickle.pyx":283 * # String Buffer * @cython.auto_pickle(False) * cdef class OutputBuffer: # <<<<<<<<<<<<<< @@ -1798,7 +1816,7 @@ struct __pyx_vtabstruct_5larch_6pickle_6pickle_OutputBuffer { static struct __pyx_vtabstruct_5larch_6pickle_6pickle_OutputBuffer *__pyx_vtabptr_5larch_6pickle_6pickle_OutputBuffer; -/* "larch/pickle/pickle.pyx":302 +/* "larch/pickle/pickle.pyx":304 * * @cython.auto_pickle(False) * cdef class _BufferContainer: # <<<<<<<<<<<<<< @@ -2194,11 +2212,7 @@ static CYTHON_INLINE int __Pyx_PyInt_BoolEqObjC(PyObject *op1, PyObject *op2, lo static CYTHON_INLINE PyObject *__Pyx_GetAttr(PyObject *, PyObject *); /* HasAttr.proto */ -#if __PYX_LIMITED_VERSION_HEX >= 0x030d00A1 -#define __Pyx_HasAttr(o, n) PyObject_HasAttrWithError(o, n) -#else static CYTHON_INLINE int __Pyx_HasAttr(PyObject *, PyObject *); -#endif /* PyObjectCallOneArg.proto */ static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg); @@ -2345,22 +2359,22 @@ static int __Pyx_MergeVtables(PyTypeObject *type); #endif /* TypeImport.proto */ -#ifndef __PYX_HAVE_RT_ImportType_proto_3_0_8 -#define __PYX_HAVE_RT_ImportType_proto_3_0_8 +#ifndef __PYX_HAVE_RT_ImportType_proto_3_0_11 +#define __PYX_HAVE_RT_ImportType_proto_3_0_11 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L #include #endif #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || __cplusplus >= 201103L -#define __PYX_GET_STRUCT_ALIGNMENT_3_0_8(s) alignof(s) +#define __PYX_GET_STRUCT_ALIGNMENT_3_0_11(s) alignof(s) #else -#define __PYX_GET_STRUCT_ALIGNMENT_3_0_8(s) sizeof(void*) +#define __PYX_GET_STRUCT_ALIGNMENT_3_0_11(s) sizeof(void*) #endif -enum __Pyx_ImportType_CheckSize_3_0_8 { - __Pyx_ImportType_CheckSize_Error_3_0_8 = 0, - __Pyx_ImportType_CheckSize_Warn_3_0_8 = 1, - __Pyx_ImportType_CheckSize_Ignore_3_0_8 = 2 +enum __Pyx_ImportType_CheckSize_3_0_11 { + __Pyx_ImportType_CheckSize_Error_3_0_11 = 0, + __Pyx_ImportType_CheckSize_Warn_3_0_11 = 1, + __Pyx_ImportType_CheckSize_Ignore_3_0_11 = 2 }; -static PyTypeObject *__Pyx_ImportType_3_0_8(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_8 check_size); +static PyTypeObject *__Pyx_ImportType_3_0_11(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_11 check_size); #endif /* Import.proto */ @@ -4049,7 +4063,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) { #define __pyx_codeobj__37 __pyx_mstate_global->__pyx_codeobj__37 /* #### Code section: module_code ### */ -/* "larch/pickle/pickle.pyx":284 +/* "larch/pickle/pickle.pyx":286 * cdef StringWriter *writer * * def __init__(self): # <<<<<<<<<<<<<< @@ -4088,7 +4102,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_12OutputBuffer___init__(struct __pyx_ const char *__pyx_filename = NULL; int __pyx_clineno = 0; - /* "larch/pickle/pickle.pyx":285 + /* "larch/pickle/pickle.pyx":287 * * def __init__(self): * self.writer = new StringWriter() # <<<<<<<<<<<<<< @@ -4099,11 +4113,11 @@ static int __pyx_pf_5larch_6pickle_6pickle_12OutputBuffer___init__(struct __pyx_ __pyx_t_1 = new StringWriter(); } catch(...) { __Pyx_CppExn2PyErr(); - __PYX_ERR(0, 285, __pyx_L1_error) + __PYX_ERR(0, 287, __pyx_L1_error) } __pyx_v_self->writer = __pyx_t_1; - /* "larch/pickle/pickle.pyx":284 + /* "larch/pickle/pickle.pyx":286 * cdef StringWriter *writer * * def __init__(self): # <<<<<<<<<<<<<< @@ -4121,7 +4135,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_12OutputBuffer___init__(struct __pyx_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":287 +/* "larch/pickle/pickle.pyx":289 * self.writer = new StringWriter() * * def __dealloc__(self): # <<<<<<<<<<<<<< @@ -4144,7 +4158,7 @@ static void __pyx_pw_5larch_6pickle_6pickle_12OutputBuffer_3__dealloc__(PyObject static void __pyx_pf_5larch_6pickle_6pickle_12OutputBuffer_2__dealloc__(struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *__pyx_v_self) { - /* "larch/pickle/pickle.pyx":288 + /* "larch/pickle/pickle.pyx":290 * * def __dealloc__(self): * del self.writer # <<<<<<<<<<<<<< @@ -4153,7 +4167,7 @@ static void __pyx_pf_5larch_6pickle_6pickle_12OutputBuffer_2__dealloc__(struct _ */ delete __pyx_v_self->writer; - /* "larch/pickle/pickle.pyx":287 + /* "larch/pickle/pickle.pyx":289 * self.writer = new StringWriter() * * def __dealloc__(self): # <<<<<<<<<<<<<< @@ -4164,7 +4178,7 @@ static void __pyx_pf_5larch_6pickle_6pickle_12OutputBuffer_2__dealloc__(struct _ /* function exit code */ } -/* "larch/pickle/pickle.pyx":290 +/* "larch/pickle/pickle.pyx":292 * del self.writer * * cdef void reset(self): # <<<<<<<<<<<<<< @@ -4174,7 +4188,7 @@ static void __pyx_pf_5larch_6pickle_6pickle_12OutputBuffer_2__dealloc__(struct _ static void __pyx_f_5larch_6pickle_6pickle_12OutputBuffer_reset(struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *__pyx_v_self) { - /* "larch/pickle/pickle.pyx":291 + /* "larch/pickle/pickle.pyx":293 * * cdef void reset(self): * self.writer.reset() # <<<<<<<<<<<<<< @@ -4183,7 +4197,7 @@ static void __pyx_f_5larch_6pickle_6pickle_12OutputBuffer_reset(struct __pyx_obj */ __pyx_v_self->writer->reset(); - /* "larch/pickle/pickle.pyx":290 + /* "larch/pickle/pickle.pyx":292 * del self.writer * * cdef void reset(self): # <<<<<<<<<<<<<< @@ -4194,7 +4208,7 @@ static void __pyx_f_5larch_6pickle_6pickle_12OutputBuffer_reset(struct __pyx_obj /* function exit code */ } -/* "larch/pickle/pickle.pyx":293 +/* "larch/pickle/pickle.pyx":295 * self.writer.reset() * * cdef bytes result(self): # <<<<<<<<<<<<<< @@ -4211,7 +4225,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_12OutputBuffer_result(struct __p int __pyx_clineno = 0; __Pyx_RefNannySetupContext("result", 1); - /* "larch/pickle/pickle.pyx":294 + /* "larch/pickle/pickle.pyx":296 * * cdef bytes result(self): * return self.writer.result() # <<<<<<<<<<<<<< @@ -4219,14 +4233,14 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_12OutputBuffer_result(struct __p * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __pyx_v_self->writer->result(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 294, __pyx_L1_error) + __pyx_t_1 = __pyx_v_self->writer->result(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 296, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (!(likely(PyBytes_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("bytes", __pyx_t_1))) __PYX_ERR(0, 294, __pyx_L1_error) + if (!(likely(PyBytes_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("bytes", __pyx_t_1))) __PYX_ERR(0, 296, __pyx_L1_error) __pyx_r = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":293 + /* "larch/pickle/pickle.pyx":295 * self.writer.reset() * * cdef bytes result(self): # <<<<<<<<<<<<<< @@ -4245,7 +4259,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_12OutputBuffer_result(struct __p return __pyx_r; } -/* "larch/pickle/pickle.pyx":297 +/* "larch/pickle/pickle.pyx":299 * * * cdef int write_buffer(object pickler, void* data, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4256,7 +4270,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_12OutputBuffer_result(struct __p static int __pyx_f_5larch_6pickle_6pickle_write_buffer(PyObject *__pyx_v_pickler, void *__pyx_v_data, size_t __pyx_v_size) { int __pyx_r; - /* "larch/pickle/pickle.pyx":298 + /* "larch/pickle/pickle.pyx":300 * * cdef int write_buffer(object pickler, void* data, size_t size) except -1: * return ((pickler).file).writer.write(data, size) # <<<<<<<<<<<<<< @@ -4266,7 +4280,7 @@ static int __pyx_f_5larch_6pickle_6pickle_write_buffer(PyObject *__pyx_v_pickler __pyx_r = ((struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_pickler)->file)->writer->write(__pyx_v_data, __pyx_v_size); goto __pyx_L0; - /* "larch/pickle/pickle.pyx":297 + /* "larch/pickle/pickle.pyx":299 * * * cdef int write_buffer(object pickler, void* data, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4279,7 +4293,7 @@ static int __pyx_f_5larch_6pickle_6pickle_write_buffer(PyObject *__pyx_v_pickler return __pyx_r; } -/* "larch/pickle/pickle.pyx":305 +/* "larch/pickle/pickle.pyx":307 * cdef StringReader sreader * * cdef _BufferContainer set(self, bytes buffer): # <<<<<<<<<<<<<< @@ -4297,7 +4311,7 @@ static struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *__pyx_f_5larch_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("set", 1); - /* "larch/pickle/pickle.pyx":306 + /* "larch/pickle/pickle.pyx":308 * * cdef _BufferContainer set(self, bytes buffer): * self.sreader.data = buffer # <<<<<<<<<<<<<< @@ -4306,12 +4320,12 @@ static struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *__pyx_f_5larch_ */ if (unlikely(__pyx_v_buffer == Py_None)) { PyErr_SetString(PyExc_TypeError, "expected bytes, NoneType found"); - __PYX_ERR(0, 306, __pyx_L1_error) + __PYX_ERR(0, 308, __pyx_L1_error) } - __pyx_t_1 = __Pyx_PyBytes_AsWritableString(__pyx_v_buffer); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 306, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyBytes_AsWritableString(__pyx_v_buffer); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 308, __pyx_L1_error) __pyx_v_self->sreader.data = __pyx_t_1; - /* "larch/pickle/pickle.pyx":307 + /* "larch/pickle/pickle.pyx":309 * cdef _BufferContainer set(self, bytes buffer): * self.sreader.data = buffer * self.sreader.pos = 0 # <<<<<<<<<<<<<< @@ -4320,7 +4334,7 @@ static struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *__pyx_f_5larch_ */ __pyx_v_self->sreader.pos = 0; - /* "larch/pickle/pickle.pyx":308 + /* "larch/pickle/pickle.pyx":310 * self.sreader.data = buffer * self.sreader.pos = 0 * self.sreader.size = len(buffer) # <<<<<<<<<<<<<< @@ -4329,12 +4343,12 @@ static struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *__pyx_f_5larch_ */ if (unlikely(__pyx_v_buffer == Py_None)) { PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()"); - __PYX_ERR(0, 308, __pyx_L1_error) + __PYX_ERR(0, 310, __pyx_L1_error) } - __pyx_t_2 = __Pyx_PyBytes_GET_SIZE(__pyx_v_buffer); if (unlikely(__pyx_t_2 == ((Py_ssize_t)-1))) __PYX_ERR(0, 308, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyBytes_GET_SIZE(__pyx_v_buffer); if (unlikely(__pyx_t_2 == ((Py_ssize_t)-1))) __PYX_ERR(0, 310, __pyx_L1_error) __pyx_v_self->sreader.size = __pyx_t_2; - /* "larch/pickle/pickle.pyx":309 + /* "larch/pickle/pickle.pyx":311 * self.sreader.pos = 0 * self.sreader.size = len(buffer) * return self # <<<<<<<<<<<<<< @@ -4346,7 +4360,7 @@ static struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *__pyx_f_5larch_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":305 + /* "larch/pickle/pickle.pyx":307 * cdef StringReader sreader * * cdef _BufferContainer set(self, bytes buffer): # <<<<<<<<<<<<<< @@ -4364,7 +4378,7 @@ static struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *__pyx_f_5larch_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":312 +/* "larch/pickle/pickle.pyx":314 * * * cdef int read_buffer(object unpickler, void* buffer, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4375,7 +4389,7 @@ static struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *__pyx_f_5larch_ static int __pyx_f_5larch_6pickle_6pickle_read_buffer(PyObject *__pyx_v_unpickler, void *__pyx_v_buffer, size_t __pyx_v_size) { int __pyx_r; - /* "larch/pickle/pickle.pyx":313 + /* "larch/pickle/pickle.pyx":315 * * cdef int read_buffer(object unpickler, void* buffer, size_t size) except -1: * (<_BufferContainer>(unpickler).file).sreader.read(buffer, size) # <<<<<<<<<<<<<< @@ -4384,7 +4398,7 @@ static int __pyx_f_5larch_6pickle_6pickle_read_buffer(PyObject *__pyx_v_unpickle */ ((struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_unpickler)->file)->sreader.read(__pyx_v_buffer, __pyx_v_size); - /* "larch/pickle/pickle.pyx":312 + /* "larch/pickle/pickle.pyx":314 * * * cdef int read_buffer(object unpickler, void* buffer, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4397,7 +4411,7 @@ static int __pyx_f_5larch_6pickle_6pickle_read_buffer(PyObject *__pyx_v_unpickle return __pyx_r; } -/* "larch/pickle/pickle.pyx":323 +/* "larch/pickle/pickle.pyx":325 * object read * * def __init__(self, file_like): # <<<<<<<<<<<<<< @@ -4441,12 +4455,12 @@ static int __pyx_pw_5larch_6pickle_6pickle_9_FileLike_1__init__(PyObject *__pyx_ (void)__Pyx_Arg_NewRef_VARARGS(values[0]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 323, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 325, __pyx_L3_error) else goto __pyx_L5_argtuple_error; } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 323, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 325, __pyx_L3_error) } } else if (unlikely(__pyx_nargs != 1)) { goto __pyx_L5_argtuple_error; @@ -4457,7 +4471,7 @@ static int __pyx_pw_5larch_6pickle_6pickle_9_FileLike_1__init__(PyObject *__pyx_ } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 323, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(0, 325, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -4493,14 +4507,14 @@ static int __pyx_pf_5larch_6pickle_6pickle_9_FileLike___init__(struct __pyx_obj_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__init__", 1); - /* "larch/pickle/pickle.pyx":324 + /* "larch/pickle/pickle.pyx":326 * * def __init__(self, file_like): * self.write = file_like.write # <<<<<<<<<<<<<< * self.read = file_like.read * */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_file_like, __pyx_n_s_write); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 324, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_file_like, __pyx_n_s_write); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 326, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_GIVEREF(__pyx_t_1); __Pyx_GOTREF(__pyx_v_self->write); @@ -4508,14 +4522,14 @@ static int __pyx_pf_5larch_6pickle_6pickle_9_FileLike___init__(struct __pyx_obj_ __pyx_v_self->write = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":325 + /* "larch/pickle/pickle.pyx":327 * def __init__(self, file_like): * self.write = file_like.write * self.read = file_like.read # <<<<<<<<<<<<<< * * */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_file_like, __pyx_n_s_read); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 325, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_file_like, __pyx_n_s_read); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 327, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_GIVEREF(__pyx_t_1); __Pyx_GOTREF(__pyx_v_self->read); @@ -4523,7 +4537,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9_FileLike___init__(struct __pyx_obj_ __pyx_v_self->read = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":323 + /* "larch/pickle/pickle.pyx":325 * object read * * def __init__(self, file_like): # <<<<<<<<<<<<<< @@ -4543,7 +4557,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9_FileLike___init__(struct __pyx_obj_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":328 +/* "larch/pickle/pickle.pyx":330 * * * cdef int write_file(object pickler, void* data, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4558,20 +4572,20 @@ static int __pyx_f_5larch_6pickle_6pickle_write_file(PyObject *__pyx_v_pickler, PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("write_file", 1); - /* "larch/pickle/pickle.pyx":329 + /* "larch/pickle/pickle.pyx":331 * * cdef int write_file(object pickler, void* data, size_t size) except -1: * (<_FileLike>(pickler).file).write((data)[:size]) # <<<<<<<<<<<<<< * return 1 * */ - __pyx_t_2 = __Pyx_PyBytes_FromStringAndSize(((char *)__pyx_v_data) + 0, __pyx_v_size - 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 329, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyBytes_FromStringAndSize(((char *)__pyx_v_data) + 0, __pyx_v_size - 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 331, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(((struct __pyx_obj_5larch_6pickle_6pickle__FileLike *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_pickler)->file)->write); __pyx_t_3 = ((struct __pyx_obj_5larch_6pickle_6pickle__FileLike *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_pickler)->file)->write; __pyx_t_4 = NULL; @@ -4593,13 +4607,13 @@ static int __pyx_f_5larch_6pickle_6pickle_write_file(PyObject *__pyx_v_pickler, __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 329, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 331, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":330 + /* "larch/pickle/pickle.pyx":332 * cdef int write_file(object pickler, void* data, size_t size) except -1: * (<_FileLike>(pickler).file).write((data)[:size]) * return 1 # <<<<<<<<<<<<<< @@ -4609,7 +4623,7 @@ static int __pyx_f_5larch_6pickle_6pickle_write_file(PyObject *__pyx_v_pickler, __pyx_r = 1; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":328 + /* "larch/pickle/pickle.pyx":330 * * * cdef int write_file(object pickler, void* data, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4630,7 +4644,7 @@ static int __pyx_f_5larch_6pickle_6pickle_write_file(PyObject *__pyx_v_pickler, return __pyx_r; } -/* "larch/pickle/pickle.pyx":333 +/* "larch/pickle/pickle.pyx":335 * * * cdef int read_file(object unpickler, void* data, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4648,34 +4662,34 @@ static int __pyx_f_5larch_6pickle_6pickle_read_file(PyObject *__pyx_v_unpickler, PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_t_6; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("read_file", 1); - /* "larch/pickle/pickle.pyx":335 + /* "larch/pickle/pickle.pyx":337 * cdef int read_file(object unpickler, void* data, size_t size) except -1: * cdef: * _FileLike f = (unpickler).file # <<<<<<<<<<<<<< * bytes b = f.read(size) * size_t rsize = PyBytes_GET_SIZE(b) */ - if (!(likely(((((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_unpickler)->file) == Py_None) || likely(__Pyx_TypeTest(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_unpickler)->file, __pyx_ptype_5larch_6pickle_6pickle__FileLike))))) __PYX_ERR(0, 335, __pyx_L1_error) + if (!(likely(((((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_unpickler)->file) == Py_None) || likely(__Pyx_TypeTest(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_unpickler)->file, __pyx_ptype_5larch_6pickle_6pickle__FileLike))))) __PYX_ERR(0, 337, __pyx_L1_error) __pyx_t_1 = ((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_unpickler)->file; __Pyx_INCREF(__pyx_t_1); __pyx_v_f = ((struct __pyx_obj_5larch_6pickle_6pickle__FileLike *)__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":336 + /* "larch/pickle/pickle.pyx":338 * cdef: * _FileLike f = (unpickler).file * bytes b = f.read(size) # <<<<<<<<<<<<<< * size_t rsize = PyBytes_GET_SIZE(b) * */ - __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_size); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 336, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_size); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 338, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_f->read); __pyx_t_3 = __pyx_v_f->read; __pyx_t_4 = NULL; @@ -4697,15 +4711,15 @@ static int __pyx_f_5larch_6pickle_6pickle_read_file(PyObject *__pyx_v_unpickler, __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 336, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 338, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } - if (!(likely(PyBytes_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("bytes", __pyx_t_1))) __PYX_ERR(0, 336, __pyx_L1_error) + if (!(likely(PyBytes_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("bytes", __pyx_t_1))) __PYX_ERR(0, 338, __pyx_L1_error) __pyx_v_b = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":337 + /* "larch/pickle/pickle.pyx":339 * _FileLike f = (unpickler).file * bytes b = f.read(size) * size_t rsize = PyBytes_GET_SIZE(b) # <<<<<<<<<<<<<< @@ -4714,7 +4728,7 @@ static int __pyx_f_5larch_6pickle_6pickle_read_file(PyObject *__pyx_v_unpickler, */ __pyx_v_rsize = PyBytes_GET_SIZE(__pyx_v_b); - /* "larch/pickle/pickle.pyx":339 + /* "larch/pickle/pickle.pyx":341 * size_t rsize = PyBytes_GET_SIZE(b) * * if rsize != size: # <<<<<<<<<<<<<< @@ -4724,20 +4738,20 @@ static int __pyx_f_5larch_6pickle_6pickle_read_file(PyObject *__pyx_v_unpickler, __pyx_t_6 = (__pyx_v_rsize != __pyx_v_size); if (unlikely(__pyx_t_6)) { - /* "larch/pickle/pickle.pyx":340 + /* "larch/pickle/pickle.pyx":342 * * if rsize != size: * raise EOFError() # <<<<<<<<<<<<<< * * memcpy(data, Bytes_AS_STRING(b), rsize) */ - __pyx_t_1 = __Pyx_PyObject_CallNoArg(__pyx_builtin_EOFError); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 340, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_CallNoArg(__pyx_builtin_EOFError); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 342, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_Raise(__pyx_t_1, 0, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __PYX_ERR(0, 340, __pyx_L1_error) + __PYX_ERR(0, 342, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":339 + /* "larch/pickle/pickle.pyx":341 * size_t rsize = PyBytes_GET_SIZE(b) * * if rsize != size: # <<<<<<<<<<<<<< @@ -4746,7 +4760,7 @@ static int __pyx_f_5larch_6pickle_6pickle_read_file(PyObject *__pyx_v_unpickler, */ } - /* "larch/pickle/pickle.pyx":342 + /* "larch/pickle/pickle.pyx":344 * raise EOFError() * * memcpy(data, Bytes_AS_STRING(b), rsize) # <<<<<<<<<<<<<< @@ -4755,7 +4769,7 @@ static int __pyx_f_5larch_6pickle_6pickle_read_file(PyObject *__pyx_v_unpickler, */ (void)(memcpy(__pyx_v_data, PyBytes_AS_STRING(__pyx_v_b), __pyx_v_rsize)); - /* "larch/pickle/pickle.pyx":343 + /* "larch/pickle/pickle.pyx":345 * * memcpy(data, Bytes_AS_STRING(b), rsize) * return 1 # <<<<<<<<<<<<<< @@ -4765,7 +4779,7 @@ static int __pyx_f_5larch_6pickle_6pickle_read_file(PyObject *__pyx_v_unpickler, __pyx_r = 1; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":333 + /* "larch/pickle/pickle.pyx":335 * * * cdef int read_file(object unpickler, void* data, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4788,7 +4802,7 @@ static int __pyx_f_5larch_6pickle_6pickle_read_file(PyObject *__pyx_v_unpickler, return __pyx_r; } -/* "larch/pickle/pickle.pyx":353 +/* "larch/pickle/pickle.pyx":355 * read_file_t read * * cdef int write_external(object pickler, void* data, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4807,7 +4821,7 @@ static int __pyx_f_5larch_6pickle_6pickle_write_external(PyObject *__pyx_v_pickl int __pyx_clineno = 0; __Pyx_RefNannySetupContext("write_external", 1); - /* "larch/pickle/pickle.pyx":354 + /* "larch/pickle/pickle.pyx":356 * * cdef int write_external(object pickler, void* data, size_t size) except -1: * cdef ExternFileLike ef = (pickler).file # <<<<<<<<<<<<<< @@ -4819,7 +4833,7 @@ static int __pyx_f_5larch_6pickle_6pickle_write_external(PyObject *__pyx_v_pickl __pyx_v_ef = ((struct __pyx_obj_5larch_6pickle_6pickle_ExternFileLike *)__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":355 + /* "larch/pickle/pickle.pyx":357 * cdef int write_external(object pickler, void* data, size_t size) except -1: * cdef ExternFileLike ef = (pickler).file * return ef.write(ef.file, data, size) # <<<<<<<<<<<<<< @@ -4828,12 +4842,12 @@ static int __pyx_f_5larch_6pickle_6pickle_write_external(PyObject *__pyx_v_pickl */ __pyx_t_1 = __pyx_v_ef->file; __Pyx_INCREF(__pyx_t_1); - __pyx_t_2 = __pyx_v_ef->write(__pyx_t_1, __pyx_v_data, __pyx_v_size); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 355, __pyx_L1_error) + __pyx_t_2 = __pyx_v_ef->write(__pyx_t_1, __pyx_v_data, __pyx_v_size); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 357, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_r = __pyx_t_2; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":353 + /* "larch/pickle/pickle.pyx":355 * read_file_t read * * cdef int write_external(object pickler, void* data, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4852,7 +4866,7 @@ static int __pyx_f_5larch_6pickle_6pickle_write_external(PyObject *__pyx_v_pickl return __pyx_r; } -/* "larch/pickle/pickle.pyx":358 +/* "larch/pickle/pickle.pyx":360 * * * cdef int read_external(object unpickler, void* data, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4871,7 +4885,7 @@ static int __pyx_f_5larch_6pickle_6pickle_read_external(PyObject *__pyx_v_unpick int __pyx_clineno = 0; __Pyx_RefNannySetupContext("read_external", 1); - /* "larch/pickle/pickle.pyx":359 + /* "larch/pickle/pickle.pyx":361 * * cdef int read_external(object unpickler, void* data, size_t size) except -1: * cdef ExternFileLike ef = (unpickler).file # <<<<<<<<<<<<<< @@ -4883,7 +4897,7 @@ static int __pyx_f_5larch_6pickle_6pickle_read_external(PyObject *__pyx_v_unpick __pyx_v_ef = ((struct __pyx_obj_5larch_6pickle_6pickle_ExternFileLike *)__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":360 + /* "larch/pickle/pickle.pyx":362 * cdef int read_external(object unpickler, void* data, size_t size) except -1: * cdef ExternFileLike ef = (unpickler).file * return ef.read(ef.file, data, size) # <<<<<<<<<<<<<< @@ -4892,12 +4906,12 @@ static int __pyx_f_5larch_6pickle_6pickle_read_external(PyObject *__pyx_v_unpick */ __pyx_t_1 = __pyx_v_ef->file; __Pyx_INCREF(__pyx_t_1); - __pyx_t_2 = __pyx_v_ef->read(__pyx_t_1, __pyx_v_data, __pyx_v_size); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 360, __pyx_L1_error) + __pyx_t_2 = __pyx_v_ef->read(__pyx_t_1, __pyx_v_data, __pyx_v_size); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 362, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_r = __pyx_t_2; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":358 + /* "larch/pickle/pickle.pyx":360 * * * cdef int read_external(object unpickler, void* data, size_t size) except -1: # <<<<<<<<<<<<<< @@ -4916,7 +4930,7 @@ static int __pyx_f_5larch_6pickle_6pickle_read_external(PyObject *__pyx_v_unpick return __pyx_r; } -/* "larch/pickle/pickle.pyx":386 +/* "larch/pickle/pickle.pyx":388 * # ---------------------------------- * * cdef inline void reraise(): # <<<<<<<<<<<<<< @@ -4932,7 +4946,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + unsigned int __pyx_t_4; PyObject *__pyx_t_5 = NULL; PyObject *__pyx_t_6 = NULL; PyObject *(*__pyx_t_7)(PyObject *); @@ -4941,16 +4955,16 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("reraise", 1); - /* "larch/pickle/pickle.pyx":387 + /* "larch/pickle/pickle.pyx":389 * * cdef inline void reraise(): * type_, exc, traceback = sys.exc_info() # <<<<<<<<<<<<<< * PyErr_Restore(type_, exc, traceback) * throw_python_error() */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_sys); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 387, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_sys); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_exc_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 387, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_exc_info); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = NULL; @@ -4971,7 +4985,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { PyObject *__pyx_callargs[2] = {__pyx_t_2, NULL}; __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_4, 0+__pyx_t_4); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 387, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } @@ -4981,7 +4995,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { if (unlikely(size != 3)) { if (size > 3) __Pyx_RaiseTooManyValuesError(3); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 387, __pyx_L1_error) + __PYX_ERR(0, 389, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -4997,17 +5011,17 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { __Pyx_INCREF(__pyx_t_2); __Pyx_INCREF(__pyx_t_5); #else - __pyx_t_3 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 387, __pyx_L1_error) + __pyx_t_3 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 387, __pyx_L1_error) + __pyx_t_2 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 387, __pyx_L1_error) + __pyx_t_5 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } else { Py_ssize_t index = -1; - __pyx_t_6 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 387, __pyx_L1_error) + __pyx_t_6 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 389, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_7 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_6); @@ -5017,7 +5031,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { __Pyx_GOTREF(__pyx_t_2); index = 2; __pyx_t_5 = __pyx_t_7(__pyx_t_6); if (unlikely(!__pyx_t_5)) goto __pyx_L3_unpacking_failed; __Pyx_GOTREF(__pyx_t_5); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_7(__pyx_t_6), 3) < 0) __PYX_ERR(0, 387, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_7(__pyx_t_6), 3) < 0) __PYX_ERR(0, 389, __pyx_L1_error) __pyx_t_7 = NULL; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; goto __pyx_L4_unpacking_done; @@ -5025,7 +5039,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __pyx_t_7 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 387, __pyx_L1_error) + __PYX_ERR(0, 389, __pyx_L1_error) __pyx_L4_unpacking_done:; } __pyx_v_type_ = __pyx_t_3; @@ -5035,7 +5049,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { __pyx_v_traceback = __pyx_t_5; __pyx_t_5 = 0; - /* "larch/pickle/pickle.pyx":388 + /* "larch/pickle/pickle.pyx":390 * cdef inline void reraise(): * type_, exc, traceback = sys.exc_info() * PyErr_Restore(type_, exc, traceback) # <<<<<<<<<<<<<< @@ -5044,7 +5058,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { */ PyErr_Restore(((PyObject *)__pyx_v_type_), ((PyObject *)__pyx_v_exc), ((PyObject *)__pyx_v_traceback)); - /* "larch/pickle/pickle.pyx":389 + /* "larch/pickle/pickle.pyx":391 * type_, exc, traceback = sys.exc_info() * PyErr_Restore(type_, exc, traceback) * throw_python_error() # <<<<<<<<<<<<<< @@ -5053,7 +5067,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { */ throw_python_error(); - /* "larch/pickle/pickle.pyx":386 + /* "larch/pickle/pickle.pyx":388 * # ---------------------------------- * * cdef inline void reraise(): # <<<<<<<<<<<<<< @@ -5077,7 +5091,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_reraise(void) { __Pyx_RefNannyFinishContext(); } -/* "larch/pickle/pickle.pyx":392 +/* "larch/pickle/pickle.pyx":394 * * * cdef void save_long(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -5105,7 +5119,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject int __pyx_clineno = 0; __Pyx_RefNannySetupContext("save_long", 1); - /* "larch/pickle/pickle.pyx":395 + /* "larch/pickle/pickle.pyx":397 * # see original _pickle.c * cdef: * size_t nbytes, nbits = _PyLong_NumBits(o) # <<<<<<<<<<<<<< @@ -5114,7 +5128,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ __pyx_v_nbits = _PyLong_NumBits(__pyx_v_o); - /* "larch/pickle/pickle.pyx":396 + /* "larch/pickle/pickle.pyx":398 * cdef: * size_t nbytes, nbits = _PyLong_NumBits(o) * int sign = _PyLong_Sign(o) # <<<<<<<<<<<<<< @@ -5123,7 +5137,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ __pyx_v_sign = _PyLong_Sign(__pyx_v_o); - /* "larch/pickle/pickle.pyx":401 + /* "larch/pickle/pickle.pyx":403 * long v * * try: # <<<<<<<<<<<<<< @@ -5139,17 +5153,17 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "larch/pickle/pickle.pyx":402 + /* "larch/pickle/pickle.pyx":404 * * try: * v = PyLong_AsLong(o) # <<<<<<<<<<<<<< * except: * pass */ - __pyx_t_4 = PyLong_AsLong(__pyx_v_o); if (unlikely(__pyx_t_4 == ((long)-1L) && PyErr_Occurred())) __PYX_ERR(0, 402, __pyx_L3_error) + __pyx_t_4 = PyLong_AsLong(__pyx_v_o); if (unlikely(__pyx_t_4 == ((long)-1L) && PyErr_Occurred())) __PYX_ERR(0, 404, __pyx_L3_error) __pyx_v_v = __pyx_t_4; - /* "larch/pickle/pickle.pyx":401 + /* "larch/pickle/pickle.pyx":403 * long v * * try: # <<<<<<<<<<<<<< @@ -5158,7 +5172,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ } - /* "larch/pickle/pickle.pyx":406 + /* "larch/pickle/pickle.pyx":408 * pass * else: * p.pack_int(v) # <<<<<<<<<<<<<< @@ -5168,7 +5182,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject /*else:*/ { (void)(__pyx_v_p->pack_int(__pyx_v_v)); - /* "larch/pickle/pickle.pyx":407 + /* "larch/pickle/pickle.pyx":409 * else: * p.pack_int(v) * return # <<<<<<<<<<<<<< @@ -5179,7 +5193,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject } __pyx_L3_error:; - /* "larch/pickle/pickle.pyx":403 + /* "larch/pickle/pickle.pyx":405 * try: * v = PyLong_AsLong(o) * except: # <<<<<<<<<<<<<< @@ -5191,7 +5205,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject goto __pyx_L4_exception_handled; } - /* "larch/pickle/pickle.pyx":401 + /* "larch/pickle/pickle.pyx":403 * long v * * try: # <<<<<<<<<<<<<< @@ -5211,7 +5225,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject __Pyx_ExceptionReset(__pyx_t_1, __pyx_t_2, __pyx_t_3); } - /* "larch/pickle/pickle.pyx":409 + /* "larch/pickle/pickle.pyx":411 * return * * if p.save_ref(o): return # <<<<<<<<<<<<<< @@ -5223,7 +5237,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject goto __pyx_L0; } - /* "larch/pickle/pickle.pyx":411 + /* "larch/pickle/pickle.pyx":413 * if p.save_ref(o): return * * nbytes = (nbits >> 3) + 1 # <<<<<<<<<<<<<< @@ -5232,7 +5246,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ __pyx_v_nbytes = ((__pyx_v_nbits >> 3) + 1); - /* "larch/pickle/pickle.pyx":412 + /* "larch/pickle/pickle.pyx":414 * * nbytes = (nbits >> 3) + 1 * if nbytes > 0x7fffffffL: # <<<<<<<<<<<<<< @@ -5242,7 +5256,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject __pyx_t_5 = (__pyx_v_nbytes > 0x7fffffffL); if (__pyx_t_5) { - /* "larch/pickle/pickle.pyx":413 + /* "larch/pickle/pickle.pyx":415 * nbytes = (nbits >> 3) + 1 * if nbytes > 0x7fffffffL: * PyErr_SetString(OverflowError, "long too large to pickle") # <<<<<<<<<<<<<< @@ -5251,7 +5265,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ PyErr_SetString(__pyx_builtin_OverflowError, ((char *)"long too large to pickle")); - /* "larch/pickle/pickle.pyx":414 + /* "larch/pickle/pickle.pyx":416 * if nbytes > 0x7fffffffL: * PyErr_SetString(OverflowError, "long too large to pickle") * throw_python_error() # <<<<<<<<<<<<<< @@ -5260,7 +5274,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ throw_python_error(); - /* "larch/pickle/pickle.pyx":412 + /* "larch/pickle/pickle.pyx":414 * * nbytes = (nbits >> 3) + 1 * if nbytes > 0x7fffffffL: # <<<<<<<<<<<<<< @@ -5269,56 +5283,56 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ } - /* "larch/pickle/pickle.pyx":416 + /* "larch/pickle/pickle.pyx":418 * throw_python_error() * * tmp = PyBytes_FromStringAndSize(NULL, nbytes) # <<<<<<<<<<<<<< * data = Bytes_AS_STRING(tmp) * */ - __pyx_t_6 = PyBytes_FromStringAndSize(NULL, __pyx_v_nbytes); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 416, __pyx_L1_error) + __pyx_t_6 = PyBytes_FromStringAndSize(NULL, __pyx_v_nbytes); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 418, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __pyx_v_tmp = ((PyObject*)__pyx_t_6); __pyx_t_6 = 0; - /* "larch/pickle/pickle.pyx":417 + /* "larch/pickle/pickle.pyx":419 * * tmp = PyBytes_FromStringAndSize(NULL, nbytes) * data = Bytes_AS_STRING(tmp) # <<<<<<<<<<<<<< * - * if _PyLong_AsByteArray(o, data, nbytes, 1, 1) < 0: + * if CPyLong_AsByteArray(o, data, nbytes, 1, 1) < 0: */ __pyx_v_data = PyBytes_AS_STRING(__pyx_v_tmp); - /* "larch/pickle/pickle.pyx":419 + /* "larch/pickle/pickle.pyx":421 * data = Bytes_AS_STRING(tmp) * - * if _PyLong_AsByteArray(o, data, nbytes, 1, 1) < 0: # <<<<<<<<<<<<<< + * if CPyLong_AsByteArray(o, data, nbytes, 1, 1) < 0: # <<<<<<<<<<<<<< * throw_python_error() * */ - __pyx_t_5 = (_PyLong_AsByteArray(((PyLongObject *)__pyx_v_o), ((unsigned char *)__pyx_v_data), __pyx_v_nbytes, 1, 1) < 0); + __pyx_t_5 = (CPyLong_AsByteArray(((PyLongObject *)__pyx_v_o), ((unsigned char *)__pyx_v_data), __pyx_v_nbytes, 1, 1) < 0); if (__pyx_t_5) { - /* "larch/pickle/pickle.pyx":420 + /* "larch/pickle/pickle.pyx":422 * - * if _PyLong_AsByteArray(o, data, nbytes, 1, 1) < 0: + * if CPyLong_AsByteArray(o, data, nbytes, 1, 1) < 0: * throw_python_error() # <<<<<<<<<<<<<< * * if (sign < 0 and nbytes > 1 */ throw_python_error(); - /* "larch/pickle/pickle.pyx":419 + /* "larch/pickle/pickle.pyx":421 * data = Bytes_AS_STRING(tmp) * - * if _PyLong_AsByteArray(o, data, nbytes, 1, 1) < 0: # <<<<<<<<<<<<<< + * if CPyLong_AsByteArray(o, data, nbytes, 1, 1) < 0: # <<<<<<<<<<<<<< * throw_python_error() * */ } - /* "larch/pickle/pickle.pyx":422 + /* "larch/pickle/pickle.pyx":424 * throw_python_error() * * if (sign < 0 and nbytes > 1 # <<<<<<<<<<<<<< @@ -5332,7 +5346,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject goto __pyx_L13_bool_binop_done; } - /* "larch/pickle/pickle.pyx":423 + /* "larch/pickle/pickle.pyx":425 * * if (sign < 0 and nbytes > 1 * and data[nbytes-1] == 0xff and (data[nbytes-2] & 0x80) != 0): # <<<<<<<<<<<<<< @@ -5355,7 +5369,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject __pyx_t_5 = __pyx_t_7; __pyx_L13_bool_binop_done:; - /* "larch/pickle/pickle.pyx":422 + /* "larch/pickle/pickle.pyx":424 * throw_python_error() * * if (sign < 0 and nbytes > 1 # <<<<<<<<<<<<<< @@ -5364,7 +5378,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ if (__pyx_t_5) { - /* "larch/pickle/pickle.pyx":424 + /* "larch/pickle/pickle.pyx":426 * if (sign < 0 and nbytes > 1 * and data[nbytes-1] == 0xff and (data[nbytes-2] & 0x80) != 0): * nbytes -= 1 # <<<<<<<<<<<<<< @@ -5373,7 +5387,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ __pyx_v_nbytes = (__pyx_v_nbytes - 1); - /* "larch/pickle/pickle.pyx":422 + /* "larch/pickle/pickle.pyx":424 * throw_python_error() * * if (sign < 0 and nbytes > 1 # <<<<<<<<<<<<<< @@ -5382,7 +5396,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ } - /* "larch/pickle/pickle.pyx":426 + /* "larch/pickle/pickle.pyx":428 * nbytes -= 1 * * p.pack_ext(LONG, nbytes) # <<<<<<<<<<<<<< @@ -5391,7 +5405,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ (void)(__pyx_v_p->pack_ext(LONG, __pyx_v_nbytes)); - /* "larch/pickle/pickle.pyx":427 + /* "larch/pickle/pickle.pyx":429 * * p.pack_ext(LONG, nbytes) * p.write(data, nbytes) # <<<<<<<<<<<<<< @@ -5400,7 +5414,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject */ __pyx_v_p->write(((char *)__pyx_v_data), __pyx_v_nbytes); - /* "larch/pickle/pickle.pyx":392 + /* "larch/pickle/pickle.pyx":394 * * * cdef void save_long(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -5418,7 +5432,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_long(Packer *__pyx_v_p, PyObject __Pyx_RefNannyFinishContext(); } -/* "larch/pickle/pickle.pyx":430 +/* "larch/pickle/pickle.pyx":432 * * * cdef inline int _save_global(Packer* p, object o) except -1: # <<<<<<<<<<<<<< @@ -5433,16 +5447,16 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_global(Packer *__p const char *__pyx_filename = NULL; int __pyx_clineno = 0; - /* "larch/pickle/pickle.pyx":431 + /* "larch/pickle/pickle.pyx":433 * * cdef inline int _save_global(Packer* p, object o) except -1: * (p.pickler).pack_import1(GLOBAL, o) # <<<<<<<<<<<<<< * * */ - __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import1(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), GLOBAL, __pyx_v_o); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 431, __pyx_L1_error) + __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import1(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), GLOBAL, __pyx_v_o); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 433, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":430 + /* "larch/pickle/pickle.pyx":432 * * * cdef inline int _save_global(Packer* p, object o) except -1: # <<<<<<<<<<<<<< @@ -5460,7 +5474,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_global(Packer *__p return __pyx_r; } -/* "larch/pickle/pickle.pyx":434 +/* "larch/pickle/pickle.pyx":436 * * * cdef void save_global(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -5482,7 +5496,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_global(Packer *__pyx_v_p, PyObje int __pyx_clineno = 0; __Pyx_RefNannySetupContext("save_global", 1); - /* "larch/pickle/pickle.pyx":435 + /* "larch/pickle/pickle.pyx":437 * * cdef void save_global(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -5498,16 +5512,16 @@ static void __pyx_f_5larch_6pickle_6pickle_save_global(Packer *__pyx_v_p, PyObje __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "larch/pickle/pickle.pyx":436 + /* "larch/pickle/pickle.pyx":438 * cdef void save_global(Packer* p, object o) noexcept: * try: * _save_global(p, o) # <<<<<<<<<<<<<< * except: * reraise() */ - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__save_global(__pyx_v_p, __pyx_v_o); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 436, __pyx_L3_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__save_global(__pyx_v_p, __pyx_v_o); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 438, __pyx_L3_error) - /* "larch/pickle/pickle.pyx":435 + /* "larch/pickle/pickle.pyx":437 * * cdef void save_global(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -5521,7 +5535,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_global(Packer *__pyx_v_p, PyObje goto __pyx_L8_try_end; __pyx_L3_error:; - /* "larch/pickle/pickle.pyx":437 + /* "larch/pickle/pickle.pyx":439 * try: * _save_global(p, o) * except: # <<<<<<<<<<<<<< @@ -5530,26 +5544,26 @@ static void __pyx_f_5larch_6pickle_6pickle_save_global(Packer *__pyx_v_p, PyObje */ /*except:*/ { __Pyx_AddTraceback("larch.pickle.pickle.save_global", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(0, 437, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(0, 439, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_5); __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "larch/pickle/pickle.pyx":438 + /* "larch/pickle/pickle.pyx":440 * _save_global(p, o) * except: * reraise() # <<<<<<<<<<<<<< * * */ - __pyx_f_5larch_6pickle_6pickle_reraise(); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 438, __pyx_L5_except_error) + __pyx_f_5larch_6pickle_6pickle_reraise(); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 440, __pyx_L5_except_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; goto __pyx_L4_exception_handled; } - /* "larch/pickle/pickle.pyx":435 + /* "larch/pickle/pickle.pyx":437 * * cdef void save_global(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -5570,7 +5584,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_global(Packer *__pyx_v_p, PyObje __pyx_L8_try_end:; } - /* "larch/pickle/pickle.pyx":434 + /* "larch/pickle/pickle.pyx":436 * * * cdef void save_global(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -5589,7 +5603,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_global(Packer *__pyx_v_p, PyObje __Pyx_RefNannyFinishContext(); } -/* "larch/pickle/pickle.pyx":441 +/* "larch/pickle/pickle.pyx":443 * * * cdef pack_state_array(Packer *p, tuple state): # <<<<<<<<<<<<<< @@ -5612,7 +5626,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v int __pyx_clineno = 0; __Pyx_RefNannySetupContext("pack_state_array", 1); - /* "larch/pickle/pickle.pyx":443 + /* "larch/pickle/pickle.pyx":445 * cdef pack_state_array(Packer *p, tuple state): * cdef PyObject* tmp * tmp = PyTuple_GET_ITEM(state, 3) # <<<<<<<<<<<<<< @@ -5621,7 +5635,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v */ __pyx_v_tmp = PyTuple_GET_ITEM(__pyx_v_state, 3); - /* "larch/pickle/pickle.pyx":444 + /* "larch/pickle/pickle.pyx":446 * cdef PyObject* tmp * tmp = PyTuple_GET_ITEM(state, 3) * if tmp is not None: # <<<<<<<<<<<<<< @@ -5631,7 +5645,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v __pyx_t_1 = (((PyObject *)__pyx_v_tmp) != Py_None); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":445 + /* "larch/pickle/pickle.pyx":447 * tmp = PyTuple_GET_ITEM(state, 3) * if tmp is not None: * for i in tmp: # <<<<<<<<<<<<<< @@ -5643,9 +5657,9 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v __pyx_t_3 = 0; __pyx_t_4 = NULL; } else { - __pyx_t_3 = -1; __pyx_t_2 = PyObject_GetIter(((PyObject *)__pyx_v_tmp)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 445, __pyx_L1_error) + __pyx_t_3 = -1; __pyx_t_2 = PyObject_GetIter(((PyObject *)__pyx_v_tmp)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 447, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 445, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 447, __pyx_L1_error) } for (;;) { if (likely(!__pyx_t_4)) { @@ -5653,28 +5667,28 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v { Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_t_2); #if !CYTHON_ASSUME_SAFE_MACROS - if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 445, __pyx_L1_error) + if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 447, __pyx_L1_error) #endif if (__pyx_t_3 >= __pyx_temp) break; } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_5); __pyx_t_3++; if (unlikely((0 < 0))) __PYX_ERR(0, 445, __pyx_L1_error) + __pyx_t_5 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_5); __pyx_t_3++; if (unlikely((0 < 0))) __PYX_ERR(0, 447, __pyx_L1_error) #else - __pyx_t_5 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 445, __pyx_L1_error) + __pyx_t_5 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 447, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } else { { Py_ssize_t __pyx_temp = __Pyx_PyTuple_GET_SIZE(__pyx_t_2); #if !CYTHON_ASSUME_SAFE_MACROS - if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 445, __pyx_L1_error) + if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 447, __pyx_L1_error) #endif if (__pyx_t_3 >= __pyx_temp) break; } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_5); __pyx_t_3++; if (unlikely((0 < 0))) __PYX_ERR(0, 445, __pyx_L1_error) + __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_5); __pyx_t_3++; if (unlikely((0 < 0))) __PYX_ERR(0, 447, __pyx_L1_error) #else - __pyx_t_5 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 445, __pyx_L1_error) + __pyx_t_5 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 447, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } @@ -5684,7 +5698,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 445, __pyx_L1_error) + else __PYX_ERR(0, 447, __pyx_L1_error) } break; } @@ -5693,7 +5707,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_5); __pyx_t_5 = 0; - /* "larch/pickle/pickle.pyx":446 + /* "larch/pickle/pickle.pyx":448 * if tmp is not None: * for i in tmp: * p.dump(i) # <<<<<<<<<<<<<< @@ -5702,7 +5716,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v */ __pyx_v_p->dump(__pyx_v_i); - /* "larch/pickle/pickle.pyx":445 + /* "larch/pickle/pickle.pyx":447 * tmp = PyTuple_GET_ITEM(state, 3) * if tmp is not None: * for i in tmp: # <<<<<<<<<<<<<< @@ -5712,7 +5726,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":444 + /* "larch/pickle/pickle.pyx":446 * cdef PyObject* tmp * tmp = PyTuple_GET_ITEM(state, 3) * if tmp is not None: # <<<<<<<<<<<<<< @@ -5721,7 +5735,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v */ } - /* "larch/pickle/pickle.pyx":441 + /* "larch/pickle/pickle.pyx":443 * * * cdef pack_state_array(Packer *p, tuple state): # <<<<<<<<<<<<<< @@ -5744,7 +5758,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_array(Packer *__pyx_v return __pyx_r; } -/* "larch/pickle/pickle.pyx":449 +/* "larch/pickle/pickle.pyx":451 * * * cdef pack_state_dict(Packer *p, tuple state): # <<<<<<<<<<<<<< @@ -5772,7 +5786,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("pack_state_dict", 1); - /* "larch/pickle/pickle.pyx":451 + /* "larch/pickle/pickle.pyx":453 * cdef pack_state_dict(Packer *p, tuple state): * cdef PyObject* tmp * tmp = PyTuple_GET_ITEM(state, 4) # <<<<<<<<<<<<<< @@ -5781,7 +5795,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ */ __pyx_v_tmp = PyTuple_GET_ITEM(__pyx_v_state, 4); - /* "larch/pickle/pickle.pyx":452 + /* "larch/pickle/pickle.pyx":454 * cdef PyObject* tmp * tmp = PyTuple_GET_ITEM(state, 4) * if tmp is not None: # <<<<<<<<<<<<<< @@ -5791,7 +5805,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ __pyx_t_1 = (((PyObject *)__pyx_v_tmp) != Py_None); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":453 + /* "larch/pickle/pickle.pyx":455 * tmp = PyTuple_GET_ITEM(state, 4) * if tmp is not None: * for k, v in tmp: # <<<<<<<<<<<<<< @@ -5803,9 +5817,9 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ __pyx_t_3 = 0; __pyx_t_4 = NULL; } else { - __pyx_t_3 = -1; __pyx_t_2 = PyObject_GetIter(((PyObject *)__pyx_v_tmp)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_t_3 = -1; __pyx_t_2 = PyObject_GetIter(((PyObject *)__pyx_v_tmp)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 455, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 455, __pyx_L1_error) } for (;;) { if (likely(!__pyx_t_4)) { @@ -5813,28 +5827,28 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ { Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_t_2); #if !CYTHON_ASSUME_SAFE_MACROS - if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 453, __pyx_L1_error) + if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 455, __pyx_L1_error) #endif if (__pyx_t_3 >= __pyx_temp) break; } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_5); __pyx_t_3++; if (unlikely((0 < 0))) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_t_5 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_5); __pyx_t_3++; if (unlikely((0 < 0))) __PYX_ERR(0, 455, __pyx_L1_error) #else - __pyx_t_5 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_t_5 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 455, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } else { { Py_ssize_t __pyx_temp = __Pyx_PyTuple_GET_SIZE(__pyx_t_2); #if !CYTHON_ASSUME_SAFE_MACROS - if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 453, __pyx_L1_error) + if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 455, __pyx_L1_error) #endif if (__pyx_t_3 >= __pyx_temp) break; } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_5); __pyx_t_3++; if (unlikely((0 < 0))) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_5); __pyx_t_3++; if (unlikely((0 < 0))) __PYX_ERR(0, 455, __pyx_L1_error) #else - __pyx_t_5 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_t_5 = __Pyx_PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 455, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } @@ -5844,7 +5858,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 453, __pyx_L1_error) + else __PYX_ERR(0, 455, __pyx_L1_error) } break; } @@ -5856,7 +5870,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 453, __pyx_L1_error) + __PYX_ERR(0, 455, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -5869,15 +5883,15 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ __Pyx_INCREF(__pyx_t_6); __Pyx_INCREF(__pyx_t_7); #else - __pyx_t_6 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_t_6 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 455, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 455, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); #endif __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } else { Py_ssize_t index = -1; - __pyx_t_8 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 453, __pyx_L1_error) + __pyx_t_8 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 455, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_9 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_8); @@ -5885,7 +5899,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ __Pyx_GOTREF(__pyx_t_6); index = 1; __pyx_t_7 = __pyx_t_9(__pyx_t_8); if (unlikely(!__pyx_t_7)) goto __pyx_L6_unpacking_failed; __Pyx_GOTREF(__pyx_t_7); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_9(__pyx_t_8), 2) < 0) __PYX_ERR(0, 453, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_9(__pyx_t_8), 2) < 0) __PYX_ERR(0, 455, __pyx_L1_error) __pyx_t_9 = NULL; __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; goto __pyx_L7_unpacking_done; @@ -5893,7 +5907,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_t_9 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 453, __pyx_L1_error) + __PYX_ERR(0, 455, __pyx_L1_error) __pyx_L7_unpacking_done:; } __Pyx_XDECREF_SET(__pyx_v_k, __pyx_t_6); @@ -5901,7 +5915,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_7); __pyx_t_7 = 0; - /* "larch/pickle/pickle.pyx":454 + /* "larch/pickle/pickle.pyx":456 * if tmp is not None: * for k, v in tmp: * p.dump(k) # <<<<<<<<<<<<<< @@ -5910,7 +5924,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ */ __pyx_v_p->dump(__pyx_v_k); - /* "larch/pickle/pickle.pyx":455 + /* "larch/pickle/pickle.pyx":457 * for k, v in tmp: * p.dump(k) * p.dump(v) # <<<<<<<<<<<<<< @@ -5919,7 +5933,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ */ __pyx_v_p->dump(__pyx_v_v); - /* "larch/pickle/pickle.pyx":453 + /* "larch/pickle/pickle.pyx":455 * tmp = PyTuple_GET_ITEM(state, 4) * if tmp is not None: * for k, v in tmp: # <<<<<<<<<<<<<< @@ -5929,7 +5943,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":452 + /* "larch/pickle/pickle.pyx":454 * cdef PyObject* tmp * tmp = PyTuple_GET_ITEM(state, 4) * if tmp is not None: # <<<<<<<<<<<<<< @@ -5938,7 +5952,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ */ } - /* "larch/pickle/pickle.pyx":449 + /* "larch/pickle/pickle.pyx":451 * * * cdef pack_state_dict(Packer *p, tuple state): # <<<<<<<<<<<<<< @@ -5965,7 +5979,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_pack_state_dict(Packer *__pyx_v_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":458 +/* "larch/pickle/pickle.pyx":460 * * * cdef void save_object_state(Packer* p, tuple state): # <<<<<<<<<<<<<< @@ -5981,13 +5995,13 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("save_object_state", 1); - /* "larch/pickle/pickle.pyx":463 + /* "larch/pickle/pickle.pyx":465 * PyObject* tmp * * size = PyTuple_GET_SIZE(state) # <<<<<<<<<<<<<< @@ -5996,7 +6010,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, */ __pyx_v_size = PyTuple_GET_SIZE(__pyx_v_state); - /* "larch/pickle/pickle.pyx":464 + /* "larch/pickle/pickle.pyx":466 * * size = PyTuple_GET_SIZE(state) * if size > 2: # <<<<<<<<<<<<<< @@ -6006,7 +6020,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, __pyx_t_1 = (__pyx_v_size > 2); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":465 + /* "larch/pickle/pickle.pyx":467 * size = PyTuple_GET_SIZE(state) * if size > 2: * tmp = PyTuple_GET_ITEM(state, 2) # <<<<<<<<<<<<<< @@ -6015,7 +6029,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, */ __pyx_v_tmp = PyTuple_GET_ITEM(__pyx_v_state, 2); - /* "larch/pickle/pickle.pyx":466 + /* "larch/pickle/pickle.pyx":468 * if size > 2: * tmp = PyTuple_GET_ITEM(state, 2) * p.dump(tmp) # <<<<<<<<<<<<<< @@ -6024,7 +6038,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, */ __pyx_v_p->dump(((PyObject *)__pyx_v_tmp)); - /* "larch/pickle/pickle.pyx":464 + /* "larch/pickle/pickle.pyx":466 * * size = PyTuple_GET_SIZE(state) * if size > 2: # <<<<<<<<<<<<<< @@ -6034,7 +6048,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, goto __pyx_L3; } - /* "larch/pickle/pickle.pyx":468 + /* "larch/pickle/pickle.pyx":470 * p.dump(tmp) * else: * p.pack_nil() # <<<<<<<<<<<<<< @@ -6046,7 +6060,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, } __pyx_L3:; - /* "larch/pickle/pickle.pyx":470 + /* "larch/pickle/pickle.pyx":472 * p.pack_nil() * * if size > 3: # <<<<<<<<<<<<<< @@ -6056,18 +6070,18 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, __pyx_t_1 = (__pyx_v_size > 3); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":471 + /* "larch/pickle/pickle.pyx":473 * * if size > 3: * pack_state_array(p, state) # <<<<<<<<<<<<<< * p.pack_ext(END_OBJECT_ITEMS, 1) * */ - __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle_pack_state_array(__pyx_v_p, __pyx_v_state); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 471, __pyx_L1_error) + __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle_pack_state_array(__pyx_v_p, __pyx_v_state); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 473, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":470 + /* "larch/pickle/pickle.pyx":472 * p.pack_nil() * * if size > 3: # <<<<<<<<<<<<<< @@ -6076,7 +6090,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, */ } - /* "larch/pickle/pickle.pyx":472 + /* "larch/pickle/pickle.pyx":474 * if size > 3: * pack_state_array(p, state) * p.pack_ext(END_OBJECT_ITEMS, 1) # <<<<<<<<<<<<<< @@ -6085,7 +6099,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, */ (void)(__pyx_v_p->pack_ext(END_OBJECT_ITEMS, 1)); - /* "larch/pickle/pickle.pyx":474 + /* "larch/pickle/pickle.pyx":476 * p.pack_ext(END_OBJECT_ITEMS, 1) * * if size > 4: # <<<<<<<<<<<<<< @@ -6095,18 +6109,18 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, __pyx_t_1 = (__pyx_v_size > 4); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":475 + /* "larch/pickle/pickle.pyx":477 * * if size > 4: * pack_state_dict(p, state) # <<<<<<<<<<<<<< * p.pack_ext(END_OBJECT_ITEMS, 1) * */ - __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle_pack_state_dict(__pyx_v_p, __pyx_v_state); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 475, __pyx_L1_error) + __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle_pack_state_dict(__pyx_v_p, __pyx_v_state); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 477, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":474 + /* "larch/pickle/pickle.pyx":476 * p.pack_ext(END_OBJECT_ITEMS, 1) * * if size > 4: # <<<<<<<<<<<<<< @@ -6115,7 +6129,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, */ } - /* "larch/pickle/pickle.pyx":476 + /* "larch/pickle/pickle.pyx":478 * if size > 4: * pack_state_dict(p, state) * p.pack_ext(END_OBJECT_ITEMS, 1) # <<<<<<<<<<<<<< @@ -6124,7 +6138,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, */ (void)(__pyx_v_p->pack_ext(END_OBJECT_ITEMS, 1)); - /* "larch/pickle/pickle.pyx":478 + /* "larch/pickle/pickle.pyx":480 * p.pack_ext(END_OBJECT_ITEMS, 1) * * if size > 5: # <<<<<<<<<<<<<< @@ -6134,14 +6148,14 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, __pyx_t_1 = (__pyx_v_size > 5); if (unlikely(__pyx_t_1)) { - /* "larch/pickle/pickle.pyx":479 + /* "larch/pickle/pickle.pyx":481 * * if size > 5: * raise PicklingError( # <<<<<<<<<<<<<< * "Cannot pickle object with more then 5 reduce items") * */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_PicklingError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 479, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_PicklingError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 481, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -6161,15 +6175,15 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_kp_u_Cannot_pickle_object_with_more_t}; __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 479, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 481, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_Raise(__pyx_t_2, 0, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __PYX_ERR(0, 479, __pyx_L1_error) + __PYX_ERR(0, 481, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":478 + /* "larch/pickle/pickle.pyx":480 * p.pack_ext(END_OBJECT_ITEMS, 1) * * if size > 5: # <<<<<<<<<<<<<< @@ -6178,7 +6192,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, */ } - /* "larch/pickle/pickle.pyx":458 + /* "larch/pickle/pickle.pyx":460 * * * cdef void save_object_state(Packer* p, tuple state): # <<<<<<<<<<<<<< @@ -6197,7 +6211,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object_state(Packer *__pyx_v_p, __Pyx_RefNannyFinishContext(); } -/* "larch/pickle/pickle.pyx":483 +/* "larch/pickle/pickle.pyx":485 * * * cdef inline int _save_reduced(Packer* p, object o) except -1: # <<<<<<<<<<<<<< @@ -6213,14 +6227,15 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_reduced(Packer *__ PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; - PyObject *__pyx_t_6; + unsigned int __pyx_t_5; + int __pyx_t_6; + PyObject *__pyx_t_7; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_save_reduced", 1); - /* "larch/pickle/pickle.pyx":484 + /* "larch/pickle/pickle.pyx":486 * * cdef inline int _save_reduced(Packer* p, object o) except -1: * if p.save_ref(o): return 0 # <<<<<<<<<<<<<< @@ -6233,14 +6248,14 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_reduced(Packer *__ goto __pyx_L0; } - /* "larch/pickle/pickle.pyx":485 + /* "larch/pickle/pickle.pyx":487 * cdef inline int _save_reduced(Packer* p, object o) except -1: * if p.save_ref(o): return 0 * state = o.__reduce_ex__(REDUCE_PROTOCOL) # <<<<<<<<<<<<<< * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_reduce_ex); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 485, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_reduce_ex); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 487, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -6260,14 +6275,14 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_reduced(Packer *__ PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_5larch_6pickle_6pickle_REDUCE_PROTOCOL}; __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 485, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 487, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __pyx_v_state = __pyx_t_2; __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":486 + /* "larch/pickle/pickle.pyx":488 * if p.save_ref(o): return 0 * state = o.__reduce_ex__(REDUCE_PROTOCOL) * if isinstance(state, basestring): # <<<<<<<<<<<<<< @@ -6277,19 +6292,19 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_reduced(Packer *__ __pyx_t_1 = __Pyx_PyBaseString_Check(__pyx_v_state); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":487 + /* "larch/pickle/pickle.pyx":489 * state = o.__reduce_ex__(REDUCE_PROTOCOL) * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) # <<<<<<<<<<<<<< * return 0 * */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_module); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 487, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_module); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 489, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import2(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), SINGLETON, __pyx_t_2, __pyx_v_state); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 487, __pyx_L1_error) + __pyx_t_6 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import2(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), SINGLETON, __pyx_t_2, __pyx_v_state); if (unlikely(__pyx_t_6 == ((int)-1))) __PYX_ERR(0, 489, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":488 + /* "larch/pickle/pickle.pyx":490 * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) * return 0 # <<<<<<<<<<<<<< @@ -6299,7 +6314,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_reduced(Packer *__ __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":486 + /* "larch/pickle/pickle.pyx":488 * if p.save_ref(o): return 0 * state = o.__reduce_ex__(REDUCE_PROTOCOL) * if isinstance(state, basestring): # <<<<<<<<<<<<<< @@ -6308,7 +6323,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_reduced(Packer *__ */ } - /* "larch/pickle/pickle.pyx":490 + /* "larch/pickle/pickle.pyx":492 * return 0 * * p.pack_ext(OBJECT, 1) # <<<<<<<<<<<<<< @@ -6317,37 +6332,37 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_reduced(Packer *__ */ (void)(__pyx_v_p->pack_ext(OBJECT, 1)); - /* "larch/pickle/pickle.pyx":491 + /* "larch/pickle/pickle.pyx":493 * * p.pack_ext(OBJECT, 1) * p.dump(PyTuple_GET_ITEM(state, 0)) # <<<<<<<<<<<<<< * p.dump(PyTuple_GET_ITEM(state, 1)) * save_object_state(p, state) */ - __pyx_t_6 = PyTuple_GET_ITEM(__pyx_v_state, 0); - __pyx_v_p->dump(((PyObject *)__pyx_t_6)); + __pyx_t_7 = PyTuple_GET_ITEM(__pyx_v_state, 0); + __pyx_v_p->dump(((PyObject *)__pyx_t_7)); - /* "larch/pickle/pickle.pyx":492 + /* "larch/pickle/pickle.pyx":494 * p.pack_ext(OBJECT, 1) * p.dump(PyTuple_GET_ITEM(state, 0)) * p.dump(PyTuple_GET_ITEM(state, 1)) # <<<<<<<<<<<<<< * save_object_state(p, state) * */ - __pyx_t_6 = PyTuple_GET_ITEM(__pyx_v_state, 1); - __pyx_v_p->dump(((PyObject *)__pyx_t_6)); + __pyx_t_7 = PyTuple_GET_ITEM(__pyx_v_state, 1); + __pyx_v_p->dump(((PyObject *)__pyx_t_7)); - /* "larch/pickle/pickle.pyx":493 + /* "larch/pickle/pickle.pyx":495 * p.dump(PyTuple_GET_ITEM(state, 0)) * p.dump(PyTuple_GET_ITEM(state, 1)) * save_object_state(p, state) # <<<<<<<<<<<<<< * * */ - if (!(likely(PyTuple_CheckExact(__pyx_v_state))||((__pyx_v_state) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_v_state))) __PYX_ERR(0, 493, __pyx_L1_error) - __pyx_f_5larch_6pickle_6pickle_save_object_state(__pyx_v_p, ((PyObject*)__pyx_v_state)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 493, __pyx_L1_error) + if (!(likely(PyTuple_CheckExact(__pyx_v_state))||((__pyx_v_state) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_v_state))) __PYX_ERR(0, 495, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_save_object_state(__pyx_v_p, ((PyObject*)__pyx_v_state)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 495, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":483 + /* "larch/pickle/pickle.pyx":485 * * * cdef inline int _save_reduced(Packer* p, object o) except -1: # <<<<<<<<<<<<<< @@ -6370,7 +6385,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_reduced(Packer *__ return __pyx_r; } -/* "larch/pickle/pickle.pyx":496 +/* "larch/pickle/pickle.pyx":498 * * * cdef void save_reduced(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -6392,7 +6407,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_reduced(Packer *__pyx_v_p, PyObj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("save_reduced", 1); - /* "larch/pickle/pickle.pyx":497 + /* "larch/pickle/pickle.pyx":499 * * cdef void save_reduced(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -6408,16 +6423,16 @@ static void __pyx_f_5larch_6pickle_6pickle_save_reduced(Packer *__pyx_v_p, PyObj __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "larch/pickle/pickle.pyx":498 + /* "larch/pickle/pickle.pyx":500 * cdef void save_reduced(Packer* p, object o) noexcept: * try: * _save_reduced(p, o) # <<<<<<<<<<<<<< * except: * reraise() */ - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__save_reduced(__pyx_v_p, __pyx_v_o); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 498, __pyx_L3_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__save_reduced(__pyx_v_p, __pyx_v_o); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 500, __pyx_L3_error) - /* "larch/pickle/pickle.pyx":497 + /* "larch/pickle/pickle.pyx":499 * * cdef void save_reduced(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -6431,7 +6446,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_reduced(Packer *__pyx_v_p, PyObj goto __pyx_L8_try_end; __pyx_L3_error:; - /* "larch/pickle/pickle.pyx":499 + /* "larch/pickle/pickle.pyx":501 * try: * _save_reduced(p, o) * except: # <<<<<<<<<<<<<< @@ -6440,26 +6455,26 @@ static void __pyx_f_5larch_6pickle_6pickle_save_reduced(Packer *__pyx_v_p, PyObj */ /*except:*/ { __Pyx_AddTraceback("larch.pickle.pickle.save_reduced", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(0, 499, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(0, 501, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_5); __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "larch/pickle/pickle.pyx":500 + /* "larch/pickle/pickle.pyx":502 * _save_reduced(p, o) * except: * reraise() # <<<<<<<<<<<<<< * * */ - __pyx_f_5larch_6pickle_6pickle_reraise(); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 500, __pyx_L5_except_error) + __pyx_f_5larch_6pickle_6pickle_reraise(); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 502, __pyx_L5_except_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; goto __pyx_L4_exception_handled; } - /* "larch/pickle/pickle.pyx":497 + /* "larch/pickle/pickle.pyx":499 * * cdef void save_reduced(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -6480,7 +6495,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_reduced(Packer *__pyx_v_p, PyObj __pyx_L8_try_end:; } - /* "larch/pickle/pickle.pyx":496 + /* "larch/pickle/pickle.pyx":498 * * * cdef void save_reduced(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -6499,7 +6514,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_reduced(Packer *__pyx_v_p, PyObj __Pyx_RefNannyFinishContext(); } -/* "larch/pickle/pickle.pyx":503 +/* "larch/pickle/pickle.pyx":505 * * * cdef inline int _save_new_object(Packer* p, o) except -1: # <<<<<<<<<<<<<< @@ -6515,13 +6530,14 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object(Packer PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; + int __pyx_t_6; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_save_new_object", 1); - /* "larch/pickle/pickle.pyx":504 + /* "larch/pickle/pickle.pyx":506 * * cdef inline int _save_new_object(Packer* p, o) except -1: * if p.save_ref(o): return 0 # <<<<<<<<<<<<<< @@ -6534,14 +6550,14 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object(Packer goto __pyx_L0; } - /* "larch/pickle/pickle.pyx":505 + /* "larch/pickle/pickle.pyx":507 * cdef inline int _save_new_object(Packer* p, o) except -1: * if p.save_ref(o): return 0 * state = o.__reduce_ex__(REDUCE_PROTOCOL) # <<<<<<<<<<<<<< * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_reduce_ex); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 505, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_reduce_ex); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 507, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -6561,14 +6577,14 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object(Packer PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_5larch_6pickle_6pickle_REDUCE_PROTOCOL}; __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 505, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 507, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __pyx_v_state = __pyx_t_2; __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":506 + /* "larch/pickle/pickle.pyx":508 * if p.save_ref(o): return 0 * state = o.__reduce_ex__(REDUCE_PROTOCOL) * if isinstance(state, basestring): # <<<<<<<<<<<<<< @@ -6578,19 +6594,19 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object(Packer __pyx_t_1 = __Pyx_PyBaseString_Check(__pyx_v_state); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":507 + /* "larch/pickle/pickle.pyx":509 * state = o.__reduce_ex__(REDUCE_PROTOCOL) * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) # <<<<<<<<<<<<<< * return 0 * */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_module); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 507, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_module); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 509, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import2(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), SINGLETON, __pyx_t_2, __pyx_v_state); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 507, __pyx_L1_error) + __pyx_t_6 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import2(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), SINGLETON, __pyx_t_2, __pyx_v_state); if (unlikely(__pyx_t_6 == ((int)-1))) __PYX_ERR(0, 509, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":508 + /* "larch/pickle/pickle.pyx":510 * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) * return 0 # <<<<<<<<<<<<<< @@ -6600,7 +6616,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object(Packer __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":506 + /* "larch/pickle/pickle.pyx":508 * if p.save_ref(o): return 0 * state = o.__reduce_ex__(REDUCE_PROTOCOL) * if isinstance(state, basestring): # <<<<<<<<<<<<<< @@ -6609,18 +6625,18 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object(Packer */ } - /* "larch/pickle/pickle.pyx":510 + /* "larch/pickle/pickle.pyx":512 * return 0 * * return _save_new_object_finish(p, o, state) # <<<<<<<<<<<<<< * * cdef inline int _save_new_object_finish(Packer* p, o, state) except -1: */ - __pyx_t_5 = __pyx_f_5larch_6pickle_6pickle__save_new_object_finish(__pyx_v_p, __pyx_v_o, __pyx_v_state); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 510, __pyx_L1_error) - __pyx_r = __pyx_t_5; + __pyx_t_6 = __pyx_f_5larch_6pickle_6pickle__save_new_object_finish(__pyx_v_p, __pyx_v_o, __pyx_v_state); if (unlikely(__pyx_t_6 == ((int)-1))) __PYX_ERR(0, 512, __pyx_L1_error) + __pyx_r = __pyx_t_6; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":503 + /* "larch/pickle/pickle.pyx":505 * * * cdef inline int _save_new_object(Packer* p, o) except -1: # <<<<<<<<<<<<<< @@ -6641,7 +6657,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object(Packer return __pyx_r; } -/* "larch/pickle/pickle.pyx":512 +/* "larch/pickle/pickle.pyx":514 * return _save_new_object_finish(p, o, state) * * cdef inline int _save_new_object_finish(Packer* p, o, state) except -1: # <<<<<<<<<<<<<< @@ -6656,7 +6672,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object_finish( const char *__pyx_filename = NULL; int __pyx_clineno = 0; - /* "larch/pickle/pickle.pyx":513 + /* "larch/pickle/pickle.pyx":515 * * cdef inline int _save_new_object_finish(Packer* p, o, state) except -1: * p.pack_ext(OBJECT_NEW, 1) # <<<<<<<<<<<<<< @@ -6665,7 +6681,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object_finish( */ (void)(__pyx_v_p->pack_ext(OBJECT_NEW, 1)); - /* "larch/pickle/pickle.pyx":514 + /* "larch/pickle/pickle.pyx":516 * cdef inline int _save_new_object_finish(Packer* p, o, state) except -1: * p.pack_ext(OBJECT_NEW, 1) * p.dump(PyTuple_GET_ITEM(state, 1)) # <<<<<<<<<<<<<< @@ -6675,17 +6691,17 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object_finish( __pyx_t_1 = PyTuple_GET_ITEM(__pyx_v_state, 1); __pyx_v_p->dump(((PyObject *)__pyx_t_1)); - /* "larch/pickle/pickle.pyx":515 + /* "larch/pickle/pickle.pyx":517 * p.pack_ext(OBJECT_NEW, 1) * p.dump(PyTuple_GET_ITEM(state, 1)) * save_object_state(p, state) # <<<<<<<<<<<<<< * return 0 * */ - if (!(likely(PyTuple_CheckExact(__pyx_v_state))||((__pyx_v_state) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_v_state))) __PYX_ERR(0, 515, __pyx_L1_error) - __pyx_f_5larch_6pickle_6pickle_save_object_state(__pyx_v_p, ((PyObject*)__pyx_v_state)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 515, __pyx_L1_error) + if (!(likely(PyTuple_CheckExact(__pyx_v_state))||((__pyx_v_state) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_v_state))) __PYX_ERR(0, 517, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_save_object_state(__pyx_v_p, ((PyObject*)__pyx_v_state)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 517, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":516 + /* "larch/pickle/pickle.pyx":518 * p.dump(PyTuple_GET_ITEM(state, 1)) * save_object_state(p, state) * return 0 # <<<<<<<<<<<<<< @@ -6695,7 +6711,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object_finish( __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":512 + /* "larch/pickle/pickle.pyx":514 * return _save_new_object_finish(p, o, state) * * cdef inline int _save_new_object_finish(Packer* p, o, state) except -1: # <<<<<<<<<<<<<< @@ -6711,7 +6727,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_new_object_finish( return __pyx_r; } -/* "larch/pickle/pickle.pyx":519 +/* "larch/pickle/pickle.pyx":521 * * * cdef inline void save_new_object(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -6734,7 +6750,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_save_new_object(Packer int __pyx_clineno = 0; __Pyx_RefNannySetupContext("save_new_object", 1); - /* "larch/pickle/pickle.pyx":520 + /* "larch/pickle/pickle.pyx":522 * * cdef inline void save_new_object(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -6750,7 +6766,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_save_new_object(Packer __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "larch/pickle/pickle.pyx":521 + /* "larch/pickle/pickle.pyx":523 * cdef inline void save_new_object(Packer* p, object o) noexcept: * try: * if p.protocol < 4: # <<<<<<<<<<<<<< @@ -6760,16 +6776,16 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_save_new_object(Packer __pyx_t_4 = (__pyx_v_p->protocol < 4); if (__pyx_t_4) { - /* "larch/pickle/pickle.pyx":522 + /* "larch/pickle/pickle.pyx":524 * try: * if p.protocol < 4: * _save_new_object(p, o) # <<<<<<<<<<<<<< * else: * _fast_save(p, o) */ - __pyx_t_5 = __pyx_f_5larch_6pickle_6pickle__save_new_object(__pyx_v_p, __pyx_v_o); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 522, __pyx_L3_error) + __pyx_t_5 = __pyx_f_5larch_6pickle_6pickle__save_new_object(__pyx_v_p, __pyx_v_o); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 524, __pyx_L3_error) - /* "larch/pickle/pickle.pyx":521 + /* "larch/pickle/pickle.pyx":523 * cdef inline void save_new_object(Packer* p, object o) noexcept: * try: * if p.protocol < 4: # <<<<<<<<<<<<<< @@ -6779,7 +6795,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_save_new_object(Packer goto __pyx_L9; } - /* "larch/pickle/pickle.pyx":524 + /* "larch/pickle/pickle.pyx":526 * _save_new_object(p, o) * else: * _fast_save(p, o) # <<<<<<<<<<<<<< @@ -6787,11 +6803,11 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_save_new_object(Packer * reraise() */ /*else*/ { - __pyx_t_5 = __pyx_f_5larch_6pickle_6pickle__fast_save(__pyx_v_p, __pyx_v_o); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 524, __pyx_L3_error) + __pyx_t_5 = __pyx_f_5larch_6pickle_6pickle__fast_save(__pyx_v_p, __pyx_v_o); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 526, __pyx_L3_error) } __pyx_L9:; - /* "larch/pickle/pickle.pyx":520 + /* "larch/pickle/pickle.pyx":522 * * cdef inline void save_new_object(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -6805,7 +6821,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_save_new_object(Packer goto __pyx_L8_try_end; __pyx_L3_error:; - /* "larch/pickle/pickle.pyx":525 + /* "larch/pickle/pickle.pyx":527 * else: * _fast_save(p, o) * except: # <<<<<<<<<<<<<< @@ -6814,26 +6830,26 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_save_new_object(Packer */ /*except:*/ { __Pyx_AddTraceback("larch.pickle.pickle.save_new_object", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_6, &__pyx_t_7, &__pyx_t_8) < 0) __PYX_ERR(0, 525, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_6, &__pyx_t_7, &__pyx_t_8) < 0) __PYX_ERR(0, 527, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); __Pyx_XGOTREF(__pyx_t_8); - /* "larch/pickle/pickle.pyx":526 + /* "larch/pickle/pickle.pyx":528 * _fast_save(p, o) * except: * reraise() # <<<<<<<<<<<<<< * * */ - __pyx_f_5larch_6pickle_6pickle_reraise(); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 526, __pyx_L5_except_error) + __pyx_f_5larch_6pickle_6pickle_reraise(); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 528, __pyx_L5_except_error) __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; goto __pyx_L4_exception_handled; } - /* "larch/pickle/pickle.pyx":520 + /* "larch/pickle/pickle.pyx":522 * * cdef inline void save_new_object(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -6854,7 +6870,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_save_new_object(Packer __pyx_L8_try_end:; } - /* "larch/pickle/pickle.pyx":519 + /* "larch/pickle/pickle.pyx":521 * * * cdef inline void save_new_object(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -6873,7 +6889,7 @@ static CYTHON_INLINE void __pyx_f_5larch_6pickle_6pickle_save_new_object(Packer __Pyx_RefNannyFinishContext(); } -/* "larch/pickle/pickle.pyx":529 +/* "larch/pickle/pickle.pyx":531 * * * cdef inline int _fast_save(Packer* p, object o) except -1: # <<<<<<<<<<<<<< @@ -6889,13 +6905,14 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save(Packer *__pyx PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; + int __pyx_t_6; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_fast_save", 1); - /* "larch/pickle/pickle.pyx":530 + /* "larch/pickle/pickle.pyx":532 * * cdef inline int _fast_save(Packer* p, object o) except -1: * if p.save_ref(o): return 0 # <<<<<<<<<<<<<< @@ -6908,14 +6925,14 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save(Packer *__pyx goto __pyx_L0; } - /* "larch/pickle/pickle.pyx":531 + /* "larch/pickle/pickle.pyx":533 * cdef inline int _fast_save(Packer* p, object o) except -1: * if p.save_ref(o): return 0 * state = o.__reduce_ex__(REDUCE_PROTOCOL) # <<<<<<<<<<<<<< * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_reduce_ex); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 531, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_reduce_ex); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 533, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -6935,14 +6952,14 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save(Packer *__pyx PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_5larch_6pickle_6pickle_REDUCE_PROTOCOL}; __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 531, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 533, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __pyx_v_state = __pyx_t_2; __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":532 + /* "larch/pickle/pickle.pyx":534 * if p.save_ref(o): return 0 * state = o.__reduce_ex__(REDUCE_PROTOCOL) * if isinstance(state, basestring): # <<<<<<<<<<<<<< @@ -6952,19 +6969,19 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save(Packer *__pyx __pyx_t_1 = __Pyx_PyBaseString_Check(__pyx_v_state); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":533 + /* "larch/pickle/pickle.pyx":535 * state = o.__reduce_ex__(REDUCE_PROTOCOL) * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) # <<<<<<<<<<<<<< * return 0 * */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_module); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 533, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_module); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 535, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import2(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), SINGLETON, __pyx_t_2, __pyx_v_state); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 533, __pyx_L1_error) + __pyx_t_6 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import2(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), SINGLETON, __pyx_t_2, __pyx_v_state); if (unlikely(__pyx_t_6 == ((int)-1))) __PYX_ERR(0, 535, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":534 + /* "larch/pickle/pickle.pyx":536 * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) * return 0 # <<<<<<<<<<<<<< @@ -6974,7 +6991,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save(Packer *__pyx __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":532 + /* "larch/pickle/pickle.pyx":534 * if p.save_ref(o): return 0 * state = o.__reduce_ex__(REDUCE_PROTOCOL) * if isinstance(state, basestring): # <<<<<<<<<<<<<< @@ -6983,18 +7000,18 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save(Packer *__pyx */ } - /* "larch/pickle/pickle.pyx":536 + /* "larch/pickle/pickle.pyx":538 * return 0 * * return _fast_save_finish(p, o, state) # <<<<<<<<<<<<<< * * */ - __pyx_t_5 = __pyx_f_5larch_6pickle_6pickle__fast_save_finish(__pyx_v_p, __pyx_v_o, __pyx_v_state); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 536, __pyx_L1_error) - __pyx_r = __pyx_t_5; + __pyx_t_6 = __pyx_f_5larch_6pickle_6pickle__fast_save_finish(__pyx_v_p, __pyx_v_o, __pyx_v_state); if (unlikely(__pyx_t_6 == ((int)-1))) __PYX_ERR(0, 538, __pyx_L1_error) + __pyx_r = __pyx_t_6; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":529 + /* "larch/pickle/pickle.pyx":531 * * * cdef inline int _fast_save(Packer* p, object o) except -1: # <<<<<<<<<<<<<< @@ -7015,7 +7032,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save(Packer *__pyx return __pyx_r; } -/* "larch/pickle/pickle.pyx":539 +/* "larch/pickle/pickle.pyx":541 * * * cdef inline int _fast_save_finish(Packer* p, o, state) except -1: # <<<<<<<<<<<<<< @@ -7033,13 +7050,13 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; - int __pyx_t_6; + unsigned int __pyx_t_6; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_fast_save_finish", 1); - /* "larch/pickle/pickle.pyx":544 + /* "larch/pickle/pickle.pyx":546 * size_t i * * size = PyTuple_GET_SIZE(state) # <<<<<<<<<<<<<< @@ -7048,7 +7065,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ __pyx_v_size = PyTuple_GET_SIZE(__pyx_v_state); - /* "larch/pickle/pickle.pyx":545 + /* "larch/pickle/pickle.pyx":547 * * size = PyTuple_GET_SIZE(state) * i = size - 1 # <<<<<<<<<<<<<< @@ -7057,7 +7074,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ __pyx_v_i = (__pyx_v_size - 1); - /* "larch/pickle/pickle.pyx":546 + /* "larch/pickle/pickle.pyx":548 * size = PyTuple_GET_SIZE(state) * i = size - 1 * while i > 1: # <<<<<<<<<<<<<< @@ -7068,7 +7085,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer __pyx_t_1 = (__pyx_v_i > 1); if (!__pyx_t_1) break; - /* "larch/pickle/pickle.pyx":547 + /* "larch/pickle/pickle.pyx":549 * i = size - 1 * while i > 1: * if PyTuple_GET_ITEM(state, i) is None: # <<<<<<<<<<<<<< @@ -7079,7 +7096,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer __pyx_t_1 = (((PyObject *)__pyx_t_2) == Py_None); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":548 + /* "larch/pickle/pickle.pyx":550 * while i > 1: * if PyTuple_GET_ITEM(state, i) is None: * size -= 1 # <<<<<<<<<<<<<< @@ -7088,7 +7105,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ __pyx_v_size = (__pyx_v_size - 1); - /* "larch/pickle/pickle.pyx":549 + /* "larch/pickle/pickle.pyx":551 * if PyTuple_GET_ITEM(state, i) is None: * size -= 1 * i -= 1 # <<<<<<<<<<<<<< @@ -7097,7 +7114,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ __pyx_v_i = (__pyx_v_i - 1); - /* "larch/pickle/pickle.pyx":547 + /* "larch/pickle/pickle.pyx":549 * i = size - 1 * while i > 1: * if PyTuple_GET_ITEM(state, i) is None: # <<<<<<<<<<<<<< @@ -7107,7 +7124,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer goto __pyx_L5; } - /* "larch/pickle/pickle.pyx":551 + /* "larch/pickle/pickle.pyx":553 * i -= 1 * else: * break # <<<<<<<<<<<<<< @@ -7121,7 +7138,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer } __pyx_L4_break:; - /* "larch/pickle/pickle.pyx":552 + /* "larch/pickle/pickle.pyx":554 * else: * break * p.pack_ext(FAST_NEW, size) # <<<<<<<<<<<<<< @@ -7130,7 +7147,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ (void)(__pyx_v_p->pack_ext(FAST_NEW, __pyx_v_size)); - /* "larch/pickle/pickle.pyx":553 + /* "larch/pickle/pickle.pyx":555 * break * p.pack_ext(FAST_NEW, size) * p.dump(PyTuple_GET_ITEM(state, 1)) # <<<<<<<<<<<<<< @@ -7140,7 +7157,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer __pyx_t_2 = PyTuple_GET_ITEM(__pyx_v_state, 1); __pyx_v_p->dump(((PyObject *)__pyx_t_2)); - /* "larch/pickle/pickle.pyx":554 + /* "larch/pickle/pickle.pyx":556 * p.pack_ext(FAST_NEW, size) * p.dump(PyTuple_GET_ITEM(state, 1)) * if size > 2: # <<<<<<<<<<<<<< @@ -7150,7 +7167,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer __pyx_t_1 = (__pyx_v_size > 2); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":555 + /* "larch/pickle/pickle.pyx":557 * p.dump(PyTuple_GET_ITEM(state, 1)) * if size > 2: * p.dump(PyTuple_GET_ITEM(state, 2)) # <<<<<<<<<<<<<< @@ -7160,7 +7177,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer __pyx_t_2 = PyTuple_GET_ITEM(__pyx_v_state, 2); __pyx_v_p->dump(((PyObject *)__pyx_t_2)); - /* "larch/pickle/pickle.pyx":556 + /* "larch/pickle/pickle.pyx":558 * if size > 2: * p.dump(PyTuple_GET_ITEM(state, 2)) * if size > 3: # <<<<<<<<<<<<<< @@ -7170,19 +7187,19 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer __pyx_t_1 = (__pyx_v_size > 3); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":557 + /* "larch/pickle/pickle.pyx":559 * p.dump(PyTuple_GET_ITEM(state, 2)) * if size > 3: * pack_state_array(p, state) # <<<<<<<<<<<<<< * p.pack_ext(END_OBJECT_ITEMS, 1) * if size > 4: */ - if (!(likely(PyTuple_CheckExact(__pyx_v_state))||((__pyx_v_state) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_v_state))) __PYX_ERR(0, 557, __pyx_L1_error) - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle_pack_state_array(__pyx_v_p, ((PyObject*)__pyx_v_state)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 557, __pyx_L1_error) + if (!(likely(PyTuple_CheckExact(__pyx_v_state))||((__pyx_v_state) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_v_state))) __PYX_ERR(0, 559, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle_pack_state_array(__pyx_v_p, ((PyObject*)__pyx_v_state)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 559, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":558 + /* "larch/pickle/pickle.pyx":560 * if size > 3: * pack_state_array(p, state) * p.pack_ext(END_OBJECT_ITEMS, 1) # <<<<<<<<<<<<<< @@ -7191,7 +7208,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ (void)(__pyx_v_p->pack_ext(END_OBJECT_ITEMS, 1)); - /* "larch/pickle/pickle.pyx":559 + /* "larch/pickle/pickle.pyx":561 * pack_state_array(p, state) * p.pack_ext(END_OBJECT_ITEMS, 1) * if size > 4: # <<<<<<<<<<<<<< @@ -7201,19 +7218,19 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer __pyx_t_1 = (__pyx_v_size > 4); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":560 + /* "larch/pickle/pickle.pyx":562 * p.pack_ext(END_OBJECT_ITEMS, 1) * if size > 4: * pack_state_dict(p, state) # <<<<<<<<<<<<<< * p.pack_ext(END_OBJECT_ITEMS, 1) * if size > 5: */ - if (!(likely(PyTuple_CheckExact(__pyx_v_state))||((__pyx_v_state) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_v_state))) __PYX_ERR(0, 560, __pyx_L1_error) - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle_pack_state_dict(__pyx_v_p, ((PyObject*)__pyx_v_state)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 560, __pyx_L1_error) + if (!(likely(PyTuple_CheckExact(__pyx_v_state))||((__pyx_v_state) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_v_state))) __PYX_ERR(0, 562, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle_pack_state_dict(__pyx_v_p, ((PyObject*)__pyx_v_state)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 562, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":561 + /* "larch/pickle/pickle.pyx":563 * if size > 4: * pack_state_dict(p, state) * p.pack_ext(END_OBJECT_ITEMS, 1) # <<<<<<<<<<<<<< @@ -7222,7 +7239,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ (void)(__pyx_v_p->pack_ext(END_OBJECT_ITEMS, 1)); - /* "larch/pickle/pickle.pyx":562 + /* "larch/pickle/pickle.pyx":564 * pack_state_dict(p, state) * p.pack_ext(END_OBJECT_ITEMS, 1) * if size > 5: # <<<<<<<<<<<<<< @@ -7232,14 +7249,14 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer __pyx_t_1 = (__pyx_v_size > 5); if (unlikely(__pyx_t_1)) { - /* "larch/pickle/pickle.pyx":563 + /* "larch/pickle/pickle.pyx":565 * p.pack_ext(END_OBJECT_ITEMS, 1) * if size > 5: * raise PicklingError( # <<<<<<<<<<<<<< * "Cannot pickle object with more then 5 reduce items") * */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_PicklingError); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 563, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_PicklingError); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 565, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; __pyx_t_6 = 0; @@ -7259,15 +7276,15 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer PyObject *__pyx_callargs[2] = {__pyx_t_5, __pyx_kp_u_Cannot_pickle_object_with_more_t}; __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_6, 1+__pyx_t_6); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 563, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 565, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } __Pyx_Raise(__pyx_t_3, 0, 0, 0); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __PYX_ERR(0, 563, __pyx_L1_error) + __PYX_ERR(0, 565, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":562 + /* "larch/pickle/pickle.pyx":564 * pack_state_dict(p, state) * p.pack_ext(END_OBJECT_ITEMS, 1) * if size > 5: # <<<<<<<<<<<<<< @@ -7276,7 +7293,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ } - /* "larch/pickle/pickle.pyx":559 + /* "larch/pickle/pickle.pyx":561 * pack_state_array(p, state) * p.pack_ext(END_OBJECT_ITEMS, 1) * if size > 4: # <<<<<<<<<<<<<< @@ -7285,7 +7302,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ } - /* "larch/pickle/pickle.pyx":556 + /* "larch/pickle/pickle.pyx":558 * if size > 2: * p.dump(PyTuple_GET_ITEM(state, 2)) * if size > 3: # <<<<<<<<<<<<<< @@ -7294,7 +7311,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ } - /* "larch/pickle/pickle.pyx":554 + /* "larch/pickle/pickle.pyx":556 * p.pack_ext(FAST_NEW, size) * p.dump(PyTuple_GET_ITEM(state, 1)) * if size > 2: # <<<<<<<<<<<<<< @@ -7303,7 +7320,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer */ } - /* "larch/pickle/pickle.pyx":539 + /* "larch/pickle/pickle.pyx":541 * * * cdef inline int _fast_save_finish(Packer* p, o, state) except -1: # <<<<<<<<<<<<<< @@ -7325,7 +7342,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__fast_save_finish(Packer return __pyx_r; } -/* "larch/pickle/pickle.pyx":567 +/* "larch/pickle/pickle.pyx":569 * * * cdef int _save__newobj__(Packer* p, object o, state) except -1: # <<<<<<<<<<<<<< @@ -7341,16 +7358,16 @@ static int __pyx_f_5larch_6pickle_6pickle__save__newobj__(Packer *__pyx_v_p, PyO const char *__pyx_filename = NULL; int __pyx_clineno = 0; - /* "larch/pickle/pickle.pyx":568 + /* "larch/pickle/pickle.pyx":570 * * cdef int _save__newobj__(Packer* p, object o, state) except -1: * register_type(o, save_new_object) # <<<<<<<<<<<<<< * if p.protocol < 4: * return _save_new_object_finish(p, o, state) */ - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_v_o, __pyx_f_5larch_6pickle_6pickle_save_new_object); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 568, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_v_o, __pyx_f_5larch_6pickle_6pickle_save_new_object); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 570, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":569 + /* "larch/pickle/pickle.pyx":571 * cdef int _save__newobj__(Packer* p, object o, state) except -1: * register_type(o, save_new_object) * if p.protocol < 4: # <<<<<<<<<<<<<< @@ -7360,18 +7377,18 @@ static int __pyx_f_5larch_6pickle_6pickle__save__newobj__(Packer *__pyx_v_p, PyO __pyx_t_1 = (__pyx_v_p->protocol < 4); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":570 + /* "larch/pickle/pickle.pyx":572 * register_type(o, save_new_object) * if p.protocol < 4: * return _save_new_object_finish(p, o, state) # <<<<<<<<<<<<<< * else: * return _fast_save_finish(p, o, state) */ - __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle__save_new_object_finish(__pyx_v_p, __pyx_v_o, __pyx_v_state); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 570, __pyx_L1_error) + __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle__save_new_object_finish(__pyx_v_p, __pyx_v_o, __pyx_v_state); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 572, __pyx_L1_error) __pyx_r = __pyx_t_2; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":569 + /* "larch/pickle/pickle.pyx":571 * cdef int _save__newobj__(Packer* p, object o, state) except -1: * register_type(o, save_new_object) * if p.protocol < 4: # <<<<<<<<<<<<<< @@ -7380,7 +7397,7 @@ static int __pyx_f_5larch_6pickle_6pickle__save__newobj__(Packer *__pyx_v_p, PyO */ } - /* "larch/pickle/pickle.pyx":572 + /* "larch/pickle/pickle.pyx":574 * return _save_new_object_finish(p, o, state) * else: * return _fast_save_finish(p, o, state) # <<<<<<<<<<<<<< @@ -7388,12 +7405,12 @@ static int __pyx_f_5larch_6pickle_6pickle__save__newobj__(Packer *__pyx_v_p, PyO * */ /*else*/ { - __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle__fast_save_finish(__pyx_v_p, __pyx_v_o, __pyx_v_state); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 572, __pyx_L1_error) + __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle__fast_save_finish(__pyx_v_p, __pyx_v_o, __pyx_v_state); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 574, __pyx_L1_error) __pyx_r = __pyx_t_2; goto __pyx_L0; } - /* "larch/pickle/pickle.pyx":567 + /* "larch/pickle/pickle.pyx":569 * * * cdef int _save__newobj__(Packer* p, object o, state) except -1: # <<<<<<<<<<<<<< @@ -7409,7 +7426,7 @@ static int __pyx_f_5larch_6pickle_6pickle__save__newobj__(Packer *__pyx_v_p, PyO return __pyx_r; } -/* "larch/pickle/pickle.pyx":575 +/* "larch/pickle/pickle.pyx":577 * * * cdef inline int _save_object(Packer* p, object o) except -1: # <<<<<<<<<<<<<< @@ -7431,21 +7448,22 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p PyObject *__pyx_t_5 = NULL; PyObject *__pyx_t_6 = NULL; PyObject *__pyx_t_7 = NULL; - int __pyx_t_8; + unsigned int __pyx_t_8; int __pyx_t_9; - PyObject *__pyx_t_10 = NULL; + int __pyx_t_10; PyObject *__pyx_t_11 = NULL; PyObject *__pyx_t_12 = NULL; PyObject *__pyx_t_13 = NULL; PyObject *__pyx_t_14 = NULL; PyObject *__pyx_t_15 = NULL; - PyObject *__pyx_t_16; + PyObject *__pyx_t_16 = NULL; + PyObject *__pyx_t_17; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_save_object", 1); - /* "larch/pickle/pickle.pyx":578 + /* "larch/pickle/pickle.pyx":580 * cdef: * PyObject *reduce_func * pack_t next_save_func = NULL # <<<<<<<<<<<<<< @@ -7454,7 +7472,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p */ __pyx_v_next_save_func = NULL; - /* "larch/pickle/pickle.pyx":580 + /* "larch/pickle/pickle.pyx":582 * pack_t next_save_func = NULL * * if p.save_ref(o) > 0: # <<<<<<<<<<<<<< @@ -7464,7 +7482,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __pyx_t_1 = (__pyx_v_p->save_ref(__pyx_v_o) > 0); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":581 + /* "larch/pickle/pickle.pyx":583 * * if p.save_ref(o) > 0: * return 0 # <<<<<<<<<<<<<< @@ -7474,7 +7492,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":580 + /* "larch/pickle/pickle.pyx":582 * pack_t next_save_func = NULL * * if p.save_ref(o) > 0: # <<<<<<<<<<<<<< @@ -7483,7 +7501,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p */ } - /* "larch/pickle/pickle.pyx":583 + /* "larch/pickle/pickle.pyx":585 * return 0 * * reduce_func = PyDict_GetItem((p.pickler).dispatch_table, type(o)) # <<<<<<<<<<<<<< @@ -7495,7 +7513,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __pyx_v_reduce_func = PyDict_GetItem(__pyx_t_2, ((PyObject *)Py_TYPE(__pyx_v_o))); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":584 + /* "larch/pickle/pickle.pyx":586 * * reduce_func = PyDict_GetItem((p.pickler).dispatch_table, type(o)) * if reduce_func is NULL: # <<<<<<<<<<<<<< @@ -7505,19 +7523,19 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __pyx_t_1 = (__pyx_v_reduce_func == NULL); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":585 + /* "larch/pickle/pickle.pyx":587 * reduce_func = PyDict_GetItem((p.pickler).dispatch_table, type(o)) * if reduce_func is NULL: * do_reduce = o.__reduce_ex__ # <<<<<<<<<<<<<< * try: * state = do_reduce(REDUCE_PROTOCOL) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_reduce_ex); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 585, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_reduce_ex); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 587, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_v_do_reduce = __pyx_t_2; __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":586 + /* "larch/pickle/pickle.pyx":588 * if reduce_func is NULL: * do_reduce = o.__reduce_ex__ * try: # <<<<<<<<<<<<<< @@ -7533,7 +7551,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __Pyx_XGOTREF(__pyx_t_5); /*try:*/ { - /* "larch/pickle/pickle.pyx":587 + /* "larch/pickle/pickle.pyx":589 * do_reduce = o.__reduce_ex__ * try: * state = do_reduce(REDUCE_PROTOCOL) # <<<<<<<<<<<<<< @@ -7559,14 +7577,14 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p PyObject *__pyx_callargs[2] = {__pyx_t_7, __pyx_v_5larch_6pickle_6pickle_REDUCE_PROTOCOL}; __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_6, __pyx_callargs+1-__pyx_t_8, 1+__pyx_t_8); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 587, __pyx_L5_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 589, __pyx_L5_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } __pyx_v_state = __pyx_t_2; __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":586 + /* "larch/pickle/pickle.pyx":588 * if reduce_func is NULL: * do_reduce = o.__reduce_ex__ * try: # <<<<<<<<<<<<<< @@ -7575,7 +7593,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p */ } - /* "larch/pickle/pickle.pyx":596 + /* "larch/pickle/pickle.pyx":598 * return 0 * else: * if not isinstance(state, basestring): # <<<<<<<<<<<<<< @@ -7587,7 +7605,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __pyx_t_9 = (!__pyx_t_1); if (__pyx_t_9) { - /* "larch/pickle/pickle.pyx":597 + /* "larch/pickle/pickle.pyx":599 * else: * if not isinstance(state, basestring): * next_save_func = save_reduced # <<<<<<<<<<<<<< @@ -7596,7 +7614,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p */ __pyx_v_next_save_func = __pyx_f_5larch_6pickle_6pickle_save_reduced; - /* "larch/pickle/pickle.pyx":596 + /* "larch/pickle/pickle.pyx":598 * return 0 * else: * if not isinstance(state, basestring): # <<<<<<<<<<<<<< @@ -7614,22 +7632,22 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "larch/pickle/pickle.pyx":588 + /* "larch/pickle/pickle.pyx":590 * try: * state = do_reduce(REDUCE_PROTOCOL) * except TypeError: # <<<<<<<<<<<<<< * # a meta class * try: */ - __pyx_t_8 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_TypeError); - if (__pyx_t_8) { + __pyx_t_10 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_TypeError); + if (__pyx_t_10) { __Pyx_AddTraceback("larch.pickle.pickle._save_object", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_2, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(0, 588, __pyx_L7_except_error) + if (__Pyx_GetException(&__pyx_t_2, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(0, 590, __pyx_L7_except_error) __Pyx_XGOTREF(__pyx_t_2); __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "larch/pickle/pickle.pyx":590 + /* "larch/pickle/pickle.pyx":592 * except TypeError: * # a meta class * try: # <<<<<<<<<<<<<< @@ -7639,22 +7657,22 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p { __Pyx_PyThreadState_declare __Pyx_PyThreadState_assign - __Pyx_ExceptionSave(&__pyx_t_10, &__pyx_t_11, &__pyx_t_12); - __Pyx_XGOTREF(__pyx_t_10); + __Pyx_ExceptionSave(&__pyx_t_11, &__pyx_t_12, &__pyx_t_13); __Pyx_XGOTREF(__pyx_t_11); __Pyx_XGOTREF(__pyx_t_12); + __Pyx_XGOTREF(__pyx_t_13); /*try:*/ { - /* "larch/pickle/pickle.pyx":591 + /* "larch/pickle/pickle.pyx":593 * # a meta class * try: * (p.pickler).pack_import1(GLOBAL_OBJECT, o) # <<<<<<<<<<<<<< * except: * reraise() */ - __pyx_t_8 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import1(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), GLOBAL_OBJECT, __pyx_v_o); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 591, __pyx_L14_error) + __pyx_t_10 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import1(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), GLOBAL_OBJECT, __pyx_v_o); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 593, __pyx_L14_error) - /* "larch/pickle/pickle.pyx":590 + /* "larch/pickle/pickle.pyx":592 * except TypeError: * # a meta class * try: # <<<<<<<<<<<<<< @@ -7662,13 +7680,13 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p * except: */ } - __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; + __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0; goto __pyx_L21_try_end; __pyx_L14_error:; - /* "larch/pickle/pickle.pyx":592 + /* "larch/pickle/pickle.pyx":594 * try: * (p.pickler).pack_import1(GLOBAL_OBJECT, o) * except: # <<<<<<<<<<<<<< @@ -7677,26 +7695,26 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p */ /*except:*/ { __Pyx_AddTraceback("larch.pickle.pickle._save_object", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_13, &__pyx_t_14, &__pyx_t_15) < 0) __PYX_ERR(0, 592, __pyx_L16_except_error) - __Pyx_XGOTREF(__pyx_t_13); + if (__Pyx_GetException(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16) < 0) __PYX_ERR(0, 594, __pyx_L16_except_error) __Pyx_XGOTREF(__pyx_t_14); __Pyx_XGOTREF(__pyx_t_15); + __Pyx_XGOTREF(__pyx_t_16); - /* "larch/pickle/pickle.pyx":593 + /* "larch/pickle/pickle.pyx":595 * (p.pickler).pack_import1(GLOBAL_OBJECT, o) * except: * reraise() # <<<<<<<<<<<<<< * return 0 * else: */ - __pyx_f_5larch_6pickle_6pickle_reraise(); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 593, __pyx_L16_except_error) - __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0; + __pyx_f_5larch_6pickle_6pickle_reraise(); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 595, __pyx_L16_except_error) __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0; __Pyx_XDECREF(__pyx_t_15); __pyx_t_15 = 0; + __Pyx_XDECREF(__pyx_t_16); __pyx_t_16 = 0; goto __pyx_L15_exception_handled; } - /* "larch/pickle/pickle.pyx":590 + /* "larch/pickle/pickle.pyx":592 * except TypeError: * # a meta class * try: # <<<<<<<<<<<<<< @@ -7704,20 +7722,20 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p * except: */ __pyx_L16_except_error:; - __Pyx_XGIVEREF(__pyx_t_10); __Pyx_XGIVEREF(__pyx_t_11); __Pyx_XGIVEREF(__pyx_t_12); - __Pyx_ExceptionReset(__pyx_t_10, __pyx_t_11, __pyx_t_12); + __Pyx_XGIVEREF(__pyx_t_13); + __Pyx_ExceptionReset(__pyx_t_11, __pyx_t_12, __pyx_t_13); goto __pyx_L7_except_error; __pyx_L15_exception_handled:; - __Pyx_XGIVEREF(__pyx_t_10); __Pyx_XGIVEREF(__pyx_t_11); __Pyx_XGIVEREF(__pyx_t_12); - __Pyx_ExceptionReset(__pyx_t_10, __pyx_t_11, __pyx_t_12); + __Pyx_XGIVEREF(__pyx_t_13); + __Pyx_ExceptionReset(__pyx_t_11, __pyx_t_12, __pyx_t_13); __pyx_L21_try_end:; } - /* "larch/pickle/pickle.pyx":594 + /* "larch/pickle/pickle.pyx":596 * except: * reraise() * return 0 # <<<<<<<<<<<<<< @@ -7732,7 +7750,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p } goto __pyx_L7_except_error; - /* "larch/pickle/pickle.pyx":586 + /* "larch/pickle/pickle.pyx":588 * if reduce_func is NULL: * do_reduce = o.__reduce_ex__ * try: # <<<<<<<<<<<<<< @@ -7754,7 +7772,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __pyx_L10_try_end:; } - /* "larch/pickle/pickle.pyx":584 + /* "larch/pickle/pickle.pyx":586 * * reduce_func = PyDict_GetItem((p.pickler).dispatch_table, type(o)) * if reduce_func is NULL: # <<<<<<<<<<<<<< @@ -7764,7 +7782,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p goto __pyx_L4; } - /* "larch/pickle/pickle.pyx":599 + /* "larch/pickle/pickle.pyx":601 * next_save_func = save_reduced * else: * state = (reduce_func)(o) # <<<<<<<<<<<<<< @@ -7791,7 +7809,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_o}; __pyx_t_7 = __Pyx_PyObject_FastCall(__pyx_t_6, __pyx_callargs+1-__pyx_t_8, 1+__pyx_t_8); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 599, __pyx_L1_error) + if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 601, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } @@ -7800,7 +7818,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p } __pyx_L4:; - /* "larch/pickle/pickle.pyx":601 + /* "larch/pickle/pickle.pyx":603 * state = (reduce_func)(o) * * if isinstance(state, basestring): # <<<<<<<<<<<<<< @@ -7810,19 +7828,19 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __pyx_t_9 = __Pyx_PyBaseString_Check(__pyx_v_state); if (__pyx_t_9) { - /* "larch/pickle/pickle.pyx":602 + /* "larch/pickle/pickle.pyx":604 * * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) # <<<<<<<<<<<<<< * return 0 * */ - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_module); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 602, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_module); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 604, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_8 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import2(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), SINGLETON, __pyx_t_7, __pyx_v_state); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 602, __pyx_L1_error) + __pyx_t_10 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler)->__pyx_vtab)->pack_import2(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_p->pickler), SINGLETON, __pyx_t_7, __pyx_v_state); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 604, __pyx_L1_error) __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "larch/pickle/pickle.pyx":603 + /* "larch/pickle/pickle.pyx":605 * if isinstance(state, basestring): * (p.pickler).pack_import2(SINGLETON, o.__module__, state) * return 0 # <<<<<<<<<<<<<< @@ -7832,7 +7850,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":601 + /* "larch/pickle/pickle.pyx":603 * state = (reduce_func)(o) * * if isinstance(state, basestring): # <<<<<<<<<<<<<< @@ -7841,32 +7859,32 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p */ } - /* "larch/pickle/pickle.pyx":605 + /* "larch/pickle/pickle.pyx":607 * return 0 * * if ((PyTuple_GET_ITEM(state, 0)).__name__) == "__newobj__": # <<<<<<<<<<<<<< * return _save__newobj__(p, o, state) * else: */ - __pyx_t_16 = PyTuple_GET_ITEM(__pyx_v_state, 0); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_t_16), __pyx_n_s_name); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 605, __pyx_L1_error) + __pyx_t_17 = PyTuple_GET_ITEM(__pyx_v_state, 0); + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_t_17), __pyx_n_s_name); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 607, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_t_7, __pyx_n_u_newobj, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 605, __pyx_L1_error) + __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_t_7, __pyx_n_u_newobj, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 607, __pyx_L1_error) __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; if (__pyx_t_9) { - /* "larch/pickle/pickle.pyx":606 + /* "larch/pickle/pickle.pyx":608 * * if ((PyTuple_GET_ITEM(state, 0)).__name__) == "__newobj__": * return _save__newobj__(p, o, state) # <<<<<<<<<<<<<< * else: * p.pack_ext(OBJECT, 1) */ - __pyx_t_8 = __pyx_f_5larch_6pickle_6pickle__save__newobj__(__pyx_v_p, __pyx_v_o, __pyx_v_state); if (unlikely(__pyx_t_8 == ((int)-1))) __PYX_ERR(0, 606, __pyx_L1_error) - __pyx_r = __pyx_t_8; + __pyx_t_10 = __pyx_f_5larch_6pickle_6pickle__save__newobj__(__pyx_v_p, __pyx_v_o, __pyx_v_state); if (unlikely(__pyx_t_10 == ((int)-1))) __PYX_ERR(0, 608, __pyx_L1_error) + __pyx_r = __pyx_t_10; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":605 + /* "larch/pickle/pickle.pyx":607 * return 0 * * if ((PyTuple_GET_ITEM(state, 0)).__name__) == "__newobj__": # <<<<<<<<<<<<<< @@ -7875,7 +7893,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p */ } - /* "larch/pickle/pickle.pyx":608 + /* "larch/pickle/pickle.pyx":610 * return _save__newobj__(p, o, state) * else: * p.pack_ext(OBJECT, 1) # <<<<<<<<<<<<<< @@ -7885,28 +7903,28 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p /*else*/ { (void)(__pyx_v_p->pack_ext(OBJECT, 1)); - /* "larch/pickle/pickle.pyx":609 + /* "larch/pickle/pickle.pyx":611 * else: * p.pack_ext(OBJECT, 1) * p.dump(PyTuple_GET_ITEM(state, 0)) # <<<<<<<<<<<<<< * p.dump(PyTuple_GET_ITEM(state, 1)) * */ - __pyx_t_16 = PyTuple_GET_ITEM(__pyx_v_state, 0); - __pyx_v_p->dump(((PyObject *)__pyx_t_16)); + __pyx_t_17 = PyTuple_GET_ITEM(__pyx_v_state, 0); + __pyx_v_p->dump(((PyObject *)__pyx_t_17)); - /* "larch/pickle/pickle.pyx":610 + /* "larch/pickle/pickle.pyx":612 * p.pack_ext(OBJECT, 1) * p.dump(PyTuple_GET_ITEM(state, 0)) * p.dump(PyTuple_GET_ITEM(state, 1)) # <<<<<<<<<<<<<< * * if next_save_func: */ - __pyx_t_16 = PyTuple_GET_ITEM(__pyx_v_state, 1); - __pyx_v_p->dump(((PyObject *)__pyx_t_16)); + __pyx_t_17 = PyTuple_GET_ITEM(__pyx_v_state, 1); + __pyx_v_p->dump(((PyObject *)__pyx_t_17)); } - /* "larch/pickle/pickle.pyx":612 + /* "larch/pickle/pickle.pyx":614 * p.dump(PyTuple_GET_ITEM(state, 1)) * * if next_save_func: # <<<<<<<<<<<<<< @@ -7916,16 +7934,16 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __pyx_t_9 = (__pyx_v_next_save_func != 0); if (__pyx_t_9) { - /* "larch/pickle/pickle.pyx":613 + /* "larch/pickle/pickle.pyx":615 * * if next_save_func: * register_type(o, next_save_func) # <<<<<<<<<<<<<< * * save_object_state(p, state) */ - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_v_o, __pyx_v_next_save_func); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 613, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_v_o, __pyx_v_next_save_func); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 615, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":612 + /* "larch/pickle/pickle.pyx":614 * p.dump(PyTuple_GET_ITEM(state, 1)) * * if next_save_func: # <<<<<<<<<<<<<< @@ -7934,17 +7952,17 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p */ } - /* "larch/pickle/pickle.pyx":615 + /* "larch/pickle/pickle.pyx":617 * register_type(o, next_save_func) * * save_object_state(p, state) # <<<<<<<<<<<<<< * * */ - if (!(likely(PyTuple_CheckExact(__pyx_v_state))||((__pyx_v_state) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_v_state))) __PYX_ERR(0, 615, __pyx_L1_error) - __pyx_f_5larch_6pickle_6pickle_save_object_state(__pyx_v_p, ((PyObject*)__pyx_v_state)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 615, __pyx_L1_error) + if (!(likely(PyTuple_CheckExact(__pyx_v_state))||((__pyx_v_state) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_v_state))) __PYX_ERR(0, 617, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_save_object_state(__pyx_v_p, ((PyObject*)__pyx_v_state)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 617, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":575 + /* "larch/pickle/pickle.pyx":577 * * * cdef inline int _save_object(Packer* p, object o) except -1: # <<<<<<<<<<<<<< @@ -7959,9 +7977,9 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p __Pyx_XDECREF(__pyx_t_2); __Pyx_XDECREF(__pyx_t_6); __Pyx_XDECREF(__pyx_t_7); - __Pyx_XDECREF(__pyx_t_13); __Pyx_XDECREF(__pyx_t_14); __Pyx_XDECREF(__pyx_t_15); + __Pyx_XDECREF(__pyx_t_16); __Pyx_AddTraceback("larch.pickle.pickle._save_object", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = -1; __pyx_L0:; @@ -7971,7 +7989,7 @@ static CYTHON_INLINE int __pyx_f_5larch_6pickle_6pickle__save_object(Packer *__p return __pyx_r; } -/* "larch/pickle/pickle.pyx":618 +/* "larch/pickle/pickle.pyx":620 * * * cdef void save_object(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -7993,7 +8011,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object(Packer *__pyx_v_p, PyObje int __pyx_clineno = 0; __Pyx_RefNannySetupContext("save_object", 1); - /* "larch/pickle/pickle.pyx":619 + /* "larch/pickle/pickle.pyx":621 * * cdef void save_object(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -8009,16 +8027,16 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object(Packer *__pyx_v_p, PyObje __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "larch/pickle/pickle.pyx":620 + /* "larch/pickle/pickle.pyx":622 * cdef void save_object(Packer* p, object o) noexcept: * try: * _save_object(p, o) # <<<<<<<<<<<<<< * except: * reraise() */ - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__save_object(__pyx_v_p, __pyx_v_o); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 620, __pyx_L3_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__save_object(__pyx_v_p, __pyx_v_o); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 622, __pyx_L3_error) - /* "larch/pickle/pickle.pyx":619 + /* "larch/pickle/pickle.pyx":621 * * cdef void save_object(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -8032,7 +8050,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object(Packer *__pyx_v_p, PyObje goto __pyx_L8_try_end; __pyx_L3_error:; - /* "larch/pickle/pickle.pyx":621 + /* "larch/pickle/pickle.pyx":623 * try: * _save_object(p, o) * except: # <<<<<<<<<<<<<< @@ -8041,26 +8059,26 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object(Packer *__pyx_v_p, PyObje */ /*except:*/ { __Pyx_AddTraceback("larch.pickle.pickle.save_object", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(0, 621, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(0, 623, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_5); __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "larch/pickle/pickle.pyx":622 + /* "larch/pickle/pickle.pyx":624 * _save_object(p, o) * except: * reraise() # <<<<<<<<<<<<<< * * save_object_ptr = save_object */ - __pyx_f_5larch_6pickle_6pickle_reraise(); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 622, __pyx_L5_except_error) + __pyx_f_5larch_6pickle_6pickle_reraise(); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 624, __pyx_L5_except_error) __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; goto __pyx_L4_exception_handled; } - /* "larch/pickle/pickle.pyx":619 + /* "larch/pickle/pickle.pyx":621 * * cdef void save_object(Packer* p, object o) noexcept: * try: # <<<<<<<<<<<<<< @@ -8081,7 +8099,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object(Packer *__pyx_v_p, PyObje __pyx_L8_try_end:; } - /* "larch/pickle/pickle.pyx":618 + /* "larch/pickle/pickle.pyx":620 * * * cdef void save_object(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -8100,7 +8118,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_object(Packer *__pyx_v_p, PyObje __Pyx_RefNannyFinishContext(); } -/* "larch/pickle/pickle.pyx":627 +/* "larch/pickle/pickle.pyx":629 * * * cdef void save_impossible(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -8115,21 +8133,21 @@ static void __pyx_f_5larch_6pickle_6pickle_save_impossible(CYTHON_UNUSED Packer PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + unsigned int __pyx_t_4; char *__pyx_t_5; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("save_impossible", 1); - /* "larch/pickle/pickle.pyx":629 + /* "larch/pickle/pickle.pyx":631 * cdef void save_impossible(Packer* p, object o) noexcept: * cdef: * unicode msg = "Cannot save {!r}".format(o) # <<<<<<<<<<<<<< * bytes bmsg = msg.encode() * */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_Cannot_save_r, __pyx_n_s_format); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 629, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_Cannot_save_r, __pyx_n_s_format); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 631, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -8149,15 +8167,15 @@ static void __pyx_f_5larch_6pickle_6pickle_save_impossible(CYTHON_UNUSED Packer PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_v_o}; __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 629, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 631, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } - if (!(likely(PyUnicode_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("unicode", __pyx_t_1))) __PYX_ERR(0, 629, __pyx_L1_error) + if (!(likely(PyUnicode_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("unicode", __pyx_t_1))) __PYX_ERR(0, 631, __pyx_L1_error) __pyx_v_msg = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":630 + /* "larch/pickle/pickle.pyx":632 * cdef: * unicode msg = "Cannot save {!r}".format(o) * bytes bmsg = msg.encode() # <<<<<<<<<<<<<< @@ -8166,31 +8184,31 @@ static void __pyx_f_5larch_6pickle_6pickle_save_impossible(CYTHON_UNUSED Packer */ if (unlikely(__pyx_v_msg == Py_None)) { PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "encode"); - __PYX_ERR(0, 630, __pyx_L1_error) + __PYX_ERR(0, 632, __pyx_L1_error) } - __pyx_t_1 = PyUnicode_AsEncodedString(__pyx_v_msg, NULL, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 630, __pyx_L1_error) + __pyx_t_1 = PyUnicode_AsEncodedString(__pyx_v_msg, NULL, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 632, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_bmsg = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":632 + /* "larch/pickle/pickle.pyx":634 * bytes bmsg = msg.encode() * * PyErr_SetString(PicklingError, bmsg) # <<<<<<<<<<<<<< * throw_python_error() * */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_PicklingError); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 632, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_PicklingError); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 634, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); if (unlikely(__pyx_v_bmsg == Py_None)) { PyErr_SetString(PyExc_TypeError, "expected bytes, NoneType found"); - __PYX_ERR(0, 632, __pyx_L1_error) + __PYX_ERR(0, 634, __pyx_L1_error) } - __pyx_t_5 = __Pyx_PyBytes_AsWritableString(__pyx_v_bmsg); if (unlikely((!__pyx_t_5) && PyErr_Occurred())) __PYX_ERR(0, 632, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyBytes_AsWritableString(__pyx_v_bmsg); if (unlikely((!__pyx_t_5) && PyErr_Occurred())) __PYX_ERR(0, 634, __pyx_L1_error) PyErr_SetString(__pyx_t_1, __pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":633 + /* "larch/pickle/pickle.pyx":635 * * PyErr_SetString(PicklingError, bmsg) * throw_python_error() # <<<<<<<<<<<<<< @@ -8199,7 +8217,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_impossible(CYTHON_UNUSED Packer */ throw_python_error(); - /* "larch/pickle/pickle.pyx":627 + /* "larch/pickle/pickle.pyx":629 * * * cdef void save_impossible(Packer* p, object o) noexcept: # <<<<<<<<<<<<<< @@ -8220,7 +8238,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_impossible(CYTHON_UNUSED Packer __Pyx_RefNannyFinishContext(); } -/* "larch/pickle/pickle.pyx":636 +/* "larch/pickle/pickle.pyx":638 * * * cdef void register_type(o, pack_t saver): # <<<<<<<<<<<<<< @@ -8230,7 +8248,7 @@ static void __pyx_f_5larch_6pickle_6pickle_save_impossible(CYTHON_UNUSED Packer static void __pyx_f_5larch_6pickle_6pickle_register_type(PyObject *__pyx_v_o, pack_t __pyx_v_saver) { - /* "larch/pickle/pickle.pyx":637 + /* "larch/pickle/pickle.pyx":639 * * cdef void register_type(o, pack_t saver): * pickle_registry.register_type(type(o), saver) # <<<<<<<<<<<<<< @@ -8239,7 +8257,7 @@ static void __pyx_f_5larch_6pickle_6pickle_register_type(PyObject *__pyx_v_o, pa */ pickle_registry.register_type(((PyObject *)Py_TYPE(__pyx_v_o)), __pyx_v_saver); - /* "larch/pickle/pickle.pyx":636 + /* "larch/pickle/pickle.pyx":638 * * * cdef void register_type(o, pack_t saver): # <<<<<<<<<<<<<< @@ -8250,7 +8268,7 @@ static void __pyx_f_5larch_6pickle_6pickle_register_type(PyObject *__pyx_v_o, pa /* function exit code */ } -/* "larch/pickle/pickle.pyx":666 +/* "larch/pickle/pickle.pyx":668 * ctypedef int (*pack_import_names_t)(Packer* p, module, name) except -1 * * cdef int simple_pack(Packer* p, module, name) except -1: # <<<<<<<<<<<<<< @@ -8261,7 +8279,7 @@ static void __pyx_f_5larch_6pickle_6pickle_register_type(PyObject *__pyx_v_o, pa static int __pyx_f_5larch_6pickle_6pickle_simple_pack(Packer *__pyx_v_p, PyObject *__pyx_v_module, PyObject *__pyx_v_name) { int __pyx_r; - /* "larch/pickle/pickle.pyx":667 + /* "larch/pickle/pickle.pyx":669 * * cdef int simple_pack(Packer* p, module, name) except -1: * p.dump(module) # <<<<<<<<<<<<<< @@ -8270,7 +8288,7 @@ static int __pyx_f_5larch_6pickle_6pickle_simple_pack(Packer *__pyx_v_p, PyObjec */ __pyx_v_p->dump(__pyx_v_module); - /* "larch/pickle/pickle.pyx":668 + /* "larch/pickle/pickle.pyx":670 * cdef int simple_pack(Packer* p, module, name) except -1: * p.dump(module) * p.dump(name) # <<<<<<<<<<<<<< @@ -8279,7 +8297,7 @@ static int __pyx_f_5larch_6pickle_6pickle_simple_pack(Packer *__pyx_v_p, PyObjec */ __pyx_v_p->dump(__pyx_v_name); - /* "larch/pickle/pickle.pyx":666 + /* "larch/pickle/pickle.pyx":668 * ctypedef int (*pack_import_names_t)(Packer* p, module, name) except -1 * * cdef int simple_pack(Packer* p, module, name) except -1: # <<<<<<<<<<<<<< @@ -8292,7 +8310,7 @@ static int __pyx_f_5larch_6pickle_6pickle_simple_pack(Packer *__pyx_v_p, PyObjec return __pyx_r; } -/* "larch/pickle/pickle.pyx":671 +/* "larch/pickle/pickle.pyx":673 * * * cdef int mapped_pack(Packer* p, module, name) except -1: # <<<<<<<<<<<<<< @@ -8318,7 +8336,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec __Pyx_INCREF(__pyx_v_module); __Pyx_INCREF(__pyx_v_name); - /* "larch/pickle/pickle.pyx":673 + /* "larch/pickle/pickle.pyx":675 * cdef int mapped_pack(Packer* p, module, name) except -1: * cdef PyObject *tmp * tmp = PyDict_GetItem(name_mapping_3to2, (module, name)) # <<<<<<<<<<<<<< @@ -8327,19 +8345,19 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec */ __pyx_t_1 = __pyx_v_5larch_6pickle_6pickle_name_mapping_3to2; __Pyx_INCREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 673, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 675, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_module); __Pyx_GIVEREF(__pyx_v_module); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_module)) __PYX_ERR(0, 673, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_module)) __PYX_ERR(0, 675, __pyx_L1_error); __Pyx_INCREF(__pyx_v_name); __Pyx_GIVEREF(__pyx_v_name); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_name)) __PYX_ERR(0, 673, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_name)) __PYX_ERR(0, 675, __pyx_L1_error); __pyx_v_tmp = PyDict_GetItem(__pyx_t_1, __pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":674 + /* "larch/pickle/pickle.pyx":676 * cdef PyObject *tmp * tmp = PyDict_GetItem(name_mapping_3to2, (module, name)) * if tmp is not NULL: # <<<<<<<<<<<<<< @@ -8349,7 +8367,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec __pyx_t_3 = (__pyx_v_tmp != NULL); if (__pyx_t_3) { - /* "larch/pickle/pickle.pyx":675 + /* "larch/pickle/pickle.pyx":677 * tmp = PyDict_GetItem(name_mapping_3to2, (module, name)) * if tmp is not NULL: * module, name = tmp # <<<<<<<<<<<<<< @@ -8364,7 +8382,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 675, __pyx_L1_error) + __PYX_ERR(0, 677, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -8377,15 +8395,15 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec __Pyx_INCREF(__pyx_t_1); __Pyx_INCREF(__pyx_t_4); #else - __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 675, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 677, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 675, __pyx_L1_error) + __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 677, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); #endif __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else { Py_ssize_t index = -1; - __pyx_t_5 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 675, __pyx_L1_error) + __pyx_t_5 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 677, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_6 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_5); @@ -8393,7 +8411,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec __Pyx_GOTREF(__pyx_t_1); index = 1; __pyx_t_4 = __pyx_t_6(__pyx_t_5); if (unlikely(!__pyx_t_4)) goto __pyx_L4_unpacking_failed; __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_6(__pyx_t_5), 2) < 0) __PYX_ERR(0, 675, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_6(__pyx_t_5), 2) < 0) __PYX_ERR(0, 677, __pyx_L1_error) __pyx_t_6 = NULL; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; goto __pyx_L5_unpacking_done; @@ -8401,7 +8419,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_6 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 675, __pyx_L1_error) + __PYX_ERR(0, 677, __pyx_L1_error) __pyx_L5_unpacking_done:; } __Pyx_DECREF_SET(__pyx_v_module, __pyx_t_1); @@ -8409,7 +8427,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec __Pyx_DECREF_SET(__pyx_v_name, __pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":674 + /* "larch/pickle/pickle.pyx":676 * cdef PyObject *tmp * tmp = PyDict_GetItem(name_mapping_3to2, (module, name)) * if tmp is not NULL: # <<<<<<<<<<<<<< @@ -8418,7 +8436,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec */ } - /* "larch/pickle/pickle.pyx":677 + /* "larch/pickle/pickle.pyx":679 * module, name = tmp * * tmp = PyDict_GetItem(import_mapping_3to2, module) # <<<<<<<<<<<<<< @@ -8430,7 +8448,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec __pyx_v_tmp = PyDict_GetItem(__pyx_t_2, __pyx_v_module); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":678 + /* "larch/pickle/pickle.pyx":680 * * tmp = PyDict_GetItem(import_mapping_3to2, module) * if tmp is not NULL: # <<<<<<<<<<<<<< @@ -8440,7 +8458,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec __pyx_t_3 = (__pyx_v_tmp != NULL); if (__pyx_t_3) { - /* "larch/pickle/pickle.pyx":679 + /* "larch/pickle/pickle.pyx":681 * tmp = PyDict_GetItem(import_mapping_3to2, module) * if tmp is not NULL: * module = tmp # <<<<<<<<<<<<<< @@ -8452,7 +8470,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec __Pyx_DECREF_SET(__pyx_v_module, __pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":678 + /* "larch/pickle/pickle.pyx":680 * * tmp = PyDict_GetItem(import_mapping_3to2, module) * if tmp is not NULL: # <<<<<<<<<<<<<< @@ -8461,16 +8479,16 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec */ } - /* "larch/pickle/pickle.pyx":681 + /* "larch/pickle/pickle.pyx":683 * module = tmp * * simple_pack(p, module, name) # <<<<<<<<<<<<<< * * */ - __pyx_t_7 = __pyx_f_5larch_6pickle_6pickle_simple_pack(__pyx_v_p, __pyx_v_module, __pyx_v_name); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 681, __pyx_L1_error) + __pyx_t_7 = __pyx_f_5larch_6pickle_6pickle_simple_pack(__pyx_v_p, __pyx_v_module, __pyx_v_name); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 683, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":671 + /* "larch/pickle/pickle.pyx":673 * * * cdef int mapped_pack(Packer* p, module, name) except -1: # <<<<<<<<<<<<<< @@ -8495,7 +8513,7 @@ static int __pyx_f_5larch_6pickle_6pickle_mapped_pack(Packer *__pyx_v_p, PyObjec return __pyx_r; } -/* "larch/pickle/pickle.pyx":694 +/* "larch/pickle/pickle.pyx":696 * public uint32_t last_refcount * * def __init__( # <<<<<<<<<<<<<< @@ -8527,7 +8545,7 @@ static int __pyx_pw_5larch_6pickle_6pickle_7Pickler_1__init__(PyObject *__pyx_v_ { PyObject **__pyx_pyargnames[] = {&__pyx_n_s_file,&__pyx_n_s_protocol,&__pyx_n_s_with_refs,0}; - /* "larch/pickle/pickle.pyx":695 + /* "larch/pickle/pickle.pyx":697 * * def __init__( * self, file=None, protocol=MAX_PROTOCOL_VERSION, with_refs=True): # <<<<<<<<<<<<<< @@ -8555,26 +8573,26 @@ static int __pyx_pw_5larch_6pickle_6pickle_7Pickler_1__init__(PyObject *__pyx_v_ if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_file); if (value) { values[0] = __Pyx_Arg_NewRef_VARARGS(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 694, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 696, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 1: if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_protocol); if (value) { values[1] = __Pyx_Arg_NewRef_VARARGS(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 694, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 696, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_with_refs); if (value) { values[2] = __Pyx_Arg_NewRef_VARARGS(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 694, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 696, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 694, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 696, __pyx_L3_error) } } else { switch (__pyx_nargs) { @@ -8594,7 +8612,7 @@ static int __pyx_pw_5larch_6pickle_6pickle_7Pickler_1__init__(PyObject *__pyx_v_ } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("__init__", 0, 0, 3, __pyx_nargs); __PYX_ERR(0, 694, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("__init__", 0, 0, 3, __pyx_nargs); __PYX_ERR(0, 696, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -8610,7 +8628,7 @@ static int __pyx_pw_5larch_6pickle_6pickle_7Pickler_1__init__(PyObject *__pyx_v_ __pyx_L4_argument_unpacking_done:; __pyx_r = __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(((struct __pyx_obj_5larch_6pickle_6pickle_Pickler *)__pyx_v_self), __pyx_v_file, __pyx_v_protocol, __pyx_v_with_refs); - /* "larch/pickle/pickle.pyx":694 + /* "larch/pickle/pickle.pyx":696 * public uint32_t last_refcount * * def __init__( # <<<<<<<<<<<<<< @@ -8640,28 +8658,29 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l uint8_t __pyx_t_6; int __pyx_t_7; bool __pyx_t_8; + unsigned int __pyx_t_9; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__init__", 0); __Pyx_INCREF(__pyx_v_protocol); - /* "larch/pickle/pickle.pyx":696 + /* "larch/pickle/pickle.pyx":698 * def __init__( * self, file=None, protocol=MAX_PROTOCOL_VERSION, with_refs=True): * if protocol < 0: protocol = MAX_PROTOCOL_VERSION # <<<<<<<<<<<<<< * protocol = min(protocol, MAX_PROTOCOL_VERSION) * self.protocol = protocol */ - __pyx_t_1 = PyObject_RichCompare(__pyx_v_protocol, __pyx_int_0, Py_LT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 696, __pyx_L1_error) - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_2 < 0))) __PYX_ERR(0, 696, __pyx_L1_error) + __pyx_t_1 = PyObject_RichCompare(__pyx_v_protocol, __pyx_int_0, Py_LT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 698, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_2 < 0))) __PYX_ERR(0, 698, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_2) { __Pyx_INCREF(__pyx_v_5larch_6pickle_6pickle_MAX_PROTOCOL_VERSION); __Pyx_DECREF_SET(__pyx_v_protocol, __pyx_v_5larch_6pickle_6pickle_MAX_PROTOCOL_VERSION); } - /* "larch/pickle/pickle.pyx":697 + /* "larch/pickle/pickle.pyx":699 * self, file=None, protocol=MAX_PROTOCOL_VERSION, with_refs=True): * if protocol < 0: protocol = MAX_PROTOCOL_VERSION * protocol = min(protocol, MAX_PROTOCOL_VERSION) # <<<<<<<<<<<<<< @@ -8672,8 +8691,8 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l __pyx_t_1 = __pyx_v_5larch_6pickle_6pickle_MAX_PROTOCOL_VERSION; __Pyx_INCREF(__pyx_v_protocol); __pyx_t_3 = __pyx_v_protocol; - __pyx_t_5 = PyObject_RichCompare(__pyx_t_1, __pyx_t_3, Py_LT); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 697, __pyx_L1_error) - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely((__pyx_t_2 < 0))) __PYX_ERR(0, 697, __pyx_L1_error) + __pyx_t_5 = PyObject_RichCompare(__pyx_t_1, __pyx_t_3, Py_LT); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 699, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely((__pyx_t_2 < 0))) __PYX_ERR(0, 699, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; if (__pyx_t_2) { __Pyx_INCREF(__pyx_t_1); @@ -8690,27 +8709,27 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l __Pyx_DECREF_SET(__pyx_v_protocol, __pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":698 + /* "larch/pickle/pickle.pyx":700 * if protocol < 0: protocol = MAX_PROTOCOL_VERSION * protocol = min(protocol, MAX_PROTOCOL_VERSION) * self.protocol = protocol # <<<<<<<<<<<<<< * if protocol == 2: * self.pack_import_names = mapped_pack */ - __pyx_t_6 = __Pyx_PyInt_As_uint8_t(__pyx_v_protocol); if (unlikely((__pyx_t_6 == ((uint8_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 698, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyInt_As_uint8_t(__pyx_v_protocol); if (unlikely((__pyx_t_6 == ((uint8_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 700, __pyx_L1_error) __pyx_v_self->protocol = __pyx_t_6; - /* "larch/pickle/pickle.pyx":699 + /* "larch/pickle/pickle.pyx":701 * protocol = min(protocol, MAX_PROTOCOL_VERSION) * self.protocol = protocol * if protocol == 2: # <<<<<<<<<<<<<< * self.pack_import_names = mapped_pack * else: */ - __pyx_t_2 = (__Pyx_PyInt_BoolEqObjC(__pyx_v_protocol, __pyx_int_2, 2, 0)); if (unlikely((__pyx_t_2 < 0))) __PYX_ERR(0, 699, __pyx_L1_error) + __pyx_t_2 = (__Pyx_PyInt_BoolEqObjC(__pyx_v_protocol, __pyx_int_2, 2, 0)); if (unlikely((__pyx_t_2 < 0))) __PYX_ERR(0, 701, __pyx_L1_error) if (__pyx_t_2) { - /* "larch/pickle/pickle.pyx":700 + /* "larch/pickle/pickle.pyx":702 * self.protocol = protocol * if protocol == 2: * self.pack_import_names = mapped_pack # <<<<<<<<<<<<<< @@ -8719,7 +8738,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l */ __pyx_v_self->pack_import_names = __pyx_f_5larch_6pickle_6pickle_mapped_pack; - /* "larch/pickle/pickle.pyx":699 + /* "larch/pickle/pickle.pyx":701 * protocol = min(protocol, MAX_PROTOCOL_VERSION) * self.protocol = protocol * if protocol == 2: # <<<<<<<<<<<<<< @@ -8729,7 +8748,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l goto __pyx_L4; } - /* "larch/pickle/pickle.pyx":702 + /* "larch/pickle/pickle.pyx":704 * self.pack_import_names = mapped_pack * else: * self.pack_import_names = simple_pack # <<<<<<<<<<<<<< @@ -8741,18 +8760,18 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l } __pyx_L4:; - /* "larch/pickle/pickle.pyx":704 + /* "larch/pickle/pickle.pyx":706 * self.pack_import_names = simple_pack * * self.packer = new Packer(self, protocol, with_refs) # <<<<<<<<<<<<<< * self.dispatch_table = dispatch_table * if protocol < 4: */ - __pyx_t_7 = __Pyx_PyInt_As_int(__pyx_v_protocol); if (unlikely((__pyx_t_7 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 704, __pyx_L1_error) - __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_v_with_refs); if (unlikely((__pyx_t_8 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 704, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyInt_As_int(__pyx_v_protocol); if (unlikely((__pyx_t_7 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 706, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_v_with_refs); if (unlikely((__pyx_t_8 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 706, __pyx_L1_error) __pyx_v_self->packer = new Packer(((PyObject *)__pyx_v_self), __pyx_t_7, __pyx_t_8); - /* "larch/pickle/pickle.pyx":705 + /* "larch/pickle/pickle.pyx":707 * * self.packer = new Packer(self, protocol, with_refs) * self.dispatch_table = dispatch_table # <<<<<<<<<<<<<< @@ -8765,19 +8784,19 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l __Pyx_DECREF(__pyx_v_self->dispatch_table); __pyx_v_self->dispatch_table = __pyx_v_5larch_6pickle_6pickle_dispatch_table; - /* "larch/pickle/pickle.pyx":706 + /* "larch/pickle/pickle.pyx":708 * self.packer = new Packer(self, protocol, with_refs) * self.dispatch_table = dispatch_table * if protocol < 4: # <<<<<<<<<<<<<< * self.packer.min_string_size_for_ref = 5; * else: */ - __pyx_t_1 = PyObject_RichCompare(__pyx_v_protocol, __pyx_int_4, Py_LT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 706, __pyx_L1_error) - __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_2 < 0))) __PYX_ERR(0, 706, __pyx_L1_error) + __pyx_t_1 = PyObject_RichCompare(__pyx_v_protocol, __pyx_int_4, Py_LT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 708, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely((__pyx_t_2 < 0))) __PYX_ERR(0, 708, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (__pyx_t_2) { - /* "larch/pickle/pickle.pyx":707 + /* "larch/pickle/pickle.pyx":709 * self.dispatch_table = dispatch_table * if protocol < 4: * self.packer.min_string_size_for_ref = 5; # <<<<<<<<<<<<<< @@ -8786,7 +8805,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l */ __pyx_v_self->packer->min_string_size_for_ref = 5; - /* "larch/pickle/pickle.pyx":706 + /* "larch/pickle/pickle.pyx":708 * self.packer = new Packer(self, protocol, with_refs) * self.dispatch_table = dispatch_table * if protocol < 4: # <<<<<<<<<<<<<< @@ -8796,7 +8815,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l goto __pyx_L5; } - /* "larch/pickle/pickle.pyx":709 + /* "larch/pickle/pickle.pyx":711 * self.packer.min_string_size_for_ref = 5; * else: * self.packer.min_string_size_for_ref = 3; # <<<<<<<<<<<<<< @@ -8808,7 +8827,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l } __pyx_L5:; - /* "larch/pickle/pickle.pyx":711 + /* "larch/pickle/pickle.pyx":713 * self.packer.min_string_size_for_ref = 3; * * if file is None: # <<<<<<<<<<<<<< @@ -8818,14 +8837,14 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l __pyx_t_2 = (__pyx_v_file == Py_None); if (__pyx_t_2) { - /* "larch/pickle/pickle.pyx":712 + /* "larch/pickle/pickle.pyx":714 * * if file is None: * self.file = OutputBuffer() # <<<<<<<<<<<<<< * self.packer.do_write = write_buffer * elif hasattr(file, "c_pickle"): */ - __pyx_t_1 = __Pyx_PyObject_CallNoArg(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_OutputBuffer)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 712, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_CallNoArg(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_OutputBuffer)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 714, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_GIVEREF(__pyx_t_1); __Pyx_GOTREF(__pyx_v_self->file); @@ -8833,7 +8852,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l __pyx_v_self->file = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":713 + /* "larch/pickle/pickle.pyx":715 * if file is None: * self.file = OutputBuffer() * self.packer.do_write = write_buffer # <<<<<<<<<<<<<< @@ -8842,7 +8861,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l */ __pyx_v_self->packer->do_write = __pyx_f_5larch_6pickle_6pickle_write_buffer; - /* "larch/pickle/pickle.pyx":711 + /* "larch/pickle/pickle.pyx":713 * self.packer.min_string_size_for_ref = 3; * * if file is None: # <<<<<<<<<<<<<< @@ -8852,27 +8871,27 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l goto __pyx_L6; } - /* "larch/pickle/pickle.pyx":714 + /* "larch/pickle/pickle.pyx":716 * self.file = OutputBuffer() * self.packer.do_write = write_buffer * elif hasattr(file, "c_pickle"): # <<<<<<<<<<<<<< * self.file = file.c_pickle() * self.packer.do_write = write_external */ - __pyx_t_2 = __Pyx_HasAttr(__pyx_v_file, __pyx_n_u_c_pickle); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 714, __pyx_L1_error) + __pyx_t_2 = __Pyx_HasAttr(__pyx_v_file, __pyx_n_u_c_pickle); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 716, __pyx_L1_error) if (__pyx_t_2) { - /* "larch/pickle/pickle.pyx":715 + /* "larch/pickle/pickle.pyx":717 * self.packer.do_write = write_buffer * elif hasattr(file, "c_pickle"): * self.file = file.c_pickle() # <<<<<<<<<<<<<< * self.packer.do_write = write_external * else: */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_file, __pyx_n_s_c_pickle); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 715, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_file, __pyx_n_s_c_pickle); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 717, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_3 = NULL; - __pyx_t_7 = 0; + __pyx_t_9 = 0; #if CYTHON_UNPACK_METHODS if (likely(PyMethod_Check(__pyx_t_4))) { __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_4); @@ -8881,15 +8900,15 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l __Pyx_INCREF(__pyx_t_3); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_4, function); - __pyx_t_7 = 1; + __pyx_t_9 = 1; } } #endif { PyObject *__pyx_callargs[2] = {__pyx_t_3, NULL}; - __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_7, 0+__pyx_t_7); + __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_4, __pyx_callargs+1-__pyx_t_9, 0+__pyx_t_9); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 715, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 717, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; } @@ -8899,7 +8918,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l __pyx_v_self->file = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":716 + /* "larch/pickle/pickle.pyx":718 * elif hasattr(file, "c_pickle"): * self.file = file.c_pickle() * self.packer.do_write = write_external # <<<<<<<<<<<<<< @@ -8908,7 +8927,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l */ __pyx_v_self->packer->do_write = __pyx_f_5larch_6pickle_6pickle_write_external; - /* "larch/pickle/pickle.pyx":714 + /* "larch/pickle/pickle.pyx":716 * self.file = OutputBuffer() * self.packer.do_write = write_buffer * elif hasattr(file, "c_pickle"): # <<<<<<<<<<<<<< @@ -8918,7 +8937,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l goto __pyx_L6; } - /* "larch/pickle/pickle.pyx":718 + /* "larch/pickle/pickle.pyx":720 * self.packer.do_write = write_external * else: * self.file = _FileLike(file) # <<<<<<<<<<<<<< @@ -8926,7 +8945,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l * */ /*else*/ { - __pyx_t_1 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle__FileLike), __pyx_v_file); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 718, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle__FileLike), __pyx_v_file); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 720, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_GIVEREF(__pyx_t_1); __Pyx_GOTREF(__pyx_v_self->file); @@ -8934,7 +8953,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l __pyx_v_self->file = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":719 + /* "larch/pickle/pickle.pyx":721 * else: * self.file = _FileLike(file) * self.packer.do_write = write_file # <<<<<<<<<<<<<< @@ -8945,7 +8964,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l } __pyx_L6:; - /* "larch/pickle/pickle.pyx":694 + /* "larch/pickle/pickle.pyx":696 * public uint32_t last_refcount * * def __init__( # <<<<<<<<<<<<<< @@ -8969,7 +8988,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler___init__(struct __pyx_obj_5l return __pyx_r; } -/* "larch/pickle/pickle.pyx":721 +/* "larch/pickle/pickle.pyx":723 * self.packer.do_write = write_file * * def __dealloc__(self): # <<<<<<<<<<<<<< @@ -8992,7 +9011,7 @@ static void __pyx_pw_5larch_6pickle_6pickle_7Pickler_3__dealloc__(PyObject *__py static void __pyx_pf_5larch_6pickle_6pickle_7Pickler_2__dealloc__(struct __pyx_obj_5larch_6pickle_6pickle_Pickler *__pyx_v_self) { - /* "larch/pickle/pickle.pyx":722 + /* "larch/pickle/pickle.pyx":724 * * def __dealloc__(self): * del self.packer # <<<<<<<<<<<<<< @@ -9001,7 +9020,7 @@ static void __pyx_pf_5larch_6pickle_6pickle_7Pickler_2__dealloc__(struct __pyx_o */ delete __pyx_v_self->packer; - /* "larch/pickle/pickle.pyx":721 + /* "larch/pickle/pickle.pyx":723 * self.packer.do_write = write_file * * def __dealloc__(self): # <<<<<<<<<<<<<< @@ -9012,7 +9031,7 @@ static void __pyx_pf_5larch_6pickle_6pickle_7Pickler_2__dealloc__(struct __pyx_o /* function exit code */ } -/* "larch/pickle/pickle.pyx":724 +/* "larch/pickle/pickle.pyx":726 * del self.packer * * cdef int pack_import1(self, uint8_t code, o) except -1: # <<<<<<<<<<<<<< @@ -9031,22 +9050,22 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_pack_import1(struct __pyx_obj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("pack_import1", 1); - /* "larch/pickle/pickle.pyx":725 + /* "larch/pickle/pickle.pyx":727 * * cdef int pack_import1(self, uint8_t code, o) except -1: * self.pack_import2(code, o.__module__, o.__qualname__) # <<<<<<<<<<<<<< * * cdef int pack_import2(self, uint8_t code, module, name) except -1: */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_module); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 725, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_module); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 727, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_qualname); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 725, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_o, __pyx_n_s_qualname); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 727, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)__pyx_v_self->__pyx_vtab)->pack_import2(__pyx_v_self, __pyx_v_code, __pyx_t_1, __pyx_t_2); if (unlikely(__pyx_t_3 == ((int)-1))) __PYX_ERR(0, 725, __pyx_L1_error) + __pyx_t_3 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)__pyx_v_self->__pyx_vtab)->pack_import2(__pyx_v_self, __pyx_v_code, __pyx_t_1, __pyx_t_2); if (unlikely(__pyx_t_3 == ((int)-1))) __PYX_ERR(0, 727, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":724 + /* "larch/pickle/pickle.pyx":726 * del self.packer * * cdef int pack_import1(self, uint8_t code, o) except -1: # <<<<<<<<<<<<<< @@ -9067,7 +9086,7 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_pack_import1(struct __pyx_obj return __pyx_r; } -/* "larch/pickle/pickle.pyx":727 +/* "larch/pickle/pickle.pyx":729 * self.pack_import2(code, o.__module__, o.__qualname__) * * cdef int pack_import2(self, uint8_t code, module, name) except -1: # <<<<<<<<<<<<<< @@ -9089,7 +9108,7 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_pack_import2(struct __pyx_obj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("pack_import2", 1); - /* "larch/pickle/pickle.pyx":730 + /* "larch/pickle/pickle.pyx":732 * cdef PyObject *rcode * * rcode = PyDict_GetItem(extension_registry, (module, name)) # <<<<<<<<<<<<<< @@ -9098,19 +9117,19 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_pack_import2(struct __pyx_obj */ __pyx_t_1 = __pyx_v_5larch_6pickle_6pickle_extension_registry; __Pyx_INCREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 730, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 732, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_module); __Pyx_GIVEREF(__pyx_v_module); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_module)) __PYX_ERR(0, 730, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_module)) __PYX_ERR(0, 732, __pyx_L1_error); __Pyx_INCREF(__pyx_v_name); __Pyx_GIVEREF(__pyx_v_name); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_name)) __PYX_ERR(0, 730, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_name)) __PYX_ERR(0, 732, __pyx_L1_error); __pyx_v_rcode = PyDict_GetItem(__pyx_t_1, __pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":731 + /* "larch/pickle/pickle.pyx":733 * * rcode = PyDict_GetItem(extension_registry, (module, name)) * if rcode is NULL: # <<<<<<<<<<<<<< @@ -9120,7 +9139,7 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_pack_import2(struct __pyx_obj __pyx_t_3 = (__pyx_v_rcode == NULL); if (__pyx_t_3) { - /* "larch/pickle/pickle.pyx":732 + /* "larch/pickle/pickle.pyx":734 * rcode = PyDict_GetItem(extension_registry, (module, name)) * if rcode is NULL: * self.packer.pack_ext(code, 1) # <<<<<<<<<<<<<< @@ -9129,16 +9148,16 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_pack_import2(struct __pyx_obj */ (void)(__pyx_v_self->packer->pack_ext(__pyx_v_code, 1)); - /* "larch/pickle/pickle.pyx":733 + /* "larch/pickle/pickle.pyx":735 * if rcode is NULL: * self.packer.pack_ext(code, 1) * self.pack_import_names(self.packer, module, name) # <<<<<<<<<<<<<< * else: * self.packer.pack_ext(code, 0) */ - __pyx_t_4 = __pyx_v_self->pack_import_names(__pyx_v_self->packer, __pyx_v_module, __pyx_v_name); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 733, __pyx_L1_error) + __pyx_t_4 = __pyx_v_self->pack_import_names(__pyx_v_self->packer, __pyx_v_module, __pyx_v_name); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 735, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":731 + /* "larch/pickle/pickle.pyx":733 * * rcode = PyDict_GetItem(extension_registry, (module, name)) * if rcode is NULL: # <<<<<<<<<<<<<< @@ -9148,7 +9167,7 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_pack_import2(struct __pyx_obj goto __pyx_L3; } - /* "larch/pickle/pickle.pyx":735 + /* "larch/pickle/pickle.pyx":737 * self.pack_import_names(self.packer, module, name) * else: * self.packer.pack_ext(code, 0) # <<<<<<<<<<<<<< @@ -9158,19 +9177,19 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_pack_import2(struct __pyx_obj /*else*/ { (void)(__pyx_v_self->packer->pack_ext(__pyx_v_code, 0)); - /* "larch/pickle/pickle.pyx":736 + /* "larch/pickle/pickle.pyx":738 * else: * self.packer.pack_ext(code, 0) * self.packer.write_int(rcode) # <<<<<<<<<<<<<< * * cdef int check_init(self) except -1: */ - __pyx_t_5 = __Pyx_PyInt_As_uint32_t(((PyObject *)__pyx_v_rcode)); if (unlikely((__pyx_t_5 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 736, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyInt_As_uint32_t(((PyObject *)__pyx_v_rcode)); if (unlikely((__pyx_t_5 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 738, __pyx_L1_error) __pyx_v_self->packer->write_int(((uint32_t)__pyx_t_5)); } __pyx_L3:; - /* "larch/pickle/pickle.pyx":727 + /* "larch/pickle/pickle.pyx":729 * self.pack_import2(code, o.__module__, o.__qualname__) * * cdef int pack_import2(self, uint8_t code, module, name) except -1: # <<<<<<<<<<<<<< @@ -9191,7 +9210,7 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_pack_import2(struct __pyx_obj return __pyx_r; } -/* "larch/pickle/pickle.pyx":738 +/* "larch/pickle/pickle.pyx":740 * self.packer.write_int(rcode) * * cdef int check_init(self) except -1: # <<<<<<<<<<<<<< @@ -9209,13 +9228,13 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_check_init(struct __pyx_obj_5 PyObject *__pyx_t_5 = NULL; PyObject *__pyx_t_6 = NULL; PyObject *__pyx_t_7 = NULL; - int __pyx_t_8; + unsigned int __pyx_t_8; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("check_init", 1); - /* "larch/pickle/pickle.pyx":739 + /* "larch/pickle/pickle.pyx":741 * * cdef int check_init(self) except -1: * if self.file is None: # <<<<<<<<<<<<<< @@ -9225,34 +9244,34 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_check_init(struct __pyx_obj_5 __pyx_t_1 = (__pyx_v_self->file == Py_None); if (unlikely(__pyx_t_1)) { - /* "larch/pickle/pickle.pyx":740 + /* "larch/pickle/pickle.pyx":742 * cdef int check_init(self) except -1: * if self.file is None: * raise PicklingError( # <<<<<<<<<<<<<< * "Pickler.__init__() was not called by " * "{}.__init__()".format((self.__class__.__qualname__,))) */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_PicklingError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 740, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_PicklingError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 742, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - /* "larch/pickle/pickle.pyx":742 + /* "larch/pickle/pickle.pyx":744 * raise PicklingError( * "Pickler.__init__() was not called by " * "{}.__init__()".format((self.__class__.__qualname__,))) # <<<<<<<<<<<<<< * * def dump(self, obj, bool with_version=True): */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_Pickler___init___was_not_called, __pyx_n_s_format); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 742, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_Pickler___init___was_not_called, __pyx_n_s_format); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 744, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 742, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 744, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_qualname); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 742, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_qualname); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 744, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 742, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 744, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_GIVEREF(__pyx_t_7); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_7)) __PYX_ERR(0, 742, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_7)) __PYX_ERR(0, 744, __pyx_L1_error); __pyx_t_7 = 0; __pyx_t_7 = NULL; __pyx_t_8 = 0; @@ -9273,7 +9292,7 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_check_init(struct __pyx_obj_5 __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_8, 1+__pyx_t_8); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 742, __pyx_L1_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 744, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } @@ -9296,15 +9315,15 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_check_init(struct __pyx_obj_5 __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_8, 1+__pyx_t_8); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 740, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 742, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_Raise(__pyx_t_2, 0, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __PYX_ERR(0, 740, __pyx_L1_error) + __PYX_ERR(0, 742, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":739 + /* "larch/pickle/pickle.pyx":741 * * cdef int check_init(self) except -1: * if self.file is None: # <<<<<<<<<<<<<< @@ -9313,7 +9332,7 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_check_init(struct __pyx_obj_5 */ } - /* "larch/pickle/pickle.pyx":738 + /* "larch/pickle/pickle.pyx":740 * self.packer.write_int(rcode) * * cdef int check_init(self) except -1: # <<<<<<<<<<<<<< @@ -9338,7 +9357,7 @@ static int __pyx_f_5larch_6pickle_6pickle_7Pickler_check_init(struct __pyx_obj_5 return __pyx_r; } -/* "larch/pickle/pickle.pyx":744 +/* "larch/pickle/pickle.pyx":746 * "{}.__init__()".format((self.__class__.__qualname__,))) * * def dump(self, obj, bool with_version=True): # <<<<<<<<<<<<<< @@ -9402,19 +9421,19 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[0]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 744, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 746, __pyx_L3_error) else goto __pyx_L5_argtuple_error; CYTHON_FALLTHROUGH; case 1: if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_with_version); if (value) { values[1] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 744, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 746, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "dump") < 0)) __PYX_ERR(0, 744, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "dump") < 0)) __PYX_ERR(0, 746, __pyx_L3_error) } } else { switch (__pyx_nargs) { @@ -9427,14 +9446,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } __pyx_v_obj = values[0]; if (values[1]) { - __pyx_v_with_version = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_with_version == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 744, __pyx_L3_error) + __pyx_v_with_version = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_with_version == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 746, __pyx_L3_error) } else { __pyx_v_with_version = ((bool)1); } } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("dump", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 744, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("dump", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 746, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -9479,16 +9498,16 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_4dump(struct __pyx_obj int __pyx_clineno = 0; __Pyx_RefNannySetupContext("dump", 1); - /* "larch/pickle/pickle.pyx":745 + /* "larch/pickle/pickle.pyx":747 * * def dump(self, obj, bool with_version=True): * self.check_init() # <<<<<<<<<<<<<< * if with_version: * self.packer.pack_version(self.protocol) */ - __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)__pyx_v_self->__pyx_vtab)->check_init(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 745, __pyx_L1_error) + __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)__pyx_v_self->__pyx_vtab)->check_init(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 747, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":746 + /* "larch/pickle/pickle.pyx":748 * def dump(self, obj, bool with_version=True): * self.check_init() * if with_version: # <<<<<<<<<<<<<< @@ -9498,7 +9517,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_4dump(struct __pyx_obj __pyx_t_2 = (__pyx_v_with_version != 0); if (__pyx_t_2) { - /* "larch/pickle/pickle.pyx":747 + /* "larch/pickle/pickle.pyx":749 * self.check_init() * if with_version: * self.packer.pack_version(self.protocol) # <<<<<<<<<<<<<< @@ -9509,10 +9528,10 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_4dump(struct __pyx_obj __pyx_v_self->packer->pack_version(__pyx_v_self->protocol); } catch(...) { __Pyx_CppExn2PyErr(); - __PYX_ERR(0, 747, __pyx_L1_error) + __PYX_ERR(0, 749, __pyx_L1_error) } - /* "larch/pickle/pickle.pyx":746 + /* "larch/pickle/pickle.pyx":748 * def dump(self, obj, bool with_version=True): * self.check_init() * if with_version: # <<<<<<<<<<<<<< @@ -9521,7 +9540,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_4dump(struct __pyx_obj */ } - /* "larch/pickle/pickle.pyx":748 + /* "larch/pickle/pickle.pyx":750 * if with_version: * self.packer.pack_version(self.protocol) * try: # <<<<<<<<<<<<<< @@ -9530,17 +9549,17 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_4dump(struct __pyx_obj */ /*try:*/ { - /* "larch/pickle/pickle.pyx":749 + /* "larch/pickle/pickle.pyx":751 * self.packer.pack_version(self.protocol) * try: * self.packer.first_dump(obj) # <<<<<<<<<<<<<< * finally: * self.last_refcount = self.packer.reset() */ - __pyx_t_1 = __pyx_v_self->packer->first_dump(__pyx_v_obj); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 749, __pyx_L5_error) + __pyx_t_1 = __pyx_v_self->packer->first_dump(__pyx_v_obj); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 751, __pyx_L5_error) } - /* "larch/pickle/pickle.pyx":751 + /* "larch/pickle/pickle.pyx":753 * self.packer.first_dump(obj) * finally: * self.last_refcount = self.packer.reset() # <<<<<<<<<<<<<< @@ -9586,7 +9605,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_4dump(struct __pyx_obj __pyx_L6:; } - /* "larch/pickle/pickle.pyx":752 + /* "larch/pickle/pickle.pyx":754 * finally: * self.last_refcount = self.packer.reset() * return self # <<<<<<<<<<<<<< @@ -9598,7 +9617,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_4dump(struct __pyx_obj __pyx_r = ((PyObject *)__pyx_v_self); goto __pyx_L0; - /* "larch/pickle/pickle.pyx":744 + /* "larch/pickle/pickle.pyx":746 * "{}.__init__()".format((self.__class__.__qualname__,))) * * def dump(self, obj, bool with_version=True): # <<<<<<<<<<<<<< @@ -9616,7 +9635,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_4dump(struct __pyx_obj return __pyx_r; } -/* "larch/pickle/pickle.pyx":754 +/* "larch/pickle/pickle.pyx":756 * return self * * def dumps(self, obj, bool with_version=True): # <<<<<<<<<<<<<< @@ -9680,19 +9699,19 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[0]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 754, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 756, __pyx_L3_error) else goto __pyx_L5_argtuple_error; CYTHON_FALLTHROUGH; case 1: if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_with_version); if (value) { values[1] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 754, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 756, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "dumps") < 0)) __PYX_ERR(0, 754, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "dumps") < 0)) __PYX_ERR(0, 756, __pyx_L3_error) } } else { switch (__pyx_nargs) { @@ -9705,14 +9724,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } __pyx_v_obj = values[0]; if (values[1]) { - __pyx_v_with_version = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_with_version == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 754, __pyx_L3_error) + __pyx_v_with_version = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_with_version == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 756, __pyx_L3_error) } else { __pyx_v_with_version = ((bool)1); } } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("dumps", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 754, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("dumps", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 756, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -9758,25 +9777,25 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_6dumps(struct __pyx_ob int __pyx_clineno = 0; __Pyx_RefNannySetupContext("dumps", 1); - /* "larch/pickle/pickle.pyx":755 + /* "larch/pickle/pickle.pyx":757 * * def dumps(self, obj, bool with_version=True): * self.check_init() # <<<<<<<<<<<<<< * (self.file).reset() * if with_version: */ - __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)__pyx_v_self->__pyx_vtab)->check_init(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 755, __pyx_L1_error) + __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)__pyx_v_self->__pyx_vtab)->check_init(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 757, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":756 + /* "larch/pickle/pickle.pyx":758 * def dumps(self, obj, bool with_version=True): * self.check_init() * (self.file).reset() # <<<<<<<<<<<<<< * if with_version: * self.packer.pack_version(self.protocol) */ - ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_OutputBuffer *)((struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *)__pyx_v_self->file)->__pyx_vtab)->reset(((struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *)__pyx_v_self->file)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 756, __pyx_L1_error) + ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_OutputBuffer *)((struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *)__pyx_v_self->file)->__pyx_vtab)->reset(((struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *)__pyx_v_self->file)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 758, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":757 + /* "larch/pickle/pickle.pyx":759 * self.check_init() * (self.file).reset() * if with_version: # <<<<<<<<<<<<<< @@ -9786,7 +9805,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_6dumps(struct __pyx_ob __pyx_t_2 = (__pyx_v_with_version != 0); if (__pyx_t_2) { - /* "larch/pickle/pickle.pyx":758 + /* "larch/pickle/pickle.pyx":760 * (self.file).reset() * if with_version: * self.packer.pack_version(self.protocol) # <<<<<<<<<<<<<< @@ -9797,10 +9816,10 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_6dumps(struct __pyx_ob __pyx_v_self->packer->pack_version(__pyx_v_self->protocol); } catch(...) { __Pyx_CppExn2PyErr(); - __PYX_ERR(0, 758, __pyx_L1_error) + __PYX_ERR(0, 760, __pyx_L1_error) } - /* "larch/pickle/pickle.pyx":757 + /* "larch/pickle/pickle.pyx":759 * self.check_init() * (self.file).reset() * if with_version: # <<<<<<<<<<<<<< @@ -9809,7 +9828,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_6dumps(struct __pyx_ob */ } - /* "larch/pickle/pickle.pyx":759 + /* "larch/pickle/pickle.pyx":761 * if with_version: * self.packer.pack_version(self.protocol) * try: # <<<<<<<<<<<<<< @@ -9818,17 +9837,17 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_6dumps(struct __pyx_ob */ /*try:*/ { - /* "larch/pickle/pickle.pyx":760 + /* "larch/pickle/pickle.pyx":762 * self.packer.pack_version(self.protocol) * try: * self.packer.first_dump(obj) # <<<<<<<<<<<<<< * finally: * self.last_refcount = self.packer.reset() */ - __pyx_t_1 = __pyx_v_self->packer->first_dump(__pyx_v_obj); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 760, __pyx_L5_error) + __pyx_t_1 = __pyx_v_self->packer->first_dump(__pyx_v_obj); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 762, __pyx_L5_error) } - /* "larch/pickle/pickle.pyx":762 + /* "larch/pickle/pickle.pyx":764 * self.packer.first_dump(obj) * finally: * self.last_refcount = self.packer.reset() # <<<<<<<<<<<<<< @@ -9874,7 +9893,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_6dumps(struct __pyx_ob __pyx_L6:; } - /* "larch/pickle/pickle.pyx":764 + /* "larch/pickle/pickle.pyx":766 * self.last_refcount = self.packer.reset() * * return self.get_output_string() # <<<<<<<<<<<<<< @@ -9882,13 +9901,13 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_6dumps(struct __pyx_ob * cpdef bytes get_output_string(self): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_11 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)__pyx_v_self->__pyx_vtab)->get_output_string(__pyx_v_self, 0); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 764, __pyx_L1_error) + __pyx_t_11 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Pickler *)__pyx_v_self->__pyx_vtab)->get_output_string(__pyx_v_self, 0); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 766, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_11); __pyx_r = __pyx_t_11; __pyx_t_11 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":754 + /* "larch/pickle/pickle.pyx":756 * return self * * def dumps(self, obj, bool with_version=True): # <<<<<<<<<<<<<< @@ -9907,7 +9926,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_6dumps(struct __pyx_ob return __pyx_r; } -/* "larch/pickle/pickle.pyx":766 +/* "larch/pickle/pickle.pyx":768 * return self.get_output_string() * * cpdef bytes get_output_string(self): # <<<<<<<<<<<<<< @@ -9923,7 +9942,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_7Pickler_get_output_string(struc PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; @@ -9937,7 +9956,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_7Pickler_get_output_string(struc if (unlikely(!__Pyx_object_dict_version_matches(((PyObject *)__pyx_v_self), __pyx_tp_dict_version, __pyx_obj_dict_version))) { PY_UINT64_T __pyx_typedict_guard = __Pyx_get_tp_dict_version(((PyObject *)__pyx_v_self)); #endif - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_get_output_string); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 766, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_get_output_string); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 768, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); if (!__Pyx_IsSameCFunction(__pyx_t_1, (void*) __pyx_pw_5larch_6pickle_6pickle_7Pickler_9get_output_string)) { __Pyx_XDECREF(__pyx_r); @@ -9960,11 +9979,11 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_7Pickler_get_output_string(struc PyObject *__pyx_callargs[2] = {__pyx_t_4, NULL}; __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 0+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 766, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 768, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } - if (!(likely(PyBytes_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None) || __Pyx_RaiseUnexpectedTypeError("bytes", __pyx_t_2))) __PYX_ERR(0, 766, __pyx_L1_error) + if (!(likely(PyBytes_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None) || __Pyx_RaiseUnexpectedTypeError("bytes", __pyx_t_2))) __PYX_ERR(0, 768, __pyx_L1_error) __pyx_r = ((PyObject*)__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -9983,7 +10002,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_7Pickler_get_output_string(struc #endif } - /* "larch/pickle/pickle.pyx":767 + /* "larch/pickle/pickle.pyx":769 * * cpdef bytes get_output_string(self): * return (self.file).result() # <<<<<<<<<<<<<< @@ -9991,13 +10010,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_7Pickler_get_output_string(struc * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_OutputBuffer *)((struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *)__pyx_v_self->file)->__pyx_vtab)->result(((struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *)__pyx_v_self->file)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 767, __pyx_L1_error) + __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_OutputBuffer *)((struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *)__pyx_v_self->file)->__pyx_vtab)->result(((struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *)__pyx_v_self->file)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 769, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":766 + /* "larch/pickle/pickle.pyx":768 * return self.get_output_string() * * cpdef bytes get_output_string(self): # <<<<<<<<<<<<<< @@ -10044,7 +10063,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_8get_output_string(str int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_output_string", 1); __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_7Pickler_get_output_string(__pyx_v_self, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 766, __pyx_L1_error) + __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_7Pickler_get_output_string(__pyx_v_self, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 768, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; @@ -10061,7 +10080,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_8get_output_string(str return __pyx_r; } -/* "larch/pickle/pickle.pyx":691 +/* "larch/pickle/pickle.pyx":693 * uint8_t protocol * pack_import_names_t pack_import_names * public dict dispatch_table # <<<<<<<<<<<<<< @@ -10123,7 +10142,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler_14dispatch_table_2__set__(st const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__set__", 1); - if (!(likely(PyDict_CheckExact(__pyx_v_value))||((__pyx_v_value) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_v_value))) __PYX_ERR(0, 691, __pyx_L1_error) + if (!(likely(PyDict_CheckExact(__pyx_v_value))||((__pyx_v_value) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_v_value))) __PYX_ERR(0, 693, __pyx_L1_error) __pyx_t_1 = __pyx_v_value; __Pyx_INCREF(__pyx_t_1); __Pyx_GIVEREF(__pyx_t_1); @@ -10175,7 +10194,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler_14dispatch_table_4__del__(st return __pyx_r; } -/* "larch/pickle/pickle.pyx":692 +/* "larch/pickle/pickle.pyx":694 * pack_import_names_t pack_import_names * public dict dispatch_table * public uint32_t last_refcount # <<<<<<<<<<<<<< @@ -10207,7 +10226,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_7Pickler_13last_refcount___get_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__get__", 1); __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyInt_From_uint32_t(__pyx_v_self->last_refcount); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 692, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyInt_From_uint32_t(__pyx_v_self->last_refcount); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 694, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; @@ -10245,7 +10264,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler_13last_refcount_2__set__(str int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; - __pyx_t_1 = __Pyx_PyInt_As_uint32_t(__pyx_v_value); if (unlikely((__pyx_t_1 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 692, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyInt_As_uint32_t(__pyx_v_value); if (unlikely((__pyx_t_1 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 694, __pyx_L1_error) __pyx_v_self->last_refcount = __pyx_t_1; /* function exit code */ @@ -10258,7 +10277,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_7Pickler_13last_refcount_2__set__(str return __pyx_r; } -/* "larch/pickle/pickle.pyx":773 +/* "larch/pickle/pickle.pyx":775 * # ---------------------------------- * * cdef int _load_slot_state(obj, state) except -1: # <<<<<<<<<<<<<< @@ -10289,7 +10308,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj __Pyx_RefNannySetupContext("_load_slot_state", 0); __Pyx_INCREF(__pyx_v_state); - /* "larch/pickle/pickle.pyx":776 + /* "larch/pickle/pickle.pyx":778 * cdef dict obj_value * * if PyTuple_Check(state) and PyTuple_GET_SIZE(state) == 2: # <<<<<<<<<<<<<< @@ -10307,7 +10326,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj __pyx_L4_bool_binop_done:; if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":778 + /* "larch/pickle/pickle.pyx":780 * if PyTuple_Check(state) and PyTuple_GET_SIZE(state) == 2: * # an object with __slots__ * obj_value = PyTuple_GET_ITEM(state, 1) # <<<<<<<<<<<<<< @@ -10320,7 +10339,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj __pyx_v_obj_value = ((PyObject*)__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":779 + /* "larch/pickle/pickle.pyx":781 * # an object with __slots__ * obj_value = PyTuple_GET_ITEM(state, 1) * for k, v in obj_value.items(): # <<<<<<<<<<<<<< @@ -10330,9 +10349,9 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj __pyx_t_5 = 0; if (unlikely(__pyx_v_obj_value == Py_None)) { PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "items"); - __PYX_ERR(0, 779, __pyx_L1_error) + __PYX_ERR(0, 781, __pyx_L1_error) } - __pyx_t_8 = __Pyx_dict_iterator(__pyx_v_obj_value, 1, __pyx_n_s_items, (&__pyx_t_6), (&__pyx_t_7)); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 779, __pyx_L1_error) + __pyx_t_8 = __Pyx_dict_iterator(__pyx_v_obj_value, 1, __pyx_n_s_items, (&__pyx_t_6), (&__pyx_t_7)); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 781, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = __pyx_t_8; @@ -10340,7 +10359,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj while (1) { __pyx_t_10 = __Pyx_dict_iter_next(__pyx_t_4, __pyx_t_6, &__pyx_t_5, &__pyx_t_8, &__pyx_t_9, NULL, __pyx_t_7); if (unlikely(__pyx_t_10 == 0)) break; - if (unlikely(__pyx_t_10 == -1)) __PYX_ERR(0, 779, __pyx_L1_error) + if (unlikely(__pyx_t_10 == -1)) __PYX_ERR(0, 781, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_GOTREF(__pyx_t_9); __Pyx_XDECREF_SET(__pyx_v_k, __pyx_t_8); @@ -10348,18 +10367,18 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_9); __pyx_t_9 = 0; - /* "larch/pickle/pickle.pyx":780 + /* "larch/pickle/pickle.pyx":782 * obj_value = PyTuple_GET_ITEM(state, 1) * for k, v in obj_value.items(): * setattr(obj, k, v) # <<<<<<<<<<<<<< * * # an object with __slots__ and __dict__ */ - __pyx_t_11 = PyObject_SetAttr(__pyx_v_obj, __pyx_v_k, __pyx_v_v); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 780, __pyx_L1_error) + __pyx_t_11 = PyObject_SetAttr(__pyx_v_obj, __pyx_v_k, __pyx_v_v); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 782, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":783 + /* "larch/pickle/pickle.pyx":785 * * # an object with __slots__ and __dict__ * state = PyTuple_GET_ITEM(state, 0) # <<<<<<<<<<<<<< @@ -10372,7 +10391,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj __Pyx_DECREF_SET(__pyx_v_state, __pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":784 + /* "larch/pickle/pickle.pyx":786 * # an object with __slots__ and __dict__ * state = PyTuple_GET_ITEM(state, 0) * if state is not None: # <<<<<<<<<<<<<< @@ -10382,19 +10401,19 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj __pyx_t_1 = (__pyx_v_state != Py_None); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":785 + /* "larch/pickle/pickle.pyx":787 * state = PyTuple_GET_ITEM(state, 0) * if state is not None: * PyDict_Update(obj.__dict__, state) # <<<<<<<<<<<<<< * return 1 * return 0 */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_obj, __pyx_n_s_dict); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 785, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_obj, __pyx_n_s_dict); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 787, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_7 = PyDict_Update(__pyx_t_4, __pyx_v_state); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 785, __pyx_L1_error) + __pyx_t_7 = PyDict_Update(__pyx_t_4, __pyx_v_state); if (unlikely(__pyx_t_7 == ((int)-1))) __PYX_ERR(0, 787, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":784 + /* "larch/pickle/pickle.pyx":786 * # an object with __slots__ and __dict__ * state = PyTuple_GET_ITEM(state, 0) * if state is not None: # <<<<<<<<<<<<<< @@ -10403,7 +10422,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj */ } - /* "larch/pickle/pickle.pyx":786 + /* "larch/pickle/pickle.pyx":788 * if state is not None: * PyDict_Update(obj.__dict__, state) * return 1 # <<<<<<<<<<<<<< @@ -10413,7 +10432,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj __pyx_r = 1; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":776 + /* "larch/pickle/pickle.pyx":778 * cdef dict obj_value * * if PyTuple_Check(state) and PyTuple_GET_SIZE(state) == 2: # <<<<<<<<<<<<<< @@ -10422,7 +10441,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj */ } - /* "larch/pickle/pickle.pyx":787 + /* "larch/pickle/pickle.pyx":789 * PyDict_Update(obj.__dict__, state) * return 1 * return 0 # <<<<<<<<<<<<<< @@ -10432,7 +10451,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":773 + /* "larch/pickle/pickle.pyx":775 * # ---------------------------------- * * cdef int _load_slot_state(obj, state) except -1: # <<<<<<<<<<<<<< @@ -10456,7 +10475,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_slot_state(PyObject *__pyx_v_obj return __pyx_r; } -/* "larch/pickle/pickle.pyx":790 +/* "larch/pickle/pickle.pyx":792 * * * cdef int _load_state(obj, state) except -1: # <<<<<<<<<<<<<< @@ -10472,13 +10491,14 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state(PyObject *__pyx_v_obj, PyO PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; + int __pyx_t_6; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_load_state", 1); - /* "larch/pickle/pickle.pyx":791 + /* "larch/pickle/pickle.pyx":793 * * cdef int _load_state(obj, state) except -1: * if state is not None: # <<<<<<<<<<<<<< @@ -10488,19 +10508,19 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state(PyObject *__pyx_v_obj, PyO __pyx_t_1 = (__pyx_v_state != Py_None); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":792 + /* "larch/pickle/pickle.pyx":794 * cdef int _load_state(obj, state) except -1: * if state is not None: * set_state = getattr(obj, "__setstate__", None) # <<<<<<<<<<<<<< * if set_state is not None: * set_state(state) */ - __pyx_t_2 = __Pyx_GetAttr3(__pyx_v_obj, __pyx_n_u_setstate, Py_None); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 792, __pyx_L1_error) + __pyx_t_2 = __Pyx_GetAttr3(__pyx_v_obj, __pyx_n_u_setstate, Py_None); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 794, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_v_set_state = __pyx_t_2; __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":793 + /* "larch/pickle/pickle.pyx":795 * if state is not None: * set_state = getattr(obj, "__setstate__", None) * if set_state is not None: # <<<<<<<<<<<<<< @@ -10510,7 +10530,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state(PyObject *__pyx_v_obj, PyO __pyx_t_1 = (__pyx_v_set_state != Py_None); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":794 + /* "larch/pickle/pickle.pyx":796 * set_state = getattr(obj, "__setstate__", None) * if set_state is not None: * set_state(state) # <<<<<<<<<<<<<< @@ -10536,13 +10556,13 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state(PyObject *__pyx_v_obj, PyO PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_state}; __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 794, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 796, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":795 + /* "larch/pickle/pickle.pyx":797 * if set_state is not None: * set_state(state) * return 0 # <<<<<<<<<<<<<< @@ -10552,7 +10572,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state(PyObject *__pyx_v_obj, PyO __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":793 + /* "larch/pickle/pickle.pyx":795 * if state is not None: * set_state = getattr(obj, "__setstate__", None) * if set_state is not None: # <<<<<<<<<<<<<< @@ -10561,30 +10581,30 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state(PyObject *__pyx_v_obj, PyO */ } - /* "larch/pickle/pickle.pyx":797 + /* "larch/pickle/pickle.pyx":799 * return 0 * * if not _load_slot_state(obj, state): # <<<<<<<<<<<<<< * PyDict_Update(obj.__dict__, state) * return 0 */ - __pyx_t_5 = __pyx_f_5larch_6pickle_6pickle__load_slot_state(__pyx_v_obj, __pyx_v_state); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 797, __pyx_L1_error) - __pyx_t_1 = (!(__pyx_t_5 != 0)); + __pyx_t_6 = __pyx_f_5larch_6pickle_6pickle__load_slot_state(__pyx_v_obj, __pyx_v_state); if (unlikely(__pyx_t_6 == ((int)-1))) __PYX_ERR(0, 799, __pyx_L1_error) + __pyx_t_1 = (!(__pyx_t_6 != 0)); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":798 + /* "larch/pickle/pickle.pyx":800 * * if not _load_slot_state(obj, state): * PyDict_Update(obj.__dict__, state) # <<<<<<<<<<<<<< * return 0 * */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_obj, __pyx_n_s_dict); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 798, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_obj, __pyx_n_s_dict); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 800, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = PyDict_Update(__pyx_t_2, __pyx_v_state); if (unlikely(__pyx_t_5 == ((int)-1))) __PYX_ERR(0, 798, __pyx_L1_error) + __pyx_t_6 = PyDict_Update(__pyx_t_2, __pyx_v_state); if (unlikely(__pyx_t_6 == ((int)-1))) __PYX_ERR(0, 800, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":797 + /* "larch/pickle/pickle.pyx":799 * return 0 * * if not _load_slot_state(obj, state): # <<<<<<<<<<<<<< @@ -10593,7 +10613,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state(PyObject *__pyx_v_obj, PyO */ } - /* "larch/pickle/pickle.pyx":791 + /* "larch/pickle/pickle.pyx":793 * * cdef int _load_state(obj, state) except -1: * if state is not None: # <<<<<<<<<<<<<< @@ -10602,7 +10622,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state(PyObject *__pyx_v_obj, PyO */ } - /* "larch/pickle/pickle.pyx":799 + /* "larch/pickle/pickle.pyx":801 * if not _load_slot_state(obj, state): * PyDict_Update(obj.__dict__, state) * return 0 # <<<<<<<<<<<<<< @@ -10612,7 +10632,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state(PyObject *__pyx_v_obj, PyO __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":790 + /* "larch/pickle/pickle.pyx":792 * * * cdef int _load_state(obj, state) except -1: # <<<<<<<<<<<<<< @@ -10633,7 +10653,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state(PyObject *__pyx_v_obj, PyO return __pyx_r; } -/* "larch/pickle/pickle.pyx":802 +/* "larch/pickle/pickle.pyx":804 * * * cdef int _load_state_sequence(Unpacker *p, obj) except -1: # <<<<<<<<<<<<<< @@ -10650,25 +10670,25 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_sequence(Unpacker *__pyx_v int __pyx_t_2; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_load_state_sequence", 1); - /* "larch/pickle/pickle.pyx":803 + /* "larch/pickle/pickle.pyx":805 * * cdef int _load_state_sequence(Unpacker *p, obj) except -1: * item = p.load_object() # <<<<<<<<<<<<<< * if item is not _end_item: * append = obj.append */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 803, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 805, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_item = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":804 + /* "larch/pickle/pickle.pyx":806 * cdef int _load_state_sequence(Unpacker *p, obj) except -1: * item = p.load_object() * if item is not _end_item: # <<<<<<<<<<<<<< @@ -10678,19 +10698,19 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_sequence(Unpacker *__pyx_v __pyx_t_2 = (__pyx_v_item != __pyx_v_5larch_6pickle_6pickle__end_item); if (__pyx_t_2) { - /* "larch/pickle/pickle.pyx":805 + /* "larch/pickle/pickle.pyx":807 * item = p.load_object() * if item is not _end_item: * append = obj.append # <<<<<<<<<<<<<< * while item is not _end_item: * append(item) */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_obj, __pyx_n_s_append); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 805, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_obj, __pyx_n_s_append); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 807, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_append = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":806 + /* "larch/pickle/pickle.pyx":808 * if item is not _end_item: * append = obj.append * while item is not _end_item: # <<<<<<<<<<<<<< @@ -10701,7 +10721,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_sequence(Unpacker *__pyx_v __pyx_t_2 = (__pyx_v_item != __pyx_v_5larch_6pickle_6pickle__end_item); if (!__pyx_t_2) break; - /* "larch/pickle/pickle.pyx":807 + /* "larch/pickle/pickle.pyx":809 * append = obj.append * while item is not _end_item: * append(item) # <<<<<<<<<<<<<< @@ -10727,26 +10747,26 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_sequence(Unpacker *__pyx_v PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_item}; __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 807, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 809, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":808 + /* "larch/pickle/pickle.pyx":810 * while item is not _end_item: * append(item) * item = p.load_object() # <<<<<<<<<<<<<< * return 0 * */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 808, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 810, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF_SET(__pyx_v_item, __pyx_t_1); __pyx_t_1 = 0; } - /* "larch/pickle/pickle.pyx":804 + /* "larch/pickle/pickle.pyx":806 * cdef int _load_state_sequence(Unpacker *p, obj) except -1: * item = p.load_object() * if item is not _end_item: # <<<<<<<<<<<<<< @@ -10755,7 +10775,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_sequence(Unpacker *__pyx_v */ } - /* "larch/pickle/pickle.pyx":809 + /* "larch/pickle/pickle.pyx":811 * append(item) * item = p.load_object() * return 0 # <<<<<<<<<<<<<< @@ -10765,7 +10785,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_sequence(Unpacker *__pyx_v __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":802 + /* "larch/pickle/pickle.pyx":804 * * * cdef int _load_state_sequence(Unpacker *p, obj) except -1: # <<<<<<<<<<<<<< @@ -10787,7 +10807,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_sequence(Unpacker *__pyx_v return __pyx_r; } -/* "larch/pickle/pickle.pyx":812 +/* "larch/pickle/pickle.pyx":814 * * * cdef int _load_state_dict(Unpacker *p, obj) except -1: # <<<<<<<<<<<<<< @@ -10805,25 +10825,25 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_dict(Unpacker *__pyx_v_p, int __pyx_t_2; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_load_state_dict", 1); - /* "larch/pickle/pickle.pyx":813 + /* "larch/pickle/pickle.pyx":815 * * cdef int _load_state_dict(Unpacker *p, obj) except -1: * k = p.load_object() # <<<<<<<<<<<<<< * if k is not _end_item: * setitem = obj.__setitem__ */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 813, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 815, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_k = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":814 + /* "larch/pickle/pickle.pyx":816 * cdef int _load_state_dict(Unpacker *p, obj) except -1: * k = p.load_object() * if k is not _end_item: # <<<<<<<<<<<<<< @@ -10833,19 +10853,19 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_dict(Unpacker *__pyx_v_p, __pyx_t_2 = (__pyx_v_k != __pyx_v_5larch_6pickle_6pickle__end_item); if (__pyx_t_2) { - /* "larch/pickle/pickle.pyx":815 + /* "larch/pickle/pickle.pyx":817 * k = p.load_object() * if k is not _end_item: * setitem = obj.__setitem__ # <<<<<<<<<<<<<< * while k is not _end_item: * v = p.load_object() */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_obj, __pyx_n_s_setitem); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 815, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_obj, __pyx_n_s_setitem); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 817, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_setitem = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":816 + /* "larch/pickle/pickle.pyx":818 * if k is not _end_item: * setitem = obj.__setitem__ * while k is not _end_item: # <<<<<<<<<<<<<< @@ -10856,19 +10876,19 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_dict(Unpacker *__pyx_v_p, __pyx_t_2 = (__pyx_v_k != __pyx_v_5larch_6pickle_6pickle__end_item); if (!__pyx_t_2) break; - /* "larch/pickle/pickle.pyx":817 + /* "larch/pickle/pickle.pyx":819 * setitem = obj.__setitem__ * while k is not _end_item: * v = p.load_object() # <<<<<<<<<<<<<< * setitem(k, v) * k = p.load_object() */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 817, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 819, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_XDECREF_SET(__pyx_v_v, __pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":818 + /* "larch/pickle/pickle.pyx":820 * while k is not _end_item: * v = p.load_object() * setitem(k, v) # <<<<<<<<<<<<<< @@ -10894,26 +10914,26 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_dict(Unpacker *__pyx_v_p, PyObject *__pyx_callargs[3] = {__pyx_t_4, __pyx_v_k, __pyx_v_v}; __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 2+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 818, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 820, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":819 + /* "larch/pickle/pickle.pyx":821 * v = p.load_object() * setitem(k, v) * k = p.load_object() # <<<<<<<<<<<<<< * return 0 * */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 819, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 821, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF_SET(__pyx_v_k, __pyx_t_1); __pyx_t_1 = 0; } - /* "larch/pickle/pickle.pyx":814 + /* "larch/pickle/pickle.pyx":816 * cdef int _load_state_dict(Unpacker *p, obj) except -1: * k = p.load_object() * if k is not _end_item: # <<<<<<<<<<<<<< @@ -10922,7 +10942,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_dict(Unpacker *__pyx_v_p, */ } - /* "larch/pickle/pickle.pyx":820 + /* "larch/pickle/pickle.pyx":822 * setitem(k, v) * k = p.load_object() * return 0 # <<<<<<<<<<<<<< @@ -10932,7 +10952,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_dict(Unpacker *__pyx_v_p, __pyx_r = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":812 + /* "larch/pickle/pickle.pyx":814 * * * cdef int _load_state_dict(Unpacker *p, obj) except -1: # <<<<<<<<<<<<<< @@ -10955,7 +10975,7 @@ static int __pyx_f_5larch_6pickle_6pickle__load_state_dict(Unpacker *__pyx_v_p, return __pyx_r; } -/* "larch/pickle/pickle.pyx":823 +/* "larch/pickle/pickle.pyx":825 * * * cdef object _load_object(Unpacker *p, obj): # <<<<<<<<<<<<<< @@ -10974,46 +10994,46 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle__load_object(Unpacker *__pyx_v_p int __pyx_clineno = 0; __Pyx_RefNannySetupContext("_load_object", 1); - /* "larch/pickle/pickle.pyx":824 + /* "larch/pickle/pickle.pyx":826 * * cdef object _load_object(Unpacker *p, obj): * state = p.load_object() # <<<<<<<<<<<<<< * _load_state_sequence(p, obj) * _load_state_dict(p, obj) */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 824, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 826, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_state = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":825 + /* "larch/pickle/pickle.pyx":827 * cdef object _load_object(Unpacker *p, obj): * state = p.load_object() * _load_state_sequence(p, obj) # <<<<<<<<<<<<<< * _load_state_dict(p, obj) * _load_state(obj, state) */ - __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle__load_state_sequence(__pyx_v_p, __pyx_v_obj); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 825, __pyx_L1_error) + __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle__load_state_sequence(__pyx_v_p, __pyx_v_obj); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 827, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":826 + /* "larch/pickle/pickle.pyx":828 * state = p.load_object() * _load_state_sequence(p, obj) * _load_state_dict(p, obj) # <<<<<<<<<<<<<< * _load_state(obj, state) * return obj */ - __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle__load_state_dict(__pyx_v_p, __pyx_v_obj); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 826, __pyx_L1_error) + __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle__load_state_dict(__pyx_v_p, __pyx_v_obj); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 828, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":827 + /* "larch/pickle/pickle.pyx":829 * _load_state_sequence(p, obj) * _load_state_dict(p, obj) * _load_state(obj, state) # <<<<<<<<<<<<<< * return obj * */ - __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle__load_state(__pyx_v_obj, __pyx_v_state); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 827, __pyx_L1_error) + __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle__load_state(__pyx_v_obj, __pyx_v_state); if (unlikely(__pyx_t_2 == ((int)-1))) __PYX_ERR(0, 829, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":828 + /* "larch/pickle/pickle.pyx":830 * _load_state_dict(p, obj) * _load_state(obj, state) * return obj # <<<<<<<<<<<<<< @@ -11025,7 +11045,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle__load_object(Unpacker *__pyx_v_p __pyx_r = __pyx_v_obj; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":823 + /* "larch/pickle/pickle.pyx":825 * * * cdef object _load_object(Unpacker *p, obj): # <<<<<<<<<<<<<< @@ -11045,7 +11065,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle__load_object(Unpacker *__pyx_v_p return __pyx_r; } -/* "larch/pickle/pickle.pyx":831 +/* "larch/pickle/pickle.pyx":833 * * * cdef object load_object(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -11071,20 +11091,21 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, PyObject *__pyx_t_8 = NULL; PyObject *__pyx_t_9 = NULL; PyObject *__pyx_t_10 = NULL; - int __pyx_t_11; - char const *__pyx_t_12; - PyObject *__pyx_t_13 = NULL; + unsigned int __pyx_t_11; + int __pyx_t_12; + char const *__pyx_t_13; PyObject *__pyx_t_14 = NULL; PyObject *__pyx_t_15 = NULL; PyObject *__pyx_t_16 = NULL; PyObject *__pyx_t_17 = NULL; PyObject *__pyx_t_18 = NULL; + PyObject *__pyx_t_19 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_object", 1); - /* "larch/pickle/pickle.pyx":832 + /* "larch/pickle/pickle.pyx":834 * * cdef object load_object(Unpacker *p, uint8_t code, size_t size): * cdef uint32_t stamp = p.get_stamp() # <<<<<<<<<<<<<< @@ -11093,31 +11114,31 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, */ __pyx_v_stamp = __pyx_v_p->get_stamp(); - /* "larch/pickle/pickle.pyx":833 + /* "larch/pickle/pickle.pyx":835 * cdef object load_object(Unpacker *p, uint8_t code, size_t size): * cdef uint32_t stamp = p.get_stamp() * constructor = p.load_object() # <<<<<<<<<<<<<< * constructor_args = p.load_object() * try: */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 833, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 835, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_constructor = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":834 + /* "larch/pickle/pickle.pyx":836 * cdef uint32_t stamp = p.get_stamp() * constructor = p.load_object() * constructor_args = p.load_object() # <<<<<<<<<<<<<< * try: * obj = constructor(*constructor_args) */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 834, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 836, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_constructor_args = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":835 + /* "larch/pickle/pickle.pyx":837 * constructor = p.load_object() * constructor_args = p.load_object() * try: # <<<<<<<<<<<<<< @@ -11133,22 +11154,22 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, __Pyx_XGOTREF(__pyx_t_4); /*try:*/ { - /* "larch/pickle/pickle.pyx":836 + /* "larch/pickle/pickle.pyx":838 * constructor_args = p.load_object() * try: * obj = constructor(*constructor_args) # <<<<<<<<<<<<<< * except Exception as e: * raise UnpicklingError(e, constructor, constructor_args) */ - __pyx_t_1 = __Pyx_PySequence_Tuple(__pyx_v_constructor_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 836, __pyx_L3_error) + __pyx_t_1 = __Pyx_PySequence_Tuple(__pyx_v_constructor_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 838, __pyx_L3_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_v_constructor, __pyx_t_1, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 836, __pyx_L3_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_v_constructor, __pyx_t_1, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 838, __pyx_L3_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_obj = __pyx_t_5; __pyx_t_5 = 0; - /* "larch/pickle/pickle.pyx":835 + /* "larch/pickle/pickle.pyx":837 * constructor = p.load_object() * constructor_args = p.load_object() * try: # <<<<<<<<<<<<<< @@ -11164,7 +11185,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "larch/pickle/pickle.pyx":837 + /* "larch/pickle/pickle.pyx":839 * try: * obj = constructor(*constructor_args) * except Exception as e: # <<<<<<<<<<<<<< @@ -11174,7 +11195,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, __pyx_t_6 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); if (__pyx_t_6) { __Pyx_AddTraceback("larch.pickle.pickle.load_object", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_1, &__pyx_t_7) < 0) __PYX_ERR(0, 837, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_1, &__pyx_t_7) < 0) __PYX_ERR(0, 839, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_5); __Pyx_XGOTREF(__pyx_t_1); __Pyx_XGOTREF(__pyx_t_7); @@ -11182,17 +11203,17 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, __pyx_v_e = __pyx_t_1; /*try:*/ { - /* "larch/pickle/pickle.pyx":838 + /* "larch/pickle/pickle.pyx":840 * obj = constructor(*constructor_args) * except Exception as e: * raise UnpicklingError(e, constructor, constructor_args) # <<<<<<<<<<<<<< * p.stamp(stamp, obj) * return _load_object(p, obj) */ - __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 838, __pyx_L14_error) + __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 840, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_10 = NULL; - __pyx_t_6 = 0; + __pyx_t_11 = 0; #if CYTHON_UNPACK_METHODS if (unlikely(PyMethod_Check(__pyx_t_9))) { __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_9); @@ -11201,24 +11222,24 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, __Pyx_INCREF(__pyx_t_10); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_9, function); - __pyx_t_6 = 1; + __pyx_t_11 = 1; } } #endif { PyObject *__pyx_callargs[4] = {__pyx_t_10, __pyx_v_e, __pyx_v_constructor, __pyx_v_constructor_args}; - __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_9, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6); + __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_9, __pyx_callargs+1-__pyx_t_11, 3+__pyx_t_11); __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 838, __pyx_L14_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 840, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } __Pyx_Raise(__pyx_t_8, 0, 0, 0); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __PYX_ERR(0, 838, __pyx_L14_error) + __PYX_ERR(0, 840, __pyx_L14_error) } - /* "larch/pickle/pickle.pyx":837 + /* "larch/pickle/pickle.pyx":839 * try: * obj = constructor(*constructor_args) * except Exception as e: # <<<<<<<<<<<<<< @@ -11230,41 +11251,41 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, /*exception exit:*/{ __Pyx_PyThreadState_declare __Pyx_PyThreadState_assign - __pyx_t_13 = 0; __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; + __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_16, &__pyx_t_17, &__pyx_t_18); - if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_13, &__pyx_t_14, &__pyx_t_15) < 0)) __Pyx_ErrFetch(&__pyx_t_13, &__pyx_t_14, &__pyx_t_15); - __Pyx_XGOTREF(__pyx_t_13); + if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_17, &__pyx_t_18, &__pyx_t_19); + if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16) < 0)) __Pyx_ErrFetch(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16); __Pyx_XGOTREF(__pyx_t_14); __Pyx_XGOTREF(__pyx_t_15); __Pyx_XGOTREF(__pyx_t_16); __Pyx_XGOTREF(__pyx_t_17); __Pyx_XGOTREF(__pyx_t_18); - __pyx_t_6 = __pyx_lineno; __pyx_t_11 = __pyx_clineno; __pyx_t_12 = __pyx_filename; + __Pyx_XGOTREF(__pyx_t_19); + __pyx_t_6 = __pyx_lineno; __pyx_t_12 = __pyx_clineno; __pyx_t_13 = __pyx_filename; { __Pyx_DECREF(__pyx_v_e); __pyx_v_e = 0; } if (PY_MAJOR_VERSION >= 3) { - __Pyx_XGIVEREF(__pyx_t_16); __Pyx_XGIVEREF(__pyx_t_17); __Pyx_XGIVEREF(__pyx_t_18); - __Pyx_ExceptionReset(__pyx_t_16, __pyx_t_17, __pyx_t_18); + __Pyx_XGIVEREF(__pyx_t_19); + __Pyx_ExceptionReset(__pyx_t_17, __pyx_t_18, __pyx_t_19); } - __Pyx_XGIVEREF(__pyx_t_13); __Pyx_XGIVEREF(__pyx_t_14); __Pyx_XGIVEREF(__pyx_t_15); - __Pyx_ErrRestore(__pyx_t_13, __pyx_t_14, __pyx_t_15); - __pyx_t_13 = 0; __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; - __pyx_lineno = __pyx_t_6; __pyx_clineno = __pyx_t_11; __pyx_filename = __pyx_t_12; + __Pyx_XGIVEREF(__pyx_t_16); + __Pyx_ErrRestore(__pyx_t_14, __pyx_t_15, __pyx_t_16); + __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; + __pyx_lineno = __pyx_t_6; __pyx_clineno = __pyx_t_12; __pyx_filename = __pyx_t_13; goto __pyx_L5_except_error; } } } goto __pyx_L5_except_error; - /* "larch/pickle/pickle.pyx":835 + /* "larch/pickle/pickle.pyx":837 * constructor = p.load_object() * constructor_args = p.load_object() * try: # <<<<<<<<<<<<<< @@ -11280,7 +11301,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, __pyx_L8_try_end:; } - /* "larch/pickle/pickle.pyx":839 + /* "larch/pickle/pickle.pyx":841 * except Exception as e: * raise UnpicklingError(e, constructor, constructor_args) * p.stamp(stamp, obj) # <<<<<<<<<<<<<< @@ -11289,7 +11310,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, */ __pyx_v_p->stamp(__pyx_v_stamp, __pyx_v_obj); - /* "larch/pickle/pickle.pyx":840 + /* "larch/pickle/pickle.pyx":842 * raise UnpicklingError(e, constructor, constructor_args) * p.stamp(stamp, obj) * return _load_object(p, obj) # <<<<<<<<<<<<<< @@ -11297,13 +11318,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_7 = __pyx_f_5larch_6pickle_6pickle__load_object(__pyx_v_p, __pyx_v_obj); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 840, __pyx_L1_error) + __pyx_t_7 = __pyx_f_5larch_6pickle_6pickle__load_object(__pyx_v_p, __pyx_v_obj); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 842, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_r = __pyx_t_7; __pyx_t_7 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":831 + /* "larch/pickle/pickle.pyx":833 * * * cdef object load_object(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -11331,7 +11352,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object(Unpacker *__pyx_v_p, return __pyx_r; } -/* "larch/pickle/pickle.pyx":843 +/* "larch/pickle/pickle.pyx":845 * * * cdef object load_object_new(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -11357,20 +11378,21 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ PyObject *__pyx_t_8 = NULL; PyObject *__pyx_t_9 = NULL; PyObject *__pyx_t_10 = NULL; - int __pyx_t_11; - char const *__pyx_t_12; - PyObject *__pyx_t_13 = NULL; + unsigned int __pyx_t_11; + int __pyx_t_12; + char const *__pyx_t_13; PyObject *__pyx_t_14 = NULL; PyObject *__pyx_t_15 = NULL; PyObject *__pyx_t_16 = NULL; PyObject *__pyx_t_17 = NULL; PyObject *__pyx_t_18 = NULL; + PyObject *__pyx_t_19 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_object_new", 1); - /* "larch/pickle/pickle.pyx":845 + /* "larch/pickle/pickle.pyx":847 * cdef object load_object_new(Unpacker *p, uint8_t code, size_t size): * cdef: * uint32_t stamp = p.get_stamp() # <<<<<<<<<<<<<< @@ -11379,20 +11401,20 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ */ __pyx_v_stamp = __pyx_v_p->get_stamp(); - /* "larch/pickle/pickle.pyx":848 + /* "larch/pickle/pickle.pyx":850 * tuple cls_args * * cls_args = p.load_object() # <<<<<<<<<<<<<< * cls = cls_args[0] * try: */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 848, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 850, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (!(likely(PyTuple_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_t_1))) __PYX_ERR(0, 848, __pyx_L1_error) + if (!(likely(PyTuple_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_t_1))) __PYX_ERR(0, 850, __pyx_L1_error) __pyx_v_cls_args = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":849 + /* "larch/pickle/pickle.pyx":851 * * cls_args = p.load_object() * cls = cls_args[0] # <<<<<<<<<<<<<< @@ -11401,14 +11423,14 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ */ if (unlikely(__pyx_v_cls_args == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable"); - __PYX_ERR(0, 849, __pyx_L1_error) + __PYX_ERR(0, 851, __pyx_L1_error) } __pyx_t_1 = PyTuple_GET_ITEM(__pyx_v_cls_args, 0); __Pyx_INCREF(__pyx_t_1); __pyx_v_cls = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":850 + /* "larch/pickle/pickle.pyx":852 * cls_args = p.load_object() * cls = cls_args[0] * try: # <<<<<<<<<<<<<< @@ -11424,7 +11446,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ __Pyx_XGOTREF(__pyx_t_4); /*try:*/ { - /* "larch/pickle/pickle.pyx":851 + /* "larch/pickle/pickle.pyx":853 * cls = cls_args[0] * try: * obj = GET_NEW(cls)(cls, cls_args[1:], NULL) # <<<<<<<<<<<<<< @@ -11433,17 +11455,17 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ */ if (unlikely(__pyx_v_cls_args == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable"); - __PYX_ERR(0, 851, __pyx_L3_error) + __PYX_ERR(0, 853, __pyx_L3_error) } - __pyx_t_1 = __Pyx_PyTuple_GetSlice(__pyx_v_cls_args, 1, PY_SSIZE_T_MAX); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 851, __pyx_L3_error) + __pyx_t_1 = __Pyx_PyTuple_GetSlice(__pyx_v_cls_args, 1, PY_SSIZE_T_MAX); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 853, __pyx_L3_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = GET_NEW(__pyx_v_cls)(((PyTypeObject *)__pyx_v_cls), __pyx_t_1, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 851, __pyx_L3_error) + __pyx_t_5 = GET_NEW(__pyx_v_cls)(((PyTypeObject *)__pyx_v_cls), __pyx_t_1, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 853, __pyx_L3_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_obj = __pyx_t_5; __pyx_t_5 = 0; - /* "larch/pickle/pickle.pyx":850 + /* "larch/pickle/pickle.pyx":852 * cls_args = p.load_object() * cls = cls_args[0] * try: # <<<<<<<<<<<<<< @@ -11459,7 +11481,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "larch/pickle/pickle.pyx":852 + /* "larch/pickle/pickle.pyx":854 * try: * obj = GET_NEW(cls)(cls, cls_args[1:], NULL) * except Exception as e: # <<<<<<<<<<<<<< @@ -11469,7 +11491,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ __pyx_t_6 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); if (__pyx_t_6) { __Pyx_AddTraceback("larch.pickle.pickle.load_object_new", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_1, &__pyx_t_7) < 0) __PYX_ERR(0, 852, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_1, &__pyx_t_7) < 0) __PYX_ERR(0, 854, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_5); __Pyx_XGOTREF(__pyx_t_1); __Pyx_XGOTREF(__pyx_t_7); @@ -11477,17 +11499,17 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ __pyx_v_e = __pyx_t_1; /*try:*/ { - /* "larch/pickle/pickle.pyx":853 + /* "larch/pickle/pickle.pyx":855 * obj = GET_NEW(cls)(cls, cls_args[1:], NULL) * except Exception as e: * raise UnpicklingError(e, cls, cls_args) # <<<<<<<<<<<<<< * * p.stamp(stamp, obj) */ - __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 853, __pyx_L14_error) + __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 855, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_10 = NULL; - __pyx_t_6 = 0; + __pyx_t_11 = 0; #if CYTHON_UNPACK_METHODS if (unlikely(PyMethod_Check(__pyx_t_9))) { __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_9); @@ -11496,24 +11518,24 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ __Pyx_INCREF(__pyx_t_10); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_9, function); - __pyx_t_6 = 1; + __pyx_t_11 = 1; } } #endif { PyObject *__pyx_callargs[4] = {__pyx_t_10, __pyx_v_e, __pyx_v_cls, __pyx_v_cls_args}; - __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_9, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6); + __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_9, __pyx_callargs+1-__pyx_t_11, 3+__pyx_t_11); __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 853, __pyx_L14_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 855, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } __Pyx_Raise(__pyx_t_8, 0, 0, 0); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __PYX_ERR(0, 853, __pyx_L14_error) + __PYX_ERR(0, 855, __pyx_L14_error) } - /* "larch/pickle/pickle.pyx":852 + /* "larch/pickle/pickle.pyx":854 * try: * obj = GET_NEW(cls)(cls, cls_args[1:], NULL) * except Exception as e: # <<<<<<<<<<<<<< @@ -11525,41 +11547,41 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ /*exception exit:*/{ __Pyx_PyThreadState_declare __Pyx_PyThreadState_assign - __pyx_t_13 = 0; __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; + __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_16, &__pyx_t_17, &__pyx_t_18); - if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_13, &__pyx_t_14, &__pyx_t_15) < 0)) __Pyx_ErrFetch(&__pyx_t_13, &__pyx_t_14, &__pyx_t_15); - __Pyx_XGOTREF(__pyx_t_13); + if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_17, &__pyx_t_18, &__pyx_t_19); + if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16) < 0)) __Pyx_ErrFetch(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16); __Pyx_XGOTREF(__pyx_t_14); __Pyx_XGOTREF(__pyx_t_15); __Pyx_XGOTREF(__pyx_t_16); __Pyx_XGOTREF(__pyx_t_17); __Pyx_XGOTREF(__pyx_t_18); - __pyx_t_6 = __pyx_lineno; __pyx_t_11 = __pyx_clineno; __pyx_t_12 = __pyx_filename; + __Pyx_XGOTREF(__pyx_t_19); + __pyx_t_6 = __pyx_lineno; __pyx_t_12 = __pyx_clineno; __pyx_t_13 = __pyx_filename; { __Pyx_DECREF(__pyx_v_e); __pyx_v_e = 0; } if (PY_MAJOR_VERSION >= 3) { - __Pyx_XGIVEREF(__pyx_t_16); __Pyx_XGIVEREF(__pyx_t_17); __Pyx_XGIVEREF(__pyx_t_18); - __Pyx_ExceptionReset(__pyx_t_16, __pyx_t_17, __pyx_t_18); + __Pyx_XGIVEREF(__pyx_t_19); + __Pyx_ExceptionReset(__pyx_t_17, __pyx_t_18, __pyx_t_19); } - __Pyx_XGIVEREF(__pyx_t_13); __Pyx_XGIVEREF(__pyx_t_14); __Pyx_XGIVEREF(__pyx_t_15); - __Pyx_ErrRestore(__pyx_t_13, __pyx_t_14, __pyx_t_15); - __pyx_t_13 = 0; __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; - __pyx_lineno = __pyx_t_6; __pyx_clineno = __pyx_t_11; __pyx_filename = __pyx_t_12; + __Pyx_XGIVEREF(__pyx_t_16); + __Pyx_ErrRestore(__pyx_t_14, __pyx_t_15, __pyx_t_16); + __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; + __pyx_lineno = __pyx_t_6; __pyx_clineno = __pyx_t_12; __pyx_filename = __pyx_t_13; goto __pyx_L5_except_error; } } } goto __pyx_L5_except_error; - /* "larch/pickle/pickle.pyx":850 + /* "larch/pickle/pickle.pyx":852 * cls_args = p.load_object() * cls = cls_args[0] * try: # <<<<<<<<<<<<<< @@ -11575,7 +11597,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ __pyx_L8_try_end:; } - /* "larch/pickle/pickle.pyx":855 + /* "larch/pickle/pickle.pyx":857 * raise UnpicklingError(e, cls, cls_args) * * p.stamp(stamp, obj) # <<<<<<<<<<<<<< @@ -11584,7 +11606,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ */ __pyx_v_p->stamp(__pyx_v_stamp, __pyx_v_obj); - /* "larch/pickle/pickle.pyx":856 + /* "larch/pickle/pickle.pyx":858 * * p.stamp(stamp, obj) * return _load_object(p, obj) # <<<<<<<<<<<<<< @@ -11592,13 +11614,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_7 = __pyx_f_5larch_6pickle_6pickle__load_object(__pyx_v_p, __pyx_v_obj); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 856, __pyx_L1_error) + __pyx_t_7 = __pyx_f_5larch_6pickle_6pickle__load_object(__pyx_v_p, __pyx_v_obj); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 858, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_r = __pyx_t_7; __pyx_t_7 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":843 + /* "larch/pickle/pickle.pyx":845 * * * cdef object load_object_new(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -11626,7 +11648,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_new(Unpacker *__pyx_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":859 +/* "larch/pickle/pickle.pyx":861 * * * cdef object load_object_fast(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -11653,21 +11675,22 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx PyObject *__pyx_t_8 = NULL; PyObject *__pyx_t_9 = NULL; PyObject *__pyx_t_10 = NULL; - int __pyx_t_11; - char const *__pyx_t_12; - PyObject *__pyx_t_13 = NULL; + unsigned int __pyx_t_11; + int __pyx_t_12; + char const *__pyx_t_13; PyObject *__pyx_t_14 = NULL; PyObject *__pyx_t_15 = NULL; PyObject *__pyx_t_16 = NULL; PyObject *__pyx_t_17 = NULL; PyObject *__pyx_t_18 = NULL; - int __pyx_t_19; + PyObject *__pyx_t_19 = NULL; + int __pyx_t_20; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_object_fast", 1); - /* "larch/pickle/pickle.pyx":861 + /* "larch/pickle/pickle.pyx":863 * cdef object load_object_fast(Unpacker *p, uint8_t code, size_t size): * cdef: * uint32_t stamp = p.get_stamp() # <<<<<<<<<<<<<< @@ -11676,20 +11699,20 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx */ __pyx_v_stamp = __pyx_v_p->get_stamp(); - /* "larch/pickle/pickle.pyx":864 + /* "larch/pickle/pickle.pyx":866 * tuple cls_args * * cls_args = p.load_object() # <<<<<<<<<<<<<< * cls = cls_args[0] * try: */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 864, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 866, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (!(likely(PyTuple_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_t_1))) __PYX_ERR(0, 864, __pyx_L1_error) + if (!(likely(PyTuple_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None) || __Pyx_RaiseUnexpectedTypeError("tuple", __pyx_t_1))) __PYX_ERR(0, 866, __pyx_L1_error) __pyx_v_cls_args = ((PyObject*)__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":865 + /* "larch/pickle/pickle.pyx":867 * * cls_args = p.load_object() * cls = cls_args[0] # <<<<<<<<<<<<<< @@ -11698,14 +11721,14 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx */ if (unlikely(__pyx_v_cls_args == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable"); - __PYX_ERR(0, 865, __pyx_L1_error) + __PYX_ERR(0, 867, __pyx_L1_error) } __pyx_t_1 = PyTuple_GET_ITEM(__pyx_v_cls_args, 0); __Pyx_INCREF(__pyx_t_1); __pyx_v_cls = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":866 + /* "larch/pickle/pickle.pyx":868 * cls_args = p.load_object() * cls = cls_args[0] * try: # <<<<<<<<<<<<<< @@ -11721,7 +11744,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx __Pyx_XGOTREF(__pyx_t_4); /*try:*/ { - /* "larch/pickle/pickle.pyx":867 + /* "larch/pickle/pickle.pyx":869 * cls = cls_args[0] * try: * obj = GET_NEW(cls)(cls, cls_args[1:], NULL) # <<<<<<<<<<<<<< @@ -11730,17 +11753,17 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx */ if (unlikely(__pyx_v_cls_args == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable"); - __PYX_ERR(0, 867, __pyx_L3_error) + __PYX_ERR(0, 869, __pyx_L3_error) } - __pyx_t_1 = __Pyx_PyTuple_GetSlice(__pyx_v_cls_args, 1, PY_SSIZE_T_MAX); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 867, __pyx_L3_error) + __pyx_t_1 = __Pyx_PyTuple_GetSlice(__pyx_v_cls_args, 1, PY_SSIZE_T_MAX); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 869, __pyx_L3_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = GET_NEW(__pyx_v_cls)(((PyTypeObject *)__pyx_v_cls), __pyx_t_1, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 867, __pyx_L3_error) + __pyx_t_5 = GET_NEW(__pyx_v_cls)(((PyTypeObject *)__pyx_v_cls), __pyx_t_1, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 869, __pyx_L3_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_obj = __pyx_t_5; __pyx_t_5 = 0; - /* "larch/pickle/pickle.pyx":866 + /* "larch/pickle/pickle.pyx":868 * cls_args = p.load_object() * cls = cls_args[0] * try: # <<<<<<<<<<<<<< @@ -11756,7 +11779,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "larch/pickle/pickle.pyx":868 + /* "larch/pickle/pickle.pyx":870 * try: * obj = GET_NEW(cls)(cls, cls_args[1:], NULL) * except Exception as e: # <<<<<<<<<<<<<< @@ -11766,7 +11789,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx __pyx_t_6 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0]))); if (__pyx_t_6) { __Pyx_AddTraceback("larch.pickle.pickle.load_object_fast", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_1, &__pyx_t_7) < 0) __PYX_ERR(0, 868, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_1, &__pyx_t_7) < 0) __PYX_ERR(0, 870, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_5); __Pyx_XGOTREF(__pyx_t_1); __Pyx_XGOTREF(__pyx_t_7); @@ -11774,17 +11797,17 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx __pyx_v_e = __pyx_t_1; /*try:*/ { - /* "larch/pickle/pickle.pyx":869 + /* "larch/pickle/pickle.pyx":871 * obj = GET_NEW(cls)(cls, cls_args[1:], NULL) * except Exception as e: * raise UnpicklingError(e, cls, cls_args) # <<<<<<<<<<<<<< * * p.stamp(stamp, obj) */ - __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 869, __pyx_L14_error) + __Pyx_GetModuleGlobalName(__pyx_t_9, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 871, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_9); __pyx_t_10 = NULL; - __pyx_t_6 = 0; + __pyx_t_11 = 0; #if CYTHON_UNPACK_METHODS if (unlikely(PyMethod_Check(__pyx_t_9))) { __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_9); @@ -11793,24 +11816,24 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx __Pyx_INCREF(__pyx_t_10); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_9, function); - __pyx_t_6 = 1; + __pyx_t_11 = 1; } } #endif { PyObject *__pyx_callargs[4] = {__pyx_t_10, __pyx_v_e, __pyx_v_cls, __pyx_v_cls_args}; - __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_9, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6); + __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_9, __pyx_callargs+1-__pyx_t_11, 3+__pyx_t_11); __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 869, __pyx_L14_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 871, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; } __Pyx_Raise(__pyx_t_8, 0, 0, 0); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __PYX_ERR(0, 869, __pyx_L14_error) + __PYX_ERR(0, 871, __pyx_L14_error) } - /* "larch/pickle/pickle.pyx":868 + /* "larch/pickle/pickle.pyx":870 * try: * obj = GET_NEW(cls)(cls, cls_args[1:], NULL) * except Exception as e: # <<<<<<<<<<<<<< @@ -11822,41 +11845,41 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx /*exception exit:*/{ __Pyx_PyThreadState_declare __Pyx_PyThreadState_assign - __pyx_t_13 = 0; __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; + __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_16, &__pyx_t_17, &__pyx_t_18); - if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_13, &__pyx_t_14, &__pyx_t_15) < 0)) __Pyx_ErrFetch(&__pyx_t_13, &__pyx_t_14, &__pyx_t_15); - __Pyx_XGOTREF(__pyx_t_13); + if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_17, &__pyx_t_18, &__pyx_t_19); + if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16) < 0)) __Pyx_ErrFetch(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16); __Pyx_XGOTREF(__pyx_t_14); __Pyx_XGOTREF(__pyx_t_15); __Pyx_XGOTREF(__pyx_t_16); __Pyx_XGOTREF(__pyx_t_17); __Pyx_XGOTREF(__pyx_t_18); - __pyx_t_6 = __pyx_lineno; __pyx_t_11 = __pyx_clineno; __pyx_t_12 = __pyx_filename; + __Pyx_XGOTREF(__pyx_t_19); + __pyx_t_6 = __pyx_lineno; __pyx_t_12 = __pyx_clineno; __pyx_t_13 = __pyx_filename; { __Pyx_DECREF(__pyx_v_e); __pyx_v_e = 0; } if (PY_MAJOR_VERSION >= 3) { - __Pyx_XGIVEREF(__pyx_t_16); __Pyx_XGIVEREF(__pyx_t_17); __Pyx_XGIVEREF(__pyx_t_18); - __Pyx_ExceptionReset(__pyx_t_16, __pyx_t_17, __pyx_t_18); + __Pyx_XGIVEREF(__pyx_t_19); + __Pyx_ExceptionReset(__pyx_t_17, __pyx_t_18, __pyx_t_19); } - __Pyx_XGIVEREF(__pyx_t_13); __Pyx_XGIVEREF(__pyx_t_14); __Pyx_XGIVEREF(__pyx_t_15); - __Pyx_ErrRestore(__pyx_t_13, __pyx_t_14, __pyx_t_15); - __pyx_t_13 = 0; __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; - __pyx_lineno = __pyx_t_6; __pyx_clineno = __pyx_t_11; __pyx_filename = __pyx_t_12; + __Pyx_XGIVEREF(__pyx_t_16); + __Pyx_ErrRestore(__pyx_t_14, __pyx_t_15, __pyx_t_16); + __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; + __pyx_lineno = __pyx_t_6; __pyx_clineno = __pyx_t_12; __pyx_filename = __pyx_t_13; goto __pyx_L5_except_error; } } } goto __pyx_L5_except_error; - /* "larch/pickle/pickle.pyx":866 + /* "larch/pickle/pickle.pyx":868 * cls_args = p.load_object() * cls = cls_args[0] * try: # <<<<<<<<<<<<<< @@ -11872,7 +11895,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx __pyx_L8_try_end:; } - /* "larch/pickle/pickle.pyx":871 + /* "larch/pickle/pickle.pyx":873 * raise UnpicklingError(e, cls, cls_args) * * p.stamp(stamp, obj) # <<<<<<<<<<<<<< @@ -11881,67 +11904,67 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx */ __pyx_v_p->stamp(__pyx_v_stamp, __pyx_v_obj); - /* "larch/pickle/pickle.pyx":872 + /* "larch/pickle/pickle.pyx":874 * * p.stamp(stamp, obj) * if size >= 3: # <<<<<<<<<<<<<< * state = p.load_object() * if size >= 4: */ - __pyx_t_19 = (__pyx_v_size >= 3); - if (__pyx_t_19) { + __pyx_t_20 = (__pyx_v_size >= 3); + if (__pyx_t_20) { - /* "larch/pickle/pickle.pyx":873 + /* "larch/pickle/pickle.pyx":875 * p.stamp(stamp, obj) * if size >= 3: * state = p.load_object() # <<<<<<<<<<<<<< * if size >= 4: * _load_state_sequence(p, obj) */ - __pyx_t_7 = __pyx_v_p->load(); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 873, __pyx_L1_error) + __pyx_t_7 = __pyx_v_p->load(); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 875, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_v_state = __pyx_t_7; __pyx_t_7 = 0; - /* "larch/pickle/pickle.pyx":874 + /* "larch/pickle/pickle.pyx":876 * if size >= 3: * state = p.load_object() * if size >= 4: # <<<<<<<<<<<<<< * _load_state_sequence(p, obj) * if size >= 5: */ - __pyx_t_19 = (__pyx_v_size >= 4); - if (__pyx_t_19) { + __pyx_t_20 = (__pyx_v_size >= 4); + if (__pyx_t_20) { - /* "larch/pickle/pickle.pyx":875 + /* "larch/pickle/pickle.pyx":877 * state = p.load_object() * if size >= 4: * _load_state_sequence(p, obj) # <<<<<<<<<<<<<< * if size >= 5: * _load_state_dict(p, obj) */ - __pyx_t_11 = __pyx_f_5larch_6pickle_6pickle__load_state_sequence(__pyx_v_p, __pyx_v_obj); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 875, __pyx_L1_error) + __pyx_t_12 = __pyx_f_5larch_6pickle_6pickle__load_state_sequence(__pyx_v_p, __pyx_v_obj); if (unlikely(__pyx_t_12 == ((int)-1))) __PYX_ERR(0, 877, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":876 + /* "larch/pickle/pickle.pyx":878 * if size >= 4: * _load_state_sequence(p, obj) * if size >= 5: # <<<<<<<<<<<<<< * _load_state_dict(p, obj) * _load_state(obj, state) */ - __pyx_t_19 = (__pyx_v_size >= 5); - if (__pyx_t_19) { + __pyx_t_20 = (__pyx_v_size >= 5); + if (__pyx_t_20) { - /* "larch/pickle/pickle.pyx":877 + /* "larch/pickle/pickle.pyx":879 * _load_state_sequence(p, obj) * if size >= 5: * _load_state_dict(p, obj) # <<<<<<<<<<<<<< * _load_state(obj, state) * return obj */ - __pyx_t_11 = __pyx_f_5larch_6pickle_6pickle__load_state_dict(__pyx_v_p, __pyx_v_obj); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 877, __pyx_L1_error) + __pyx_t_12 = __pyx_f_5larch_6pickle_6pickle__load_state_dict(__pyx_v_p, __pyx_v_obj); if (unlikely(__pyx_t_12 == ((int)-1))) __PYX_ERR(0, 879, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":876 + /* "larch/pickle/pickle.pyx":878 * if size >= 4: * _load_state_sequence(p, obj) * if size >= 5: # <<<<<<<<<<<<<< @@ -11950,7 +11973,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx */ } - /* "larch/pickle/pickle.pyx":874 + /* "larch/pickle/pickle.pyx":876 * if size >= 3: * state = p.load_object() * if size >= 4: # <<<<<<<<<<<<<< @@ -11959,16 +11982,16 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx */ } - /* "larch/pickle/pickle.pyx":878 + /* "larch/pickle/pickle.pyx":880 * if size >= 5: * _load_state_dict(p, obj) * _load_state(obj, state) # <<<<<<<<<<<<<< * return obj * */ - __pyx_t_11 = __pyx_f_5larch_6pickle_6pickle__load_state(__pyx_v_obj, __pyx_v_state); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 878, __pyx_L1_error) + __pyx_t_12 = __pyx_f_5larch_6pickle_6pickle__load_state(__pyx_v_obj, __pyx_v_state); if (unlikely(__pyx_t_12 == ((int)-1))) __PYX_ERR(0, 880, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":872 + /* "larch/pickle/pickle.pyx":874 * * p.stamp(stamp, obj) * if size >= 3: # <<<<<<<<<<<<<< @@ -11977,7 +12000,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx */ } - /* "larch/pickle/pickle.pyx":879 + /* "larch/pickle/pickle.pyx":881 * _load_state_dict(p, obj) * _load_state(obj, state) * return obj # <<<<<<<<<<<<<< @@ -11989,7 +12012,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx __pyx_r = __pyx_v_obj; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":859 + /* "larch/pickle/pickle.pyx":861 * * * cdef object load_object_fast(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12018,7 +12041,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_object_fast(Unpacker *__pyx return __pyx_r; } -/* "larch/pickle/pickle.pyx":882 +/* "larch/pickle/pickle.pyx":884 * * * cdef object load_singleton(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12037,7 +12060,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_singleton(Unpacker *__pyx_v int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_singleton", 1); - /* "larch/pickle/pickle.pyx":883 + /* "larch/pickle/pickle.pyx":885 * * cdef object load_singleton(Unpacker *p, uint8_t code, size_t size): * cdef uint32_t stamp = p.get_stamp() # <<<<<<<<<<<<<< @@ -12046,19 +12069,19 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_singleton(Unpacker *__pyx_v */ __pyx_v_stamp = __pyx_v_p->get_stamp(); - /* "larch/pickle/pickle.pyx":884 + /* "larch/pickle/pickle.pyx":886 * cdef object load_singleton(Unpacker *p, uint8_t code, size_t size): * cdef uint32_t stamp = p.get_stamp() * obj = (p.unpickler).unpack_import(size) # <<<<<<<<<<<<<< * p.stamp(stamp, obj) * return obj */ - __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->unpack_import(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 884, __pyx_L1_error) + __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->unpack_import(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 886, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_obj = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":885 + /* "larch/pickle/pickle.pyx":887 * cdef uint32_t stamp = p.get_stamp() * obj = (p.unpickler).unpack_import(size) * p.stamp(stamp, obj) # <<<<<<<<<<<<<< @@ -12067,7 +12090,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_singleton(Unpacker *__pyx_v */ __pyx_v_p->stamp(__pyx_v_stamp, __pyx_v_obj); - /* "larch/pickle/pickle.pyx":886 + /* "larch/pickle/pickle.pyx":888 * obj = (p.unpickler).unpack_import(size) * p.stamp(stamp, obj) * return obj # <<<<<<<<<<<<<< @@ -12079,7 +12102,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_singleton(Unpacker *__pyx_v __pyx_r = __pyx_v_obj; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":882 + /* "larch/pickle/pickle.pyx":884 * * * cdef object load_singleton(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12099,7 +12122,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_singleton(Unpacker *__pyx_v return __pyx_r; } -/* "larch/pickle/pickle.pyx":889 +/* "larch/pickle/pickle.pyx":891 * * * cdef object load_oldstyle(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12115,14 +12138,14 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_oldstyle(Unpacker *__pyx_v_ PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + unsigned int __pyx_t_4; PyObject *__pyx_t_5 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_oldstyle", 1); - /* "larch/pickle/pickle.pyx":890 + /* "larch/pickle/pickle.pyx":892 * * cdef object load_oldstyle(Unpacker *p, uint8_t code, size_t size): * cdef uint32_t stamp = p.get_stamp() # <<<<<<<<<<<<<< @@ -12131,14 +12154,14 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_oldstyle(Unpacker *__pyx_v_ */ __pyx_v_stamp = __pyx_v_p->get_stamp(); - /* "larch/pickle/pickle.pyx":891 + /* "larch/pickle/pickle.pyx":893 * cdef object load_oldstyle(Unpacker *p, uint8_t code, size_t size): * cdef uint32_t stamp = p.get_stamp() * obj = (p.unpickler).unpack_import(size)() # <<<<<<<<<<<<<< * p.stamp(stamp, obj) * obj.__dict__.update(p.load_object()) */ - __pyx_t_2 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->unpack_import(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_size); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 891, __pyx_L1_error) + __pyx_t_2 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->unpack_import(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_size); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 893, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -12158,14 +12181,14 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_oldstyle(Unpacker *__pyx_v_ PyObject *__pyx_callargs[2] = {__pyx_t_3, NULL}; __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 0+__pyx_t_4); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 891, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 893, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } __pyx_v_obj = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":892 + /* "larch/pickle/pickle.pyx":894 * cdef uint32_t stamp = p.get_stamp() * obj = (p.unpickler).unpack_import(size)() * p.stamp(stamp, obj) # <<<<<<<<<<<<<< @@ -12174,19 +12197,19 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_oldstyle(Unpacker *__pyx_v_ */ __pyx_v_p->stamp(__pyx_v_stamp, __pyx_v_obj); - /* "larch/pickle/pickle.pyx":893 + /* "larch/pickle/pickle.pyx":895 * obj = (p.unpickler).unpack_import(size)() * p.stamp(stamp, obj) * obj.__dict__.update(p.load_object()) # <<<<<<<<<<<<<< * return obj * */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_obj, __pyx_n_s_dict); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 893, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_obj, __pyx_n_s_dict); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 895, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_update); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 893, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_update); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 895, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __pyx_v_p->load(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 893, __pyx_L1_error) + __pyx_t_2 = __pyx_v_p->load(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 895, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_5 = NULL; __pyx_t_4 = 0; @@ -12207,13 +12230,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_oldstyle(Unpacker *__pyx_v_ __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 893, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 895, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":894 + /* "larch/pickle/pickle.pyx":896 * p.stamp(stamp, obj) * obj.__dict__.update(p.load_object()) * return obj # <<<<<<<<<<<<<< @@ -12225,7 +12248,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_oldstyle(Unpacker *__pyx_v_ __pyx_r = __pyx_v_obj; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":889 + /* "larch/pickle/pickle.pyx":891 * * * cdef object load_oldstyle(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12248,7 +12271,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_oldstyle(Unpacker *__pyx_v_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":897 +/* "larch/pickle/pickle.pyx":899 * * * cdef object load_initargs(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12269,7 +12292,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_initargs(Unpacker *__pyx_v_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_initargs", 1); - /* "larch/pickle/pickle.pyx":898 + /* "larch/pickle/pickle.pyx":900 * * cdef object load_initargs(Unpacker *p, uint8_t code, size_t size): * cdef uint32_t stamp = p.get_stamp() # <<<<<<<<<<<<<< @@ -12278,46 +12301,46 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_initargs(Unpacker *__pyx_v_ */ __pyx_v_stamp = __pyx_v_p->get_stamp(); - /* "larch/pickle/pickle.pyx":899 + /* "larch/pickle/pickle.pyx":901 * cdef object load_initargs(Unpacker *p, uint8_t code, size_t size): * cdef uint32_t stamp = p.get_stamp() * obj = (p.unpickler).unpack_import(size) # <<<<<<<<<<<<<< * init_args = p.load_object() * obj = obj(*init_args) */ - __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->unpack_import(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 899, __pyx_L1_error) + __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->unpack_import(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 901, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_obj = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":900 + /* "larch/pickle/pickle.pyx":902 * cdef uint32_t stamp = p.get_stamp() * obj = (p.unpickler).unpack_import(size) * init_args = p.load_object() # <<<<<<<<<<<<<< * obj = obj(*init_args) * p.stamp(stamp, obj) */ - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 900, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 902, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_init_args = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":901 + /* "larch/pickle/pickle.pyx":903 * obj = (p.unpickler).unpack_import(size) * init_args = p.load_object() * obj = obj(*init_args) # <<<<<<<<<<<<<< * p.stamp(stamp, obj) * return obj */ - __pyx_t_1 = __Pyx_PySequence_Tuple(__pyx_v_init_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 901, __pyx_L1_error) + __pyx_t_1 = __Pyx_PySequence_Tuple(__pyx_v_init_args); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 903, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_v_obj, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 901, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_v_obj, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 903, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF_SET(__pyx_v_obj, __pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":902 + /* "larch/pickle/pickle.pyx":904 * init_args = p.load_object() * obj = obj(*init_args) * p.stamp(stamp, obj) # <<<<<<<<<<<<<< @@ -12326,7 +12349,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_initargs(Unpacker *__pyx_v_ */ __pyx_v_p->stamp(__pyx_v_stamp, __pyx_v_obj); - /* "larch/pickle/pickle.pyx":903 + /* "larch/pickle/pickle.pyx":905 * obj = obj(*init_args) * p.stamp(stamp, obj) * return obj # <<<<<<<<<<<<<< @@ -12338,7 +12361,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_initargs(Unpacker *__pyx_v_ __pyx_r = __pyx_v_obj; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":897 + /* "larch/pickle/pickle.pyx":899 * * * cdef object load_initargs(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12360,7 +12383,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_initargs(Unpacker *__pyx_v_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":906 +/* "larch/pickle/pickle.pyx":908 * * * cdef object load_end_item(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12373,7 +12396,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_end_item(CYTHON_UNUSED Unpa __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("load_end_item", 1); - /* "larch/pickle/pickle.pyx":907 + /* "larch/pickle/pickle.pyx":909 * * cdef object load_end_item(Unpacker *p, uint8_t code, size_t size): * return _end_item # <<<<<<<<<<<<<< @@ -12385,7 +12408,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_end_item(CYTHON_UNUSED Unpa __pyx_r = __pyx_v_5larch_6pickle_6pickle__end_item; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":906 + /* "larch/pickle/pickle.pyx":908 * * * cdef object load_end_item(Unpacker *p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12400,7 +12423,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_end_item(CYTHON_UNUSED Unpa return __pyx_r; } -/* "larch/pickle/pickle.pyx":910 +/* "larch/pickle/pickle.pyx":912 * * * cdef object load_ref(Unpacker* p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12417,13 +12440,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_ref(Unpacker *__pyx_v_p, CY PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_ref", 1); - /* "larch/pickle/pickle.pyx":915 + /* "larch/pickle/pickle.pyx":917 * PyObject* obj * * p.read32(&ido) # <<<<<<<<<<<<<< @@ -12432,7 +12455,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_ref(Unpacker *__pyx_v_p, CY */ __pyx_v_p->read32((&__pyx_v_ido)); - /* "larch/pickle/pickle.pyx":916 + /* "larch/pickle/pickle.pyx":918 * * p.read32(&ido) * obj = p.get_stamped_ref(ido) # <<<<<<<<<<<<<< @@ -12441,7 +12464,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_ref(Unpacker *__pyx_v_p, CY */ __pyx_v_obj = __pyx_v_p->get_stamped_ref(__pyx_v_ido); - /* "larch/pickle/pickle.pyx":917 + /* "larch/pickle/pickle.pyx":919 * p.read32(&ido) * obj = p.get_stamped_ref(ido) * if obj is NULL: # <<<<<<<<<<<<<< @@ -12451,14 +12474,14 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_ref(Unpacker *__pyx_v_p, CY __pyx_t_1 = (__pyx_v_obj == NULL); if (unlikely(__pyx_t_1)) { - /* "larch/pickle/pickle.pyx":918 + /* "larch/pickle/pickle.pyx":920 * obj = p.get_stamped_ref(ido) * if obj is NULL: * raise UnpicklingError("Invalid reference") # <<<<<<<<<<<<<< * * return obj */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 918, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 920, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; __pyx_t_5 = 0; @@ -12478,15 +12501,15 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_ref(Unpacker *__pyx_v_p, CY PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_kp_u_Invalid_reference}; __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 918, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 920, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_Raise(__pyx_t_2, 0, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __PYX_ERR(0, 918, __pyx_L1_error) + __PYX_ERR(0, 920, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":917 + /* "larch/pickle/pickle.pyx":919 * p.read32(&ido) * obj = p.get_stamped_ref(ido) * if obj is NULL: # <<<<<<<<<<<<<< @@ -12495,7 +12518,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_ref(Unpacker *__pyx_v_p, CY */ } - /* "larch/pickle/pickle.pyx":920 + /* "larch/pickle/pickle.pyx":922 * raise UnpicklingError("Invalid reference") * * return obj # <<<<<<<<<<<<<< @@ -12507,7 +12530,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_ref(Unpacker *__pyx_v_p, CY __pyx_r = ((PyObject *)__pyx_v_obj); goto __pyx_L0; - /* "larch/pickle/pickle.pyx":910 + /* "larch/pickle/pickle.pyx":912 * * * cdef object load_ref(Unpacker* p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12528,7 +12551,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_ref(Unpacker *__pyx_v_p, CY return __pyx_r; } -/* "larch/pickle/pickle.pyx":923 +/* "larch/pickle/pickle.pyx":925 * * * cdef object load_global(Unpacker* p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12545,7 +12568,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_global(Unpacker *__pyx_v_p, int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_global", 1); - /* "larch/pickle/pickle.pyx":924 + /* "larch/pickle/pickle.pyx":926 * * cdef object load_global(Unpacker* p, uint8_t code, size_t size): * return (p.unpickler).unpack_import(size) # <<<<<<<<<<<<<< @@ -12553,13 +12576,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_global(Unpacker *__pyx_v_p, * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->unpack_import(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 924, __pyx_L1_error) + __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->unpack_import(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 926, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":923 + /* "larch/pickle/pickle.pyx":925 * * * cdef object load_global(Unpacker* p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12578,7 +12601,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_global(Unpacker *__pyx_v_p, return __pyx_r; } -/* "larch/pickle/pickle.pyx":927 +/* "larch/pickle/pickle.pyx":929 * * * cdef object load_global_object(Unpacker* p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12597,7 +12620,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_global_object(Unpacker *__p int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_global_object", 1); - /* "larch/pickle/pickle.pyx":928 + /* "larch/pickle/pickle.pyx":930 * * cdef object load_global_object(Unpacker* p, uint8_t code, size_t size): * cdef uint32_t stamp = p.get_stamp() # <<<<<<<<<<<<<< @@ -12606,19 +12629,19 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_global_object(Unpacker *__p */ __pyx_v_stamp = __pyx_v_p->get_stamp(); - /* "larch/pickle/pickle.pyx":929 + /* "larch/pickle/pickle.pyx":931 * cdef object load_global_object(Unpacker* p, uint8_t code, size_t size): * cdef uint32_t stamp = p.get_stamp() * obj = (p.unpickler).unpack_import(size) # <<<<<<<<<<<<<< * p.stamp(stamp, obj) * return obj */ - __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->unpack_import(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 929, __pyx_L1_error) + __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->unpack_import(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 931, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_obj = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":930 + /* "larch/pickle/pickle.pyx":932 * cdef uint32_t stamp = p.get_stamp() * obj = (p.unpickler).unpack_import(size) * p.stamp(stamp, obj) # <<<<<<<<<<<<<< @@ -12627,7 +12650,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_global_object(Unpacker *__p */ __pyx_v_p->stamp(__pyx_v_stamp, __pyx_v_obj); - /* "larch/pickle/pickle.pyx":931 + /* "larch/pickle/pickle.pyx":933 * obj = (p.unpickler).unpack_import(size) * p.stamp(stamp, obj) * return obj # <<<<<<<<<<<<<< @@ -12639,7 +12662,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_global_object(Unpacker *__p __pyx_r = __pyx_v_obj; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":927 + /* "larch/pickle/pickle.pyx":929 * * * cdef object load_global_object(Unpacker* p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12659,7 +12682,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_global_object(Unpacker *__p return __pyx_r; } -/* "larch/pickle/pickle.pyx":934 +/* "larch/pickle/pickle.pyx":936 * * * cdef object load_version(Unpacker* p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12677,7 +12700,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_version(Unpacker *__pyx_v_p int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_version", 1); - /* "larch/pickle/pickle.pyx":936 + /* "larch/pickle/pickle.pyx":938 * cdef object load_version(Unpacker* p, uint8_t code, size_t size): * cdef uint8_t version * p.read(&version, sizeof(version)) # <<<<<<<<<<<<<< @@ -12686,16 +12709,16 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_version(Unpacker *__pyx_v_p */ (void)(__pyx_v_p->read(((char *)(&__pyx_v_version)), (sizeof(__pyx_v_version)))); - /* "larch/pickle/pickle.pyx":937 + /* "larch/pickle/pickle.pyx":939 * cdef uint8_t version * p.read(&version, sizeof(version)) * (p.unpickler).set_protocol(version) # <<<<<<<<<<<<<< * return p.load_object() * */ - ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->set_protocol(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_version); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 937, __pyx_L1_error) + ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler)->__pyx_vtab)->set_protocol(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_p->unpickler), __pyx_v_version); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 939, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":938 + /* "larch/pickle/pickle.pyx":940 * p.read(&version, sizeof(version)) * (p.unpickler).set_protocol(version) * return p.load_object() # <<<<<<<<<<<<<< @@ -12703,13 +12726,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_version(Unpacker *__pyx_v_p * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 938, __pyx_L1_error) + __pyx_t_1 = __pyx_v_p->load(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 940, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":934 + /* "larch/pickle/pickle.pyx":936 * * * cdef object load_version(Unpacker* p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12728,7 +12751,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_version(Unpacker *__pyx_v_p return __pyx_r; } -/* "larch/pickle/pickle.pyx":941 +/* "larch/pickle/pickle.pyx":943 * * * cdef object load_wrong_code(Unpacker* p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12742,20 +12765,20 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_wrong_code(CYTHON_UNUSED Un PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + unsigned int __pyx_t_4; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load_wrong_code", 1); - /* "larch/pickle/pickle.pyx":942 + /* "larch/pickle/pickle.pyx":944 * * cdef object load_wrong_code(Unpacker* p, uint8_t code, size_t size): * raise UnpicklingError("Unknown load code") # <<<<<<<<<<<<<< * * */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 942, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 944, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_4 = 0; @@ -12775,15 +12798,15 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_wrong_code(CYTHON_UNUSED Un PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_kp_u_Unknown_load_code}; __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 1+__pyx_t_4); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 942, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 944, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } __Pyx_Raise(__pyx_t_1, 0, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __PYX_ERR(0, 942, __pyx_L1_error) + __PYX_ERR(0, 944, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":941 + /* "larch/pickle/pickle.pyx":943 * * * cdef object load_wrong_code(Unpacker* p, uint8_t code, size_t size): # <<<<<<<<<<<<<< @@ -12803,7 +12826,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load_wrong_code(CYTHON_UNUSED Un return __pyx_r; } -/* "larch/pickle/pickle.pyx":945 +/* "larch/pickle/pickle.pyx":947 * * * cdef _register_unpickle(unpack_t loader, codes, int offset=0): # <<<<<<<<<<<<<< @@ -12831,7 +12854,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle__register_unpickle(unpack_t __py } } - /* "larch/pickle/pickle.pyx":947 + /* "larch/pickle/pickle.pyx":949 * cdef _register_unpickle(unpack_t loader, codes, int offset=0): * cdef size_t i * for i in codes: # <<<<<<<<<<<<<< @@ -12843,9 +12866,9 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle__register_unpickle(unpack_t __py __pyx_t_2 = 0; __pyx_t_3 = NULL; } else { - __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_v_codes); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 947, __pyx_L1_error) + __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_v_codes); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 949, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 947, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 949, __pyx_L1_error) } for (;;) { if (likely(!__pyx_t_3)) { @@ -12853,28 +12876,28 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle__register_unpickle(unpack_t __py { Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_t_1); #if !CYTHON_ASSUME_SAFE_MACROS - if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 947, __pyx_L1_error) + if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 949, __pyx_L1_error) #endif if (__pyx_t_2 >= __pyx_temp) break; } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 947, __pyx_L1_error) + __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 949, __pyx_L1_error) #else - __pyx_t_4 = __Pyx_PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 947, __pyx_L1_error) + __pyx_t_4 = __Pyx_PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 949, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); #endif } else { { Py_ssize_t __pyx_temp = __Pyx_PyTuple_GET_SIZE(__pyx_t_1); #if !CYTHON_ASSUME_SAFE_MACROS - if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 947, __pyx_L1_error) + if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 949, __pyx_L1_error) #endif if (__pyx_t_2 >= __pyx_temp) break; } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 947, __pyx_L1_error) + __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely((0 < 0))) __PYX_ERR(0, 949, __pyx_L1_error) #else - __pyx_t_4 = __Pyx_PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 947, __pyx_L1_error) + __pyx_t_4 = __Pyx_PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 949, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); #endif } @@ -12884,17 +12907,17 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle__register_unpickle(unpack_t __py PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 947, __pyx_L1_error) + else __PYX_ERR(0, 949, __pyx_L1_error) } break; } __Pyx_GOTREF(__pyx_t_4); } - __pyx_t_5 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_5 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 947, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_5 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 949, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_v_i = __pyx_t_5; - /* "larch/pickle/pickle.pyx":948 + /* "larch/pickle/pickle.pyx":950 * cdef size_t i * for i in codes: * unpickle_registry[i+offset] = loader # <<<<<<<<<<<<<< @@ -12903,7 +12926,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle__register_unpickle(unpack_t __py */ (unpickle_registry[(__pyx_v_i + __pyx_v_offset)]) = __pyx_v_loader; - /* "larch/pickle/pickle.pyx":947 + /* "larch/pickle/pickle.pyx":949 * cdef _register_unpickle(unpack_t loader, codes, int offset=0): * cdef size_t i * for i in codes: # <<<<<<<<<<<<<< @@ -12913,7 +12936,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle__register_unpickle(unpack_t __py } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":945 + /* "larch/pickle/pickle.pyx":947 * * * cdef _register_unpickle(unpack_t loader, codes, int offset=0): # <<<<<<<<<<<<<< @@ -12935,7 +12958,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle__register_unpickle(unpack_t __py return __pyx_r; } -/* "larch/pickle/pickle.pyx":1003 +/* "larch/pickle/pickle.pyx":1005 * ctypedef object (*find_class_t)(Unpickler unpickler, module, name) * * cdef object call_default_find_class(Unpickler unpickler, module, name): # <<<<<<<<<<<<<< @@ -12952,7 +12975,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_call_default_find_class(struct _ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("call_default_find_class", 1); - /* "larch/pickle/pickle.pyx":1004 + /* "larch/pickle/pickle.pyx":1006 * * cdef object call_default_find_class(Unpickler unpickler, module, name): * return unpickler.default_find_class(module, name) # <<<<<<<<<<<<<< @@ -12960,13 +12983,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_call_default_find_class(struct _ * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __pyx_v_unpickler->default_find_class(__pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1004, __pyx_L1_error) + __pyx_t_1 = __pyx_v_unpickler->default_find_class(__pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1006, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1003 + /* "larch/pickle/pickle.pyx":1005 * ctypedef object (*find_class_t)(Unpickler unpickler, module, name) * * cdef object call_default_find_class(Unpickler unpickler, module, name): # <<<<<<<<<<<<<< @@ -12985,7 +13008,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_call_default_find_class(struct _ return __pyx_r; } -/* "larch/pickle/pickle.pyx":1007 +/* "larch/pickle/pickle.pyx":1009 * * * cdef object call_sub_find_class(Unpickler unpickler, module, name): # <<<<<<<<<<<<<< @@ -12999,13 +13022,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_call_sub_find_class(struct __pyx PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + unsigned int __pyx_t_4; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("call_sub_find_class", 1); - /* "larch/pickle/pickle.pyx":1008 + /* "larch/pickle/pickle.pyx":1010 * * cdef object call_sub_find_class(Unpickler unpickler, module, name): * return unpickler._find_class(module, name) # <<<<<<<<<<<<<< @@ -13032,7 +13055,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_call_sub_find_class(struct __pyx PyObject *__pyx_callargs[3] = {__pyx_t_3, __pyx_v_module, __pyx_v_name}; __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 2+__pyx_t_4); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1008, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1010, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } @@ -13040,7 +13063,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_call_sub_find_class(struct __pyx __pyx_t_1 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1007 + /* "larch/pickle/pickle.pyx":1009 * * * cdef object call_sub_find_class(Unpickler unpickler, module, name): # <<<<<<<<<<<<<< @@ -13061,7 +13084,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_call_sub_find_class(struct __pyx return __pyx_r; } -/* "larch/pickle/pickle.pyx":1014 +/* "larch/pickle/pickle.pyx":1016 * * * cdef object simple_find_class(module, name): # <<<<<<<<<<<<<< @@ -13094,15 +13117,16 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py PyObject *__pyx_t_17 = NULL; PyObject *__pyx_t_18 = NULL; PyObject *__pyx_t_19 = NULL; - Py_ssize_t __pyx_t_20; - PyObject *(*__pyx_t_21)(PyObject *); + unsigned int __pyx_t_20; + Py_ssize_t __pyx_t_21; + PyObject *(*__pyx_t_22)(PyObject *); int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("simple_find_class", 0); __Pyx_INCREF(__pyx_v_module); - /* "larch/pickle/pickle.pyx":1016 + /* "larch/pickle/pickle.pyx":1018 * cdef object simple_find_class(module, name): * cdef PyObject* tmp * tmp = PyDict_GetItem(modules, module) # <<<<<<<<<<<<<< @@ -13114,7 +13138,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __pyx_v_tmp = PyDict_GetItem(__pyx_t_1, __pyx_v_module); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":1017 + /* "larch/pickle/pickle.pyx":1019 * cdef PyObject* tmp * tmp = PyDict_GetItem(modules, module) * if tmp is NULL: # <<<<<<<<<<<<<< @@ -13124,7 +13148,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __pyx_t_2 = (__pyx_v_tmp == NULL); if (__pyx_t_2) { - /* "larch/pickle/pickle.pyx":1018 + /* "larch/pickle/pickle.pyx":1020 * tmp = PyDict_GetItem(modules, module) * if tmp is NULL: * try: # <<<<<<<<<<<<<< @@ -13140,18 +13164,18 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __Pyx_XGOTREF(__pyx_t_5); /*try:*/ { - /* "larch/pickle/pickle.pyx":1019 + /* "larch/pickle/pickle.pyx":1021 * if tmp is NULL: * try: * __import__(module) # <<<<<<<<<<<<<< * except TypeError as e: * e.args += (module, name) */ - __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_builtin___import__, __pyx_v_module); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1019, __pyx_L4_error) + __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_builtin___import__, __pyx_v_module); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1021, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":1018 + /* "larch/pickle/pickle.pyx":1020 * tmp = PyDict_GetItem(modules, module) * if tmp is NULL: * try: # <<<<<<<<<<<<<< @@ -13166,7 +13190,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __pyx_L4_error:; __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":1020 + /* "larch/pickle/pickle.pyx":1022 * try: * __import__(module) * except TypeError as e: # <<<<<<<<<<<<<< @@ -13176,7 +13200,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __pyx_t_6 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_TypeError); if (__pyx_t_6) { __Pyx_AddTraceback("larch.pickle.pickle.simple_find_class", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_7, &__pyx_t_8) < 0) __PYX_ERR(0, 1020, __pyx_L6_except_error) + if (__Pyx_GetException(&__pyx_t_1, &__pyx_t_7, &__pyx_t_8) < 0) __PYX_ERR(0, 1022, __pyx_L6_except_error) __Pyx_XGOTREF(__pyx_t_1); __Pyx_XGOTREF(__pyx_t_7); __Pyx_XGOTREF(__pyx_t_8); @@ -13184,31 +13208,31 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __pyx_v_e = __pyx_t_7; /*try:*/ { - /* "larch/pickle/pickle.pyx":1021 + /* "larch/pickle/pickle.pyx":1023 * __import__(module) * except TypeError as e: * e.args += (module, name) # <<<<<<<<<<<<<< * raise * */ - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_e, __pyx_n_s_args); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1021, __pyx_L15_error) + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_e, __pyx_n_s_args); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 1023, __pyx_L15_error) __Pyx_GOTREF(__pyx_t_9); - __pyx_t_10 = PyTuple_New(2); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 1021, __pyx_L15_error) + __pyx_t_10 = PyTuple_New(2); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 1023, __pyx_L15_error) __Pyx_GOTREF(__pyx_t_10); __Pyx_INCREF(__pyx_v_module); __Pyx_GIVEREF(__pyx_v_module); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_v_module)) __PYX_ERR(0, 1021, __pyx_L15_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_v_module)) __PYX_ERR(0, 1023, __pyx_L15_error); __Pyx_INCREF(__pyx_v_name); __Pyx_GIVEREF(__pyx_v_name); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_10, 1, __pyx_v_name)) __PYX_ERR(0, 1021, __pyx_L15_error); - __pyx_t_11 = PyNumber_InPlaceAdd(__pyx_t_9, __pyx_t_10); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1021, __pyx_L15_error) + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_10, 1, __pyx_v_name)) __PYX_ERR(0, 1023, __pyx_L15_error); + __pyx_t_11 = PyNumber_InPlaceAdd(__pyx_t_9, __pyx_t_10); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1023, __pyx_L15_error) __Pyx_GOTREF(__pyx_t_11); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - if (__Pyx_PyObject_SetAttrStr(__pyx_v_e, __pyx_n_s_args, __pyx_t_11) < 0) __PYX_ERR(0, 1021, __pyx_L15_error) + if (__Pyx_PyObject_SetAttrStr(__pyx_v_e, __pyx_n_s_args, __pyx_t_11) < 0) __PYX_ERR(0, 1023, __pyx_L15_error) __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; - /* "larch/pickle/pickle.pyx":1022 + /* "larch/pickle/pickle.pyx":1024 * except TypeError as e: * e.args += (module, name) * raise # <<<<<<<<<<<<<< @@ -13220,10 +13244,10 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __Pyx_XGIVEREF(__pyx_t_8); __Pyx_ErrRestoreWithState(__pyx_t_1, __pyx_t_7, __pyx_t_8); __pyx_t_1 = 0; __pyx_t_7 = 0; __pyx_t_8 = 0; - __PYX_ERR(0, 1022, __pyx_L15_error) + __PYX_ERR(0, 1024, __pyx_L15_error) } - /* "larch/pickle/pickle.pyx":1020 + /* "larch/pickle/pickle.pyx":1022 * try: * __import__(module) * except TypeError as e: # <<<<<<<<<<<<<< @@ -13269,7 +13293,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py } goto __pyx_L6_except_error; - /* "larch/pickle/pickle.pyx":1018 + /* "larch/pickle/pickle.pyx":1020 * tmp = PyDict_GetItem(modules, module) * if tmp is NULL: * try: # <<<<<<<<<<<<<< @@ -13285,25 +13309,25 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __pyx_L9_try_end:; } - /* "larch/pickle/pickle.pyx":1024 + /* "larch/pickle/pickle.pyx":1026 * raise * * module = sys.modules[module] # <<<<<<<<<<<<<< * else: * module = tmp */ - __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_sys); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1024, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_8, __pyx_n_s_sys); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1026, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_modules); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1024, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_modules); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1026, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __pyx_t_8 = __Pyx_PyObject_GetItem(__pyx_t_7, __pyx_v_module); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1024, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetItem(__pyx_t_7, __pyx_v_module); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1026, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF_SET(__pyx_v_module, __pyx_t_8); __pyx_t_8 = 0; - /* "larch/pickle/pickle.pyx":1017 + /* "larch/pickle/pickle.pyx":1019 * cdef PyObject* tmp * tmp = PyDict_GetItem(modules, module) * if tmp is NULL: # <<<<<<<<<<<<<< @@ -13313,7 +13337,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py goto __pyx_L3; } - /* "larch/pickle/pickle.pyx":1026 + /* "larch/pickle/pickle.pyx":1028 * module = sys.modules[module] * else: * module = tmp # <<<<<<<<<<<<<< @@ -13328,7 +13352,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py } __pyx_L3:; - /* "larch/pickle/pickle.pyx":1028 + /* "larch/pickle/pickle.pyx":1030 * module = tmp * * try: # <<<<<<<<<<<<<< @@ -13344,7 +13368,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "larch/pickle/pickle.pyx":1029 + /* "larch/pickle/pickle.pyx":1031 * * try: * return getattr(module, name) # <<<<<<<<<<<<<< @@ -13352,13 +13376,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py * for n in name.split("."): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_8 = __Pyx_GetAttr(__pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1029, __pyx_L21_error) + __pyx_t_8 = __Pyx_GetAttr(__pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1031, __pyx_L21_error) __Pyx_GOTREF(__pyx_t_8); __pyx_r = __pyx_t_8; __pyx_t_8 = 0; goto __pyx_L25_try_return; - /* "larch/pickle/pickle.pyx":1028 + /* "larch/pickle/pickle.pyx":1030 * module = tmp * * try: # <<<<<<<<<<<<<< @@ -13374,7 +13398,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - /* "larch/pickle/pickle.pyx":1030 + /* "larch/pickle/pickle.pyx":1032 * try: * return getattr(module, name) * except AttributeError: # <<<<<<<<<<<<<< @@ -13384,22 +13408,22 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __pyx_t_12 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_AttributeError); if (__pyx_t_12) { __Pyx_AddTraceback("larch.pickle.pickle.simple_find_class", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_8, &__pyx_t_7, &__pyx_t_1) < 0) __PYX_ERR(0, 1030, __pyx_L23_except_error) + if (__Pyx_GetException(&__pyx_t_8, &__pyx_t_7, &__pyx_t_1) < 0) __PYX_ERR(0, 1032, __pyx_L23_except_error) __Pyx_XGOTREF(__pyx_t_8); __Pyx_XGOTREF(__pyx_t_7); __Pyx_XGOTREF(__pyx_t_1); - /* "larch/pickle/pickle.pyx":1031 + /* "larch/pickle/pickle.pyx":1033 * return getattr(module, name) * except AttributeError: * for n in name.split("."): # <<<<<<<<<<<<<< * module = getattr(module, n) * return module */ - __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_name, __pyx_n_s_split); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 1031, __pyx_L23_except_error) + __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_name, __pyx_n_s_split); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 1033, __pyx_L23_except_error) __Pyx_GOTREF(__pyx_t_10); __pyx_t_9 = NULL; - __pyx_t_12 = 0; + __pyx_t_20 = 0; #if CYTHON_UNPACK_METHODS if (likely(PyMethod_Check(__pyx_t_10))) { __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_10); @@ -13408,66 +13432,66 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __Pyx_INCREF(__pyx_t_9); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_10, function); - __pyx_t_12 = 1; + __pyx_t_20 = 1; } } #endif { PyObject *__pyx_callargs[2] = {__pyx_t_9, __pyx_kp_u__2}; - __pyx_t_11 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+1-__pyx_t_12, 1+__pyx_t_12); + __pyx_t_11 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+1-__pyx_t_20, 1+__pyx_t_20); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1031, __pyx_L23_except_error) + if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1033, __pyx_L23_except_error) __Pyx_GOTREF(__pyx_t_11); __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; } if (likely(PyList_CheckExact(__pyx_t_11)) || PyTuple_CheckExact(__pyx_t_11)) { __pyx_t_10 = __pyx_t_11; __Pyx_INCREF(__pyx_t_10); - __pyx_t_20 = 0; - __pyx_t_21 = NULL; + __pyx_t_21 = 0; + __pyx_t_22 = NULL; } else { - __pyx_t_20 = -1; __pyx_t_10 = PyObject_GetIter(__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 1031, __pyx_L23_except_error) + __pyx_t_21 = -1; __pyx_t_10 = PyObject_GetIter(__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 1033, __pyx_L23_except_error) __Pyx_GOTREF(__pyx_t_10); - __pyx_t_21 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_10); if (unlikely(!__pyx_t_21)) __PYX_ERR(0, 1031, __pyx_L23_except_error) + __pyx_t_22 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_10); if (unlikely(!__pyx_t_22)) __PYX_ERR(0, 1033, __pyx_L23_except_error) } __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; for (;;) { - if (likely(!__pyx_t_21)) { + if (likely(!__pyx_t_22)) { if (likely(PyList_CheckExact(__pyx_t_10))) { { Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_t_10); #if !CYTHON_ASSUME_SAFE_MACROS - if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 1031, __pyx_L23_except_error) + if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 1033, __pyx_L23_except_error) #endif - if (__pyx_t_20 >= __pyx_temp) break; + if (__pyx_t_21 >= __pyx_temp) break; } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_11 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_20); __Pyx_INCREF(__pyx_t_11); __pyx_t_20++; if (unlikely((0 < 0))) __PYX_ERR(0, 1031, __pyx_L23_except_error) + __pyx_t_11 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_21); __Pyx_INCREF(__pyx_t_11); __pyx_t_21++; if (unlikely((0 < 0))) __PYX_ERR(0, 1033, __pyx_L23_except_error) #else - __pyx_t_11 = __Pyx_PySequence_ITEM(__pyx_t_10, __pyx_t_20); __pyx_t_20++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1031, __pyx_L23_except_error) + __pyx_t_11 = __Pyx_PySequence_ITEM(__pyx_t_10, __pyx_t_21); __pyx_t_21++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1033, __pyx_L23_except_error) __Pyx_GOTREF(__pyx_t_11); #endif } else { { Py_ssize_t __pyx_temp = __Pyx_PyTuple_GET_SIZE(__pyx_t_10); #if !CYTHON_ASSUME_SAFE_MACROS - if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 1031, __pyx_L23_except_error) + if (unlikely((__pyx_temp < 0))) __PYX_ERR(0, 1033, __pyx_L23_except_error) #endif - if (__pyx_t_20 >= __pyx_temp) break; + if (__pyx_t_21 >= __pyx_temp) break; } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_11 = PyTuple_GET_ITEM(__pyx_t_10, __pyx_t_20); __Pyx_INCREF(__pyx_t_11); __pyx_t_20++; if (unlikely((0 < 0))) __PYX_ERR(0, 1031, __pyx_L23_except_error) + __pyx_t_11 = PyTuple_GET_ITEM(__pyx_t_10, __pyx_t_21); __Pyx_INCREF(__pyx_t_11); __pyx_t_21++; if (unlikely((0 < 0))) __PYX_ERR(0, 1033, __pyx_L23_except_error) #else - __pyx_t_11 = __Pyx_PySequence_ITEM(__pyx_t_10, __pyx_t_20); __pyx_t_20++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1031, __pyx_L23_except_error) + __pyx_t_11 = __Pyx_PySequence_ITEM(__pyx_t_10, __pyx_t_21); __pyx_t_21++; if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1033, __pyx_L23_except_error) __Pyx_GOTREF(__pyx_t_11); #endif } } else { - __pyx_t_11 = __pyx_t_21(__pyx_t_10); + __pyx_t_11 = __pyx_t_22(__pyx_t_10); if (unlikely(!__pyx_t_11)) { PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(0, 1031, __pyx_L23_except_error) + else __PYX_ERR(0, 1033, __pyx_L23_except_error) } break; } @@ -13476,19 +13500,19 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py __Pyx_XDECREF_SET(__pyx_v_n, __pyx_t_11); __pyx_t_11 = 0; - /* "larch/pickle/pickle.pyx":1032 + /* "larch/pickle/pickle.pyx":1034 * except AttributeError: * for n in name.split("."): * module = getattr(module, n) # <<<<<<<<<<<<<< * return module * */ - __pyx_t_11 = __Pyx_GetAttr(__pyx_v_module, __pyx_v_n); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1032, __pyx_L23_except_error) + __pyx_t_11 = __Pyx_GetAttr(__pyx_v_module, __pyx_v_n); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 1034, __pyx_L23_except_error) __Pyx_GOTREF(__pyx_t_11); __Pyx_DECREF_SET(__pyx_v_module, __pyx_t_11); __pyx_t_11 = 0; - /* "larch/pickle/pickle.pyx":1031 + /* "larch/pickle/pickle.pyx":1033 * return getattr(module, name) * except AttributeError: * for n in name.split("."): # <<<<<<<<<<<<<< @@ -13498,7 +13522,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py } __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - /* "larch/pickle/pickle.pyx":1033 + /* "larch/pickle/pickle.pyx":1035 * for n in name.split("."): * module = getattr(module, n) * return module # <<<<<<<<<<<<<< @@ -13515,7 +13539,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py } goto __pyx_L23_except_error; - /* "larch/pickle/pickle.pyx":1028 + /* "larch/pickle/pickle.pyx":1030 * module = tmp * * try: # <<<<<<<<<<<<<< @@ -13542,7 +13566,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py goto __pyx_L0; } - /* "larch/pickle/pickle.pyx":1014 + /* "larch/pickle/pickle.pyx":1016 * * * cdef object simple_find_class(module, name): # <<<<<<<<<<<<<< @@ -13569,7 +13593,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_simple_find_class(PyObject *__py return __pyx_r; } -/* "larch/pickle/pickle.pyx":1036 +/* "larch/pickle/pickle.pyx":1038 * * * cdef object mapped_find_class(module, name): # <<<<<<<<<<<<<< @@ -13594,7 +13618,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py __Pyx_INCREF(__pyx_v_module); __Pyx_INCREF(__pyx_v_name); - /* "larch/pickle/pickle.pyx":1040 + /* "larch/pickle/pickle.pyx":1042 * PyObject* tmp * * tmp = PyDict_GetItem(name_mapping_2to3, (module, name)) # <<<<<<<<<<<<<< @@ -13603,19 +13627,19 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py */ __pyx_t_1 = __pyx_v_5larch_6pickle_6pickle_name_mapping_2to3; __Pyx_INCREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1040, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1042, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_module); __Pyx_GIVEREF(__pyx_v_module); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_module)) __PYX_ERR(0, 1040, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_module)) __PYX_ERR(0, 1042, __pyx_L1_error); __Pyx_INCREF(__pyx_v_name); __Pyx_GIVEREF(__pyx_v_name); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_name)) __PYX_ERR(0, 1040, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_name)) __PYX_ERR(0, 1042, __pyx_L1_error); __pyx_v_tmp = PyDict_GetItem(__pyx_t_1, __pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":1041 + /* "larch/pickle/pickle.pyx":1043 * * tmp = PyDict_GetItem(name_mapping_2to3, (module, name)) * if tmp is not NULL: # <<<<<<<<<<<<<< @@ -13625,7 +13649,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py __pyx_t_3 = (__pyx_v_tmp != NULL); if (__pyx_t_3) { - /* "larch/pickle/pickle.pyx":1042 + /* "larch/pickle/pickle.pyx":1044 * tmp = PyDict_GetItem(name_mapping_2to3, (module, name)) * if tmp is not NULL: * module, name = tmp # <<<<<<<<<<<<<< @@ -13640,7 +13664,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 1042, __pyx_L1_error) + __PYX_ERR(0, 1044, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -13653,15 +13677,15 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py __Pyx_INCREF(__pyx_t_1); __Pyx_INCREF(__pyx_t_4); #else - __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1042, __pyx_L1_error) + __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1044, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1042, __pyx_L1_error) + __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1044, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); #endif __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else { Py_ssize_t index = -1; - __pyx_t_5 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1042, __pyx_L1_error) + __pyx_t_5 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1044, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_6 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_5); @@ -13669,7 +13693,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py __Pyx_GOTREF(__pyx_t_1); index = 1; __pyx_t_4 = __pyx_t_6(__pyx_t_5); if (unlikely(!__pyx_t_4)) goto __pyx_L4_unpacking_failed; __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_6(__pyx_t_5), 2) < 0) __PYX_ERR(0, 1042, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_6(__pyx_t_5), 2) < 0) __PYX_ERR(0, 1044, __pyx_L1_error) __pyx_t_6 = NULL; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; goto __pyx_L5_unpacking_done; @@ -13677,7 +13701,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_6 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 1042, __pyx_L1_error) + __PYX_ERR(0, 1044, __pyx_L1_error) __pyx_L5_unpacking_done:; } __Pyx_DECREF_SET(__pyx_v_module, __pyx_t_1); @@ -13685,7 +13709,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py __Pyx_DECREF_SET(__pyx_v_name, __pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":1041 + /* "larch/pickle/pickle.pyx":1043 * * tmp = PyDict_GetItem(name_mapping_2to3, (module, name)) * if tmp is not NULL: # <<<<<<<<<<<<<< @@ -13694,7 +13718,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py */ } - /* "larch/pickle/pickle.pyx":1044 + /* "larch/pickle/pickle.pyx":1046 * module, name = tmp * * tmp = PyDict_GetItem(import_mapping_2to3, module) # <<<<<<<<<<<<<< @@ -13706,7 +13730,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py __pyx_v_tmp = PyDict_GetItem(__pyx_t_2, __pyx_v_module); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":1045 + /* "larch/pickle/pickle.pyx":1047 * * tmp = PyDict_GetItem(import_mapping_2to3, module) * if tmp is not NULL: # <<<<<<<<<<<<<< @@ -13716,7 +13740,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py __pyx_t_3 = (__pyx_v_tmp != NULL); if (__pyx_t_3) { - /* "larch/pickle/pickle.pyx":1046 + /* "larch/pickle/pickle.pyx":1048 * tmp = PyDict_GetItem(import_mapping_2to3, module) * if tmp is not NULL: * module = tmp # <<<<<<<<<<<<<< @@ -13728,7 +13752,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py __Pyx_DECREF_SET(__pyx_v_module, __pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":1045 + /* "larch/pickle/pickle.pyx":1047 * * tmp = PyDict_GetItem(import_mapping_2to3, module) * if tmp is not NULL: # <<<<<<<<<<<<<< @@ -13737,7 +13761,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py */ } - /* "larch/pickle/pickle.pyx":1048 + /* "larch/pickle/pickle.pyx":1050 * module = tmp * * return simple_find_class(module, name) # <<<<<<<<<<<<<< @@ -13745,13 +13769,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle_simple_find_class(__pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1048, __pyx_L1_error) + __pyx_t_2 = __pyx_f_5larch_6pickle_6pickle_simple_find_class(__pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1050, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_r = __pyx_t_2; __pyx_t_2 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1036 + /* "larch/pickle/pickle.pyx":1038 * * * cdef object mapped_find_class(module, name): # <<<<<<<<<<<<<< @@ -13775,7 +13799,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_mapped_find_class(PyObject *__py return __pyx_r; } -/* "larch/pickle/pickle.pyx":1062 +/* "larch/pickle/pickle.pyx":1064 * public bool secure * * def __init__(self, file=b"", bool secure=False): # <<<<<<<<<<<<<< @@ -13822,19 +13846,19 @@ static int __pyx_pw_5larch_6pickle_6pickle_9Unpickler_1__init__(PyObject *__pyx_ if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_file); if (value) { values[0] = __Pyx_Arg_NewRef_VARARGS(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1062, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1064, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 1: if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_VARARGS(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_secure); if (value) { values[1] = __Pyx_Arg_NewRef_VARARGS(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1062, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1064, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 1062, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(0, 1064, __pyx_L3_error) } } else { switch (__pyx_nargs) { @@ -13848,14 +13872,14 @@ static int __pyx_pw_5larch_6pickle_6pickle_9Unpickler_1__init__(PyObject *__pyx_ } __pyx_v_file = values[0]; if (values[1]) { - __pyx_v_secure = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_secure == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1062, __pyx_L3_error) + __pyx_v_secure = __Pyx_PyObject_IsTrue(values[1]); if (unlikely((__pyx_v_secure == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1064, __pyx_L3_error) } else { __pyx_v_secure = ((bool)0); } } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("__init__", 0, 0, 2, __pyx_nargs); __PYX_ERR(0, 1062, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("__init__", 0, 0, 2, __pyx_nargs); __PYX_ERR(0, 1064, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -13889,13 +13913,13 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; int __pyx_t_4; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__init__", 1); - /* "larch/pickle/pickle.pyx":1063 + /* "larch/pickle/pickle.pyx":1065 * * def __init__(self, file=b"", bool secure=False): * self.unpacker = new Unpacker(self) # <<<<<<<<<<<<<< @@ -13904,7 +13928,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ */ __pyx_v_self->unpacker = new Unpacker(((PyObject *)__pyx_v_self)); - /* "larch/pickle/pickle.pyx":1064 + /* "larch/pickle/pickle.pyx":1066 * def __init__(self, file=b"", bool secure=False): * self.unpacker = new Unpacker(self) * self.secure = secure # <<<<<<<<<<<<<< @@ -13913,26 +13937,26 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ */ __pyx_v_self->secure = __pyx_v_secure; - /* "larch/pickle/pickle.pyx":1067 + /* "larch/pickle/pickle.pyx":1069 * * # this is complicated but faster than ordinary subclassing * if isinstance(self.find_class, types.BuiltinMethodType): # <<<<<<<<<<<<<< * self.call_find_class = call_default_find_class * else: */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_find_class); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1067, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_find_class); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1069, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_types); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1067, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_types); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1069, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_BuiltinMethodType); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1067, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_BuiltinMethodType); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1069, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_4 = PyObject_IsInstance(__pyx_t_1, __pyx_t_3); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 1067, __pyx_L1_error) + __pyx_t_4 = PyObject_IsInstance(__pyx_t_1, __pyx_t_3); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 1069, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_4) { - /* "larch/pickle/pickle.pyx":1068 + /* "larch/pickle/pickle.pyx":1070 * # this is complicated but faster than ordinary subclassing * if isinstance(self.find_class, types.BuiltinMethodType): * self.call_find_class = call_default_find_class # <<<<<<<<<<<<<< @@ -13941,7 +13965,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ */ __pyx_v_self->call_find_class = __pyx_f_5larch_6pickle_6pickle_call_default_find_class; - /* "larch/pickle/pickle.pyx":1067 + /* "larch/pickle/pickle.pyx":1069 * * # this is complicated but faster than ordinary subclassing * if isinstance(self.find_class, types.BuiltinMethodType): # <<<<<<<<<<<<<< @@ -13951,7 +13975,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ goto __pyx_L3; } - /* "larch/pickle/pickle.pyx":1070 + /* "larch/pickle/pickle.pyx":1072 * self.call_find_class = call_default_find_class * else: * self._find_class = self.find_class # <<<<<<<<<<<<<< @@ -13959,7 +13983,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ * */ /*else*/ { - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_find_class); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1070, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_find_class); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1072, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_3); __Pyx_GOTREF(__pyx_v_self->_find_class); @@ -13967,7 +13991,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ __pyx_v_self->_find_class = __pyx_t_3; __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1071 + /* "larch/pickle/pickle.pyx":1073 * else: * self._find_class = self.find_class * self.call_find_class = call_sub_find_class # <<<<<<<<<<<<<< @@ -13978,7 +14002,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ } __pyx_L3:; - /* "larch/pickle/pickle.pyx":1073 + /* "larch/pickle/pickle.pyx":1075 * self.call_find_class = call_sub_find_class * * self.default_find_class = simple_find_class # <<<<<<<<<<<<<< @@ -13987,7 +14011,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ */ __pyx_v_self->default_find_class = __pyx_f_5larch_6pickle_6pickle_simple_find_class; - /* "larch/pickle/pickle.pyx":1075 + /* "larch/pickle/pickle.pyx":1077 * self.default_find_class = simple_find_class * * if isinstance(file, bytes): # <<<<<<<<<<<<<< @@ -13997,17 +14021,17 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ __pyx_t_4 = PyBytes_Check(__pyx_v_file); if (__pyx_t_4) { - /* "larch/pickle/pickle.pyx":1076 + /* "larch/pickle/pickle.pyx":1078 * * if isinstance(file, bytes): * self.file = _BufferContainer().set(file) # <<<<<<<<<<<<<< * self.unpacker.do_read = read_buffer * elif hasattr(file, "c_pickle"): */ - __pyx_t_3 = __Pyx_PyObject_CallNoArg(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle__BufferContainer)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1076, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_CallNoArg(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle__BufferContainer)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1078, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (!(likely(PyBytes_CheckExact(__pyx_v_file))||((__pyx_v_file) == Py_None) || __Pyx_RaiseUnexpectedTypeError("bytes", __pyx_v_file))) __PYX_ERR(0, 1076, __pyx_L1_error) - __pyx_t_1 = ((PyObject *)((struct __pyx_vtabstruct_5larch_6pickle_6pickle__BufferContainer *)((struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *)__pyx_t_3)->__pyx_vtab)->set(((struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *)__pyx_t_3), ((PyObject*)__pyx_v_file))); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1076, __pyx_L1_error) + if (!(likely(PyBytes_CheckExact(__pyx_v_file))||((__pyx_v_file) == Py_None) || __Pyx_RaiseUnexpectedTypeError("bytes", __pyx_v_file))) __PYX_ERR(0, 1078, __pyx_L1_error) + __pyx_t_1 = ((PyObject *)((struct __pyx_vtabstruct_5larch_6pickle_6pickle__BufferContainer *)((struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *)__pyx_t_3)->__pyx_vtab)->set(((struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *)__pyx_t_3), ((PyObject*)__pyx_v_file))); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1078, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GIVEREF(__pyx_t_1); @@ -14016,7 +14040,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ __pyx_v_self->file = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":1077 + /* "larch/pickle/pickle.pyx":1079 * if isinstance(file, bytes): * self.file = _BufferContainer().set(file) * self.unpacker.do_read = read_buffer # <<<<<<<<<<<<<< @@ -14025,7 +14049,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ */ __pyx_v_self->unpacker->do_read = __pyx_f_5larch_6pickle_6pickle_read_buffer; - /* "larch/pickle/pickle.pyx":1075 + /* "larch/pickle/pickle.pyx":1077 * self.default_find_class = simple_find_class * * if isinstance(file, bytes): # <<<<<<<<<<<<<< @@ -14035,24 +14059,24 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ goto __pyx_L4; } - /* "larch/pickle/pickle.pyx":1078 + /* "larch/pickle/pickle.pyx":1080 * self.file = _BufferContainer().set(file) * self.unpacker.do_read = read_buffer * elif hasattr(file, "c_pickle"): # <<<<<<<<<<<<<< * self.file = file.c_pickle() * self.unpacker.do_read = read_external */ - __pyx_t_4 = __Pyx_HasAttr(__pyx_v_file, __pyx_n_u_c_pickle); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 1078, __pyx_L1_error) + __pyx_t_4 = __Pyx_HasAttr(__pyx_v_file, __pyx_n_u_c_pickle); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(0, 1080, __pyx_L1_error) if (__pyx_t_4) { - /* "larch/pickle/pickle.pyx":1079 + /* "larch/pickle/pickle.pyx":1081 * self.unpacker.do_read = read_buffer * elif hasattr(file, "c_pickle"): * self.file = file.c_pickle() # <<<<<<<<<<<<<< * self.unpacker.do_read = read_external * else: */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_file, __pyx_n_s_c_pickle); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1079, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_file, __pyx_n_s_c_pickle); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1081, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_2 = NULL; __pyx_t_5 = 0; @@ -14072,7 +14096,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ PyObject *__pyx_callargs[2] = {__pyx_t_2, NULL}; __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 0+__pyx_t_5); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1079, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1081, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } @@ -14082,7 +14106,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ __pyx_v_self->file = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":1080 + /* "larch/pickle/pickle.pyx":1082 * elif hasattr(file, "c_pickle"): * self.file = file.c_pickle() * self.unpacker.do_read = read_external # <<<<<<<<<<<<<< @@ -14091,7 +14115,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ */ __pyx_v_self->unpacker->do_read = __pyx_f_5larch_6pickle_6pickle_read_external; - /* "larch/pickle/pickle.pyx":1078 + /* "larch/pickle/pickle.pyx":1080 * self.file = _BufferContainer().set(file) * self.unpacker.do_read = read_buffer * elif hasattr(file, "c_pickle"): # <<<<<<<<<<<<<< @@ -14101,7 +14125,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ goto __pyx_L4; } - /* "larch/pickle/pickle.pyx":1082 + /* "larch/pickle/pickle.pyx":1084 * self.unpacker.do_read = read_external * else: * self.file = _FileLike(file) # <<<<<<<<<<<<<< @@ -14109,7 +14133,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ * */ /*else*/ { - __pyx_t_1 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle__FileLike), __pyx_v_file); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1082, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle__FileLike), __pyx_v_file); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1084, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_GIVEREF(__pyx_t_1); __Pyx_GOTREF(__pyx_v_self->file); @@ -14117,7 +14141,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ __pyx_v_self->file = __pyx_t_1; __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":1083 + /* "larch/pickle/pickle.pyx":1085 * else: * self.file = _FileLike(file) * self.unpacker.do_read = read_file # <<<<<<<<<<<<<< @@ -14128,7 +14152,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ } __pyx_L4:; - /* "larch/pickle/pickle.pyx":1062 + /* "larch/pickle/pickle.pyx":1064 * public bool secure * * def __init__(self, file=b"", bool secure=False): # <<<<<<<<<<<<<< @@ -14150,7 +14174,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler___init__(struct __pyx_obj_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":1086 +/* "larch/pickle/pickle.pyx":1088 * * * def __dealloc__(self): # <<<<<<<<<<<<<< @@ -14173,7 +14197,7 @@ static void __pyx_pw_5larch_6pickle_6pickle_9Unpickler_3__dealloc__(PyObject *__ static void __pyx_pf_5larch_6pickle_6pickle_9Unpickler_2__dealloc__(struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *__pyx_v_self) { - /* "larch/pickle/pickle.pyx":1087 + /* "larch/pickle/pickle.pyx":1089 * * def __dealloc__(self): * del self.unpacker # <<<<<<<<<<<<<< @@ -14182,7 +14206,7 @@ static void __pyx_pf_5larch_6pickle_6pickle_9Unpickler_2__dealloc__(struct __pyx */ delete __pyx_v_self->unpacker; - /* "larch/pickle/pickle.pyx":1086 + /* "larch/pickle/pickle.pyx":1088 * * * def __dealloc__(self): # <<<<<<<<<<<<<< @@ -14193,7 +14217,7 @@ static void __pyx_pf_5larch_6pickle_6pickle_9Unpickler_2__dealloc__(struct __pyx /* function exit code */ } -/* "larch/pickle/pickle.pyx":1089 +/* "larch/pickle/pickle.pyx":1091 * del self.unpacker * * cdef int set_protocol(self, uint8_t protocol): # <<<<<<<<<<<<<< @@ -14205,7 +14229,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol(struct __pyx_o int __pyx_r; int __pyx_t_1; - /* "larch/pickle/pickle.pyx":1090 + /* "larch/pickle/pickle.pyx":1092 * * cdef int set_protocol(self, uint8_t protocol): * if protocol < 3: # <<<<<<<<<<<<<< @@ -14215,7 +14239,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol(struct __pyx_o __pyx_t_1 = (__pyx_v_protocol < 3); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":1091 + /* "larch/pickle/pickle.pyx":1093 * cdef int set_protocol(self, uint8_t protocol): * if protocol < 3: * self.default_find_class = mapped_find_class # <<<<<<<<<<<<<< @@ -14224,7 +14248,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol(struct __pyx_o */ __pyx_v_self->default_find_class = __pyx_f_5larch_6pickle_6pickle_mapped_find_class; - /* "larch/pickle/pickle.pyx":1090 + /* "larch/pickle/pickle.pyx":1092 * * cdef int set_protocol(self, uint8_t protocol): * if protocol < 3: # <<<<<<<<<<<<<< @@ -14234,7 +14258,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol(struct __pyx_o goto __pyx_L3; } - /* "larch/pickle/pickle.pyx":1093 + /* "larch/pickle/pickle.pyx":1095 * self.default_find_class = mapped_find_class * else: * self.default_find_class = simple_find_class # <<<<<<<<<<<<<< @@ -14246,7 +14270,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol(struct __pyx_o } __pyx_L3:; - /* "larch/pickle/pickle.pyx":1094 + /* "larch/pickle/pickle.pyx":1096 * else: * self.default_find_class = simple_find_class * if protocol < 4: # <<<<<<<<<<<<<< @@ -14256,7 +14280,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol(struct __pyx_o __pyx_t_1 = (__pyx_v_protocol < 4); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":1095 + /* "larch/pickle/pickle.pyx":1097 * self.default_find_class = simple_find_class * if protocol < 4: * self.unpacker.min_string_size_for_ref = 5; # <<<<<<<<<<<<<< @@ -14265,7 +14289,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol(struct __pyx_o */ __pyx_v_self->unpacker->min_string_size_for_ref = 5; - /* "larch/pickle/pickle.pyx":1094 + /* "larch/pickle/pickle.pyx":1096 * else: * self.default_find_class = simple_find_class * if protocol < 4: # <<<<<<<<<<<<<< @@ -14275,7 +14299,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol(struct __pyx_o goto __pyx_L4; } - /* "larch/pickle/pickle.pyx":1097 + /* "larch/pickle/pickle.pyx":1099 * self.unpacker.min_string_size_for_ref = 5; * else: * self.unpacker.min_string_size_for_ref = 3; # <<<<<<<<<<<<<< @@ -14287,7 +14311,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol(struct __pyx_o } __pyx_L4:; - /* "larch/pickle/pickle.pyx":1089 + /* "larch/pickle/pickle.pyx":1091 * del self.unpacker * * cdef int set_protocol(self, uint8_t protocol): # <<<<<<<<<<<<<< @@ -14300,7 +14324,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol(struct __pyx_o return __pyx_r; } -/* "larch/pickle/pickle.pyx":1099 +/* "larch/pickle/pickle.pyx":1101 * self.unpacker.min_string_size_for_ref = 3; * * cdef object unpack_import(self, size_t size): # <<<<<<<<<<<<<< @@ -14329,7 +14353,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct int __pyx_clineno = 0; __Pyx_RefNannySetupContext("unpack_import", 1); - /* "larch/pickle/pickle.pyx":1104 + /* "larch/pickle/pickle.pyx":1106 * PyObject *key * * if size == 0: # <<<<<<<<<<<<<< @@ -14339,7 +14363,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_t_1 = (__pyx_v_size == 0); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":1105 + /* "larch/pickle/pickle.pyx":1107 * * if size == 0: * self.unpacker.read32(&rcode) # <<<<<<<<<<<<<< @@ -14348,14 +14372,14 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct */ __pyx_v_self->unpacker->read32((&__pyx_v_rcode)); - /* "larch/pickle/pickle.pyx":1106 + /* "larch/pickle/pickle.pyx":1108 * if size == 0: * self.unpacker.read32(&rcode) * ocode = rcode # <<<<<<<<<<<<<< * key = PyDict_GetItem(extension_cache, ocode) * if key is not NULL: */ - __pyx_t_2 = __Pyx_PyInt_From_uint32_t(((uint32_t)__pyx_v_rcode)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1106, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyInt_From_uint32_t(((uint32_t)__pyx_v_rcode)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1108, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = __pyx_t_2; __Pyx_INCREF(__pyx_t_3); @@ -14363,7 +14387,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_v_ocode = __pyx_t_3; __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1107 + /* "larch/pickle/pickle.pyx":1109 * self.unpacker.read32(&rcode) * ocode = rcode * key = PyDict_GetItem(extension_cache, ocode) # <<<<<<<<<<<<<< @@ -14375,7 +14399,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_v_key = PyDict_GetItem(__pyx_t_3, __pyx_v_ocode); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1108 + /* "larch/pickle/pickle.pyx":1110 * ocode = rcode * key = PyDict_GetItem(extension_cache, ocode) * if key is not NULL: # <<<<<<<<<<<<<< @@ -14385,7 +14409,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_t_1 = (__pyx_v_key != NULL); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":1109 + /* "larch/pickle/pickle.pyx":1111 * key = PyDict_GetItem(extension_cache, ocode) * if key is not NULL: * return key # <<<<<<<<<<<<<< @@ -14397,7 +14421,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_r = ((PyObject *)__pyx_v_key); goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1108 + /* "larch/pickle/pickle.pyx":1110 * ocode = rcode * key = PyDict_GetItem(extension_cache, ocode) * if key is not NULL: # <<<<<<<<<<<<<< @@ -14406,7 +14430,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct */ } - /* "larch/pickle/pickle.pyx":1111 + /* "larch/pickle/pickle.pyx":1113 * return key * * key = PyDict_GetItem(inverted_registry, ocode) # <<<<<<<<<<<<<< @@ -14418,7 +14442,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_v_key = PyDict_GetItem(__pyx_t_3, __pyx_v_ocode); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1112 + /* "larch/pickle/pickle.pyx":1114 * * key = PyDict_GetItem(inverted_registry, ocode) * if key is NULL: # <<<<<<<<<<<<<< @@ -14428,23 +14452,23 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_t_1 = (__pyx_v_key == NULL); if (unlikely(__pyx_t_1)) { - /* "larch/pickle/pickle.pyx":1113 + /* "larch/pickle/pickle.pyx":1115 * key = PyDict_GetItem(inverted_registry, ocode) * if key is NULL: * raise KeyError(rcode) # <<<<<<<<<<<<<< * * module, name = key */ - __pyx_t_3 = __Pyx_PyInt_From_uint32_t(__pyx_v_rcode); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1113, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_uint32_t(__pyx_v_rcode); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1115, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_builtin_KeyError, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1113, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_builtin_KeyError, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1115, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_Raise(__pyx_t_2, 0, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __PYX_ERR(0, 1113, __pyx_L1_error) + __PYX_ERR(0, 1115, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":1112 + /* "larch/pickle/pickle.pyx":1114 * * key = PyDict_GetItem(inverted_registry, ocode) * if key is NULL: # <<<<<<<<<<<<<< @@ -14453,7 +14477,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct */ } - /* "larch/pickle/pickle.pyx":1115 + /* "larch/pickle/pickle.pyx":1117 * raise KeyError(rcode) * * module, name = key # <<<<<<<<<<<<<< @@ -14468,7 +14492,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct if (unlikely(size != 2)) { if (size > 2) __Pyx_RaiseTooManyValuesError(2); else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); - __PYX_ERR(0, 1115, __pyx_L1_error) + __PYX_ERR(0, 1117, __pyx_L1_error) } #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS if (likely(PyTuple_CheckExact(sequence))) { @@ -14481,15 +14505,15 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __Pyx_INCREF(__pyx_t_3); __Pyx_INCREF(__pyx_t_4); #else - __pyx_t_3 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1115, __pyx_L1_error) + __pyx_t_3 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1117, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1115, __pyx_L1_error) + __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1117, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); #endif __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } else { Py_ssize_t index = -1; - __pyx_t_5 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1115, __pyx_L1_error) + __pyx_t_5 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1117, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_6 = __Pyx_PyObject_GetIterNextFunc(__pyx_t_5); @@ -14497,7 +14521,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __Pyx_GOTREF(__pyx_t_3); index = 1; __pyx_t_4 = __pyx_t_6(__pyx_t_5); if (unlikely(!__pyx_t_4)) goto __pyx_L6_unpacking_failed; __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_IternextUnpackEndCheck(__pyx_t_6(__pyx_t_5), 2) < 0) __PYX_ERR(0, 1115, __pyx_L1_error) + if (__Pyx_IternextUnpackEndCheck(__pyx_t_6(__pyx_t_5), 2) < 0) __PYX_ERR(0, 1117, __pyx_L1_error) __pyx_t_6 = NULL; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; goto __pyx_L7_unpacking_done; @@ -14505,7 +14529,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_t_6 = NULL; if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); - __PYX_ERR(0, 1115, __pyx_L1_error) + __PYX_ERR(0, 1117, __pyx_L1_error) __pyx_L7_unpacking_done:; } __pyx_v_module = __pyx_t_3; @@ -14513,19 +14537,19 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_v_name = __pyx_t_4; __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":1116 + /* "larch/pickle/pickle.pyx":1118 * * module, name = key * obj = self.call_find_class(self, module, name) # <<<<<<<<<<<<<< * extension_cache[ocode] = obj * return obj */ - __pyx_t_2 = __pyx_v_self->call_find_class(__pyx_v_self, __pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1116, __pyx_L1_error) + __pyx_t_2 = __pyx_v_self->call_find_class(__pyx_v_self, __pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1118, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_v_obj = __pyx_t_2; __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":1117 + /* "larch/pickle/pickle.pyx":1119 * module, name = key * obj = self.call_find_class(self, module, name) * extension_cache[ocode] = obj # <<<<<<<<<<<<<< @@ -14534,11 +14558,11 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct */ if (unlikely(__pyx_v_5larch_6pickle_6pickle_extension_cache == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable"); - __PYX_ERR(0, 1117, __pyx_L1_error) + __PYX_ERR(0, 1119, __pyx_L1_error) } - if (unlikely((PyDict_SetItem(__pyx_v_5larch_6pickle_6pickle_extension_cache, __pyx_v_ocode, __pyx_v_obj) < 0))) __PYX_ERR(0, 1117, __pyx_L1_error) + if (unlikely((PyDict_SetItem(__pyx_v_5larch_6pickle_6pickle_extension_cache, __pyx_v_ocode, __pyx_v_obj) < 0))) __PYX_ERR(0, 1119, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":1118 + /* "larch/pickle/pickle.pyx":1120 * obj = self.call_find_class(self, module, name) * extension_cache[ocode] = obj * return obj # <<<<<<<<<<<<<< @@ -14550,7 +14574,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_r = __pyx_v_obj; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1104 + /* "larch/pickle/pickle.pyx":1106 * PyObject *key * * if size == 0: # <<<<<<<<<<<<<< @@ -14559,43 +14583,43 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct */ } - /* "larch/pickle/pickle.pyx":1120 + /* "larch/pickle/pickle.pyx":1122 * return obj * * module = self.unpacker.load_object() # <<<<<<<<<<<<<< * name = self.unpacker.load_object() * imported = self.call_find_class(self, module, name) */ - __pyx_t_2 = __pyx_v_self->unpacker->load(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1120, __pyx_L1_error) + __pyx_t_2 = __pyx_v_self->unpacker->load(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1122, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_v_module = __pyx_t_2; __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":1121 + /* "larch/pickle/pickle.pyx":1123 * * module = self.unpacker.load_object() * name = self.unpacker.load_object() # <<<<<<<<<<<<<< * imported = self.call_find_class(self, module, name) * if self.secure: */ - __pyx_t_2 = __pyx_v_self->unpacker->load(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1121, __pyx_L1_error) + __pyx_t_2 = __pyx_v_self->unpacker->load(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1123, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_v_name = __pyx_t_2; __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":1122 + /* "larch/pickle/pickle.pyx":1124 * module = self.unpacker.load_object() * name = self.unpacker.load_object() * imported = self.call_find_class(self, module, name) # <<<<<<<<<<<<<< * if self.secure: * self.verify_object(module, name, imported) */ - __pyx_t_2 = __pyx_v_self->call_find_class(__pyx_v_self, __pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1122, __pyx_L1_error) + __pyx_t_2 = __pyx_v_self->call_find_class(__pyx_v_self, __pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1124, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_v_imported = __pyx_t_2; __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":1123 + /* "larch/pickle/pickle.pyx":1125 * name = self.unpacker.load_object() * imported = self.call_find_class(self, module, name) * if self.secure: # <<<<<<<<<<<<<< @@ -14605,18 +14629,18 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_t_1 = (__pyx_v_self->secure != 0); if (__pyx_t_1) { - /* "larch/pickle/pickle.pyx":1124 + /* "larch/pickle/pickle.pyx":1126 * imported = self.call_find_class(self, module, name) * if self.secure: * self.verify_object(module, name, imported) # <<<<<<<<<<<<<< * * return imported */ - __pyx_t_2 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)__pyx_v_self->__pyx_vtab)->verify_object(__pyx_v_self, __pyx_v_module, __pyx_v_name, __pyx_v_imported, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1124, __pyx_L1_error) + __pyx_t_2 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)__pyx_v_self->__pyx_vtab)->verify_object(__pyx_v_self, __pyx_v_module, __pyx_v_name, __pyx_v_imported, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1126, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":1123 + /* "larch/pickle/pickle.pyx":1125 * name = self.unpacker.load_object() * imported = self.call_find_class(self, module, name) * if self.secure: # <<<<<<<<<<<<<< @@ -14625,7 +14649,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct */ } - /* "larch/pickle/pickle.pyx":1126 + /* "larch/pickle/pickle.pyx":1128 * self.verify_object(module, name, imported) * * return imported # <<<<<<<<<<<<<< @@ -14637,7 +14661,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct __pyx_r = __pyx_v_imported; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1099 + /* "larch/pickle/pickle.pyx":1101 * self.unpacker.min_string_size_for_ref = 3; * * cdef object unpack_import(self, size_t size): # <<<<<<<<<<<<<< @@ -14664,7 +14688,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import(struct return __pyx_r; } -/* "larch/pickle/pickle.pyx":1128 +/* "larch/pickle/pickle.pyx":1130 * return imported * * cdef int check_init(self) except -1: # <<<<<<<<<<<<<< @@ -14682,13 +14706,13 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_check_init(struct __pyx_obj PyObject *__pyx_t_5 = NULL; PyObject *__pyx_t_6 = NULL; PyObject *__pyx_t_7 = NULL; - int __pyx_t_8; + unsigned int __pyx_t_8; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("check_init", 1); - /* "larch/pickle/pickle.pyx":1129 + /* "larch/pickle/pickle.pyx":1131 * * cdef int check_init(self) except -1: * if self.file is None: # <<<<<<<<<<<<<< @@ -14698,34 +14722,34 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_check_init(struct __pyx_obj __pyx_t_1 = (__pyx_v_self->file == Py_None); if (unlikely(__pyx_t_1)) { - /* "larch/pickle/pickle.pyx":1130 + /* "larch/pickle/pickle.pyx":1132 * cdef int check_init(self) except -1: * if self.file is None: * raise UnpicklingError( # <<<<<<<<<<<<<< * "Unpickler.__init__() was not called by " * "{}.__init__()".format((self.__class__.__name__,))) */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1130, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1132, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - /* "larch/pickle/pickle.pyx":1132 + /* "larch/pickle/pickle.pyx":1134 * raise UnpicklingError( * "Unpickler.__init__() was not called by " * "{}.__init__()".format((self.__class__.__name__,))) # <<<<<<<<<<<<<< * * def find_class(self, str module, str name): */ - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_Unpickler___init___was_not_calle, __pyx_n_s_format); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1132, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_Unpickler___init___was_not_calle, __pyx_n_s_format); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1134, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1132, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1134, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_name); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1132, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_name); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 1134, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1132, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 1134, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_GIVEREF(__pyx_t_7); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_7)) __PYX_ERR(0, 1132, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_7)) __PYX_ERR(0, 1134, __pyx_L1_error); __pyx_t_7 = 0; __pyx_t_7 = NULL; __pyx_t_8 = 0; @@ -14746,7 +14770,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_check_init(struct __pyx_obj __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_8, 1+__pyx_t_8); __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1132, __pyx_L1_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1134, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } @@ -14769,15 +14793,15 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_check_init(struct __pyx_obj __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_8, 1+__pyx_t_8); __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1130, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1132, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_Raise(__pyx_t_2, 0, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __PYX_ERR(0, 1130, __pyx_L1_error) + __PYX_ERR(0, 1132, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":1129 + /* "larch/pickle/pickle.pyx":1131 * * cdef int check_init(self) except -1: * if self.file is None: # <<<<<<<<<<<<<< @@ -14786,7 +14810,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_check_init(struct __pyx_obj */ } - /* "larch/pickle/pickle.pyx":1128 + /* "larch/pickle/pickle.pyx":1130 * return imported * * cdef int check_init(self) except -1: # <<<<<<<<<<<<<< @@ -14811,7 +14835,7 @@ static int __pyx_f_5larch_6pickle_6pickle_9Unpickler_check_init(struct __pyx_obj return __pyx_r; } -/* "larch/pickle/pickle.pyx":1134 +/* "larch/pickle/pickle.pyx":1136 * "{}.__init__()".format((self.__class__.__name__,))) * * def find_class(self, str module, str name): # <<<<<<<<<<<<<< @@ -14875,7 +14899,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[0]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1134, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1136, __pyx_L3_error) else goto __pyx_L5_argtuple_error; CYTHON_FALLTHROUGH; case 1: @@ -14883,14 +14907,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[1]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1134, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1136, __pyx_L3_error) else { - __Pyx_RaiseArgtupleInvalid("find_class", 1, 2, 2, 1); __PYX_ERR(0, 1134, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("find_class", 1, 2, 2, 1); __PYX_ERR(0, 1136, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "find_class") < 0)) __PYX_ERR(0, 1134, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "find_class") < 0)) __PYX_ERR(0, 1136, __pyx_L3_error) } } else if (unlikely(__pyx_nargs != 2)) { goto __pyx_L5_argtuple_error; @@ -14903,7 +14927,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("find_class", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 1134, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("find_class", 1, 2, 2, __pyx_nargs); __PYX_ERR(0, 1136, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -14917,8 +14941,8 @@ PyObject *__pyx_args, PyObject *__pyx_kwds __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_module), (&PyUnicode_Type), 1, "module", 1))) __PYX_ERR(0, 1134, __pyx_L1_error) - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_name), (&PyUnicode_Type), 1, "name", 1))) __PYX_ERR(0, 1134, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_module), (&PyUnicode_Type), 1, "module", 1))) __PYX_ERR(0, 1136, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_name), (&PyUnicode_Type), 1, "name", 1))) __PYX_ERR(0, 1136, __pyx_L1_error) __pyx_r = __pyx_pf_5larch_6pickle_6pickle_9Unpickler_4find_class(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_self), __pyx_v_module, __pyx_v_name); /* function exit code */ @@ -14945,7 +14969,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_4find_class(struct _ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("find_class", 1); - /* "larch/pickle/pickle.pyx":1135 + /* "larch/pickle/pickle.pyx":1137 * * def find_class(self, str module, str name): * return self.default_find_class(module, name) # <<<<<<<<<<<<<< @@ -14953,13 +14977,13 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_4find_class(struct _ * def load(self): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __pyx_v_self->default_find_class(__pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1135, __pyx_L1_error) + __pyx_t_1 = __pyx_v_self->default_find_class(__pyx_v_module, __pyx_v_name); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1137, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1134 + /* "larch/pickle/pickle.pyx":1136 * "{}.__init__()".format((self.__class__.__name__,))) * * def find_class(self, str module, str name): # <<<<<<<<<<<<<< @@ -14978,7 +15002,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_4find_class(struct _ return __pyx_r; } -/* "larch/pickle/pickle.pyx":1137 +/* "larch/pickle/pickle.pyx":1139 * return self.default_find_class(module, name) * * def load(self): # <<<<<<<<<<<<<< @@ -15020,16 +15044,16 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_6load(struct __pyx_o int __pyx_clineno = 0; __Pyx_RefNannySetupContext("load", 1); - /* "larch/pickle/pickle.pyx":1138 + /* "larch/pickle/pickle.pyx":1140 * * def load(self): * self.check_init() # <<<<<<<<<<<<<< * try: * return self.unpacker.first_load() */ - __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)__pyx_v_self->__pyx_vtab)->check_init(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 1138, __pyx_L1_error) + __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)__pyx_v_self->__pyx_vtab)->check_init(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 1140, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":1139 + /* "larch/pickle/pickle.pyx":1141 * def load(self): * self.check_init() * try: # <<<<<<<<<<<<<< @@ -15038,7 +15062,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_6load(struct __pyx_o */ /*try:*/ { - /* "larch/pickle/pickle.pyx":1140 + /* "larch/pickle/pickle.pyx":1142 * self.check_init() * try: * return self.unpacker.first_load() # <<<<<<<<<<<<<< @@ -15046,7 +15070,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_6load(struct __pyx_o * self.last_refcount = self.unpacker.reset() */ __Pyx_XDECREF(__pyx_r); - __pyx_t_2 = __pyx_v_self->unpacker->first_load(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1140, __pyx_L4_error) + __pyx_t_2 = __pyx_v_self->unpacker->first_load(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1142, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(((PyObject *)__pyx_t_2)); __pyx_r = __pyx_t_2; @@ -15054,7 +15078,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_6load(struct __pyx_o goto __pyx_L3_return; } - /* "larch/pickle/pickle.pyx":1142 + /* "larch/pickle/pickle.pyx":1144 * return self.unpacker.first_load() * finally: * self.last_refcount = self.unpacker.reset() # <<<<<<<<<<<<<< @@ -15104,7 +15128,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_6load(struct __pyx_o } } - /* "larch/pickle/pickle.pyx":1137 + /* "larch/pickle/pickle.pyx":1139 * return self.default_find_class(module, name) * * def load(self): # <<<<<<<<<<<<<< @@ -15123,7 +15147,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_6load(struct __pyx_o return __pyx_r; } -/* "larch/pickle/pickle.pyx":1144 +/* "larch/pickle/pickle.pyx":1146 * self.last_refcount = self.unpacker.reset() * * def loads(self, bytes obj): # <<<<<<<<<<<<<< @@ -15143,7 +15167,7 @@ static PyObject *__pyx_pw_5larch_6pickle_6pickle_9Unpickler_9loads(PyObject *__p __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("loads (wrapper)", 0); __pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs); - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_obj), (&PyBytes_Type), 1, "obj", 1))) __PYX_ERR(0, 1144, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_obj), (&PyBytes_Type), 1, "obj", 1))) __PYX_ERR(0, 1146, __pyx_L1_error) __pyx_r = __pyx_pf_5larch_6pickle_6pickle_9Unpickler_8loads(((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_v_self), ((PyObject*)__pyx_v_obj)); /* function exit code */ @@ -15173,27 +15197,27 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_8loads(struct __pyx_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("loads", 1); - /* "larch/pickle/pickle.pyx":1145 + /* "larch/pickle/pickle.pyx":1147 * * def loads(self, bytes obj): * self.check_init() # <<<<<<<<<<<<<< * (<_BufferContainer>self.file).set(obj) * try: */ - __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)__pyx_v_self->__pyx_vtab)->check_init(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 1145, __pyx_L1_error) + __pyx_t_1 = ((struct __pyx_vtabstruct_5larch_6pickle_6pickle_Unpickler *)__pyx_v_self->__pyx_vtab)->check_init(__pyx_v_self); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(0, 1147, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":1146 + /* "larch/pickle/pickle.pyx":1148 * def loads(self, bytes obj): * self.check_init() * (<_BufferContainer>self.file).set(obj) # <<<<<<<<<<<<<< * try: * return self.unpacker.first_load() */ - __pyx_t_2 = ((PyObject *)((struct __pyx_vtabstruct_5larch_6pickle_6pickle__BufferContainer *)((struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *)__pyx_v_self->file)->__pyx_vtab)->set(((struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *)__pyx_v_self->file), __pyx_v_obj)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1146, __pyx_L1_error) + __pyx_t_2 = ((PyObject *)((struct __pyx_vtabstruct_5larch_6pickle_6pickle__BufferContainer *)((struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *)__pyx_v_self->file)->__pyx_vtab)->set(((struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *)__pyx_v_self->file), __pyx_v_obj)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1148, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":1147 + /* "larch/pickle/pickle.pyx":1149 * self.check_init() * (<_BufferContainer>self.file).set(obj) * try: # <<<<<<<<<<<<<< @@ -15202,7 +15226,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_8loads(struct __pyx_ */ /*try:*/ { - /* "larch/pickle/pickle.pyx":1148 + /* "larch/pickle/pickle.pyx":1150 * (<_BufferContainer>self.file).set(obj) * try: * return self.unpacker.first_load() # <<<<<<<<<<<<<< @@ -15210,7 +15234,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_8loads(struct __pyx_ * self.last_refcount = self.unpacker.reset() */ __Pyx_XDECREF(__pyx_r); - __pyx_t_2 = __pyx_v_self->unpacker->first_load(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1148, __pyx_L4_error) + __pyx_t_2 = __pyx_v_self->unpacker->first_load(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1150, __pyx_L4_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(((PyObject *)__pyx_t_2)); __pyx_r = __pyx_t_2; @@ -15218,7 +15242,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_8loads(struct __pyx_ goto __pyx_L3_return; } - /* "larch/pickle/pickle.pyx":1150 + /* "larch/pickle/pickle.pyx":1152 * return self.unpacker.first_load() * finally: * self.last_refcount = self.unpacker.reset() # <<<<<<<<<<<<<< @@ -15268,7 +15292,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_8loads(struct __pyx_ } } - /* "larch/pickle/pickle.pyx":1144 + /* "larch/pickle/pickle.pyx":1146 * self.last_refcount = self.unpacker.reset() * * def loads(self, bytes obj): # <<<<<<<<<<<<<< @@ -15287,7 +15311,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_8loads(struct __pyx_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":1152 +/* "larch/pickle/pickle.pyx":1154 * self.last_refcount = self.unpacker.reset() * * cpdef verify_object(self, module, name, obj): # <<<<<<<<<<<<<< @@ -15310,13 +15334,14 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_t_6; int __pyx_t_7; PyObject *__pyx_t_8 = NULL; PyObject *__pyx_t_9 = NULL; PyObject *__pyx_t_10 = NULL; int __pyx_t_11; + int __pyx_t_12; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; @@ -15330,7 +15355,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ if (unlikely(!__Pyx_object_dict_version_matches(((PyObject *)__pyx_v_self), __pyx_tp_dict_version, __pyx_obj_dict_version))) { PY_UINT64_T __pyx_typedict_guard = __Pyx_get_tp_dict_version(((PyObject *)__pyx_v_self)); #endif - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_verify_object); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1152, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_verify_object); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1154, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); if (!__Pyx_IsSameCFunction(__pyx_t_1, (void*) __pyx_pw_5larch_6pickle_6pickle_9Unpickler_11verify_object)) { __Pyx_XDECREF(__pyx_r); @@ -15353,7 +15378,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ PyObject *__pyx_callargs[4] = {__pyx_t_4, __pyx_v_module, __pyx_v_name, __pyx_v_obj}; __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 3+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1152, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1154, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } @@ -15375,7 +15400,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ #endif } - /* "larch/pickle/pickle.pyx":1153 + /* "larch/pickle/pickle.pyx":1155 * * cpdef verify_object(self, module, name, obj): * if (module not in secure_modules and obj not in secure_objects # <<<<<<<<<<<<<< @@ -15384,16 +15409,16 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ */ if (unlikely(__pyx_v_5larch_6pickle_6pickle_secure_modules == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); - __PYX_ERR(0, 1153, __pyx_L1_error) + __PYX_ERR(0, 1155, __pyx_L1_error) } - __pyx_t_7 = (__Pyx_PySet_ContainsTF(__pyx_v_module, __pyx_v_5larch_6pickle_6pickle_secure_modules, Py_NE)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1153, __pyx_L1_error) + __pyx_t_7 = (__Pyx_PySet_ContainsTF(__pyx_v_module, __pyx_v_5larch_6pickle_6pickle_secure_modules, Py_NE)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1155, __pyx_L1_error) if (__pyx_t_7) { } else { __pyx_t_6 = __pyx_t_7; goto __pyx_L4_bool_binop_done; } - /* "larch/pickle/pickle.pyx":1154 + /* "larch/pickle/pickle.pyx":1156 * cpdef verify_object(self, module, name, obj): * if (module not in secure_modules and obj not in secure_objects * and PyDict_GetItem(extension_registry, (module, name)) is NULL): # <<<<<<<<<<<<<< @@ -15402,9 +15427,9 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ */ if (unlikely(__pyx_v_5larch_6pickle_6pickle_secure_objects == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); - __PYX_ERR(0, 1153, __pyx_L1_error) + __PYX_ERR(0, 1155, __pyx_L1_error) } - __pyx_t_7 = (__Pyx_PySet_ContainsTF(__pyx_v_obj, __pyx_v_5larch_6pickle_6pickle_secure_objects, Py_NE)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1153, __pyx_L1_error) + __pyx_t_7 = (__Pyx_PySet_ContainsTF(__pyx_v_obj, __pyx_v_5larch_6pickle_6pickle_secure_objects, Py_NE)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1155, __pyx_L1_error) if (__pyx_t_7) { } else { __pyx_t_6 = __pyx_t_7; @@ -15412,21 +15437,21 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ } __pyx_t_1 = __pyx_v_5larch_6pickle_6pickle_extension_registry; __Pyx_INCREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1154, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1156, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_module); __Pyx_GIVEREF(__pyx_v_module); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_module)) __PYX_ERR(0, 1154, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_module)) __PYX_ERR(0, 1156, __pyx_L1_error); __Pyx_INCREF(__pyx_v_name); __Pyx_GIVEREF(__pyx_v_name); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_name)) __PYX_ERR(0, 1154, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_name)) __PYX_ERR(0, 1156, __pyx_L1_error); __pyx_t_7 = (PyDict_GetItem(__pyx_t_1, __pyx_t_2) == NULL); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_6 = __pyx_t_7; __pyx_L4_bool_binop_done:; - /* "larch/pickle/pickle.pyx":1153 + /* "larch/pickle/pickle.pyx":1155 * * cpdef verify_object(self, module, name, obj): * if (module not in secure_modules and obj not in secure_objects # <<<<<<<<<<<<<< @@ -15435,20 +15460,20 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ */ if (__pyx_t_6) { - /* "larch/pickle/pickle.pyx":1156 + /* "larch/pickle/pickle.pyx":1158 * and PyDict_GetItem(extension_registry, (module, name)) is NULL): * * if getattr(obj, "__pickle_secure__", False): # <<<<<<<<<<<<<< * try: * secure_objects.add(obj) */ - __pyx_t_2 = __Pyx_GetAttr3(__pyx_v_obj, __pyx_n_u_pickle_secure, Py_False); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1156, __pyx_L1_error) + __pyx_t_2 = __Pyx_GetAttr3(__pyx_v_obj, __pyx_n_u_pickle_secure, Py_False); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1158, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely((__pyx_t_6 < 0))) __PYX_ERR(0, 1156, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely((__pyx_t_6 < 0))) __PYX_ERR(0, 1158, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (__pyx_t_6) { - /* "larch/pickle/pickle.pyx":1157 + /* "larch/pickle/pickle.pyx":1159 * * if getattr(obj, "__pickle_secure__", False): * try: # <<<<<<<<<<<<<< @@ -15464,7 +15489,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ __Pyx_XGOTREF(__pyx_t_10); /*try:*/ { - /* "larch/pickle/pickle.pyx":1158 + /* "larch/pickle/pickle.pyx":1160 * if getattr(obj, "__pickle_secure__", False): * try: * secure_objects.add(obj) # <<<<<<<<<<<<<< @@ -15473,11 +15498,11 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ */ if (unlikely(__pyx_v_5larch_6pickle_6pickle_secure_objects == Py_None)) { PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "add"); - __PYX_ERR(0, 1158, __pyx_L8_error) + __PYX_ERR(0, 1160, __pyx_L8_error) } - __pyx_t_11 = PySet_Add(__pyx_v_5larch_6pickle_6pickle_secure_objects, __pyx_v_obj); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 1158, __pyx_L8_error) + __pyx_t_11 = PySet_Add(__pyx_v_5larch_6pickle_6pickle_secure_objects, __pyx_v_obj); if (unlikely(__pyx_t_11 == ((int)-1))) __PYX_ERR(0, 1160, __pyx_L8_error) - /* "larch/pickle/pickle.pyx":1157 + /* "larch/pickle/pickle.pyx":1159 * * if getattr(obj, "__pickle_secure__", False): * try: # <<<<<<<<<<<<<< @@ -15495,21 +15520,21 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":1159 + /* "larch/pickle/pickle.pyx":1161 * try: * secure_objects.add(obj) * except TypeError: # <<<<<<<<<<<<<< * pass * return */ - __pyx_t_5 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_TypeError); - if (__pyx_t_5) { + __pyx_t_12 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_TypeError); + if (__pyx_t_12) { __Pyx_ErrRestore(0,0,0); goto __pyx_L9_exception_handled; } goto __pyx_L10_except_error; - /* "larch/pickle/pickle.pyx":1157 + /* "larch/pickle/pickle.pyx":1159 * * if getattr(obj, "__pickle_secure__", False): * try: # <<<<<<<<<<<<<< @@ -15530,7 +15555,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ __pyx_L13_try_end:; } - /* "larch/pickle/pickle.pyx":1161 + /* "larch/pickle/pickle.pyx":1163 * except TypeError: * pass * return # <<<<<<<<<<<<<< @@ -15541,7 +15566,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1156 + /* "larch/pickle/pickle.pyx":1158 * and PyDict_GetItem(extension_registry, (module, name)) is NULL): * * if getattr(obj, "__pickle_secure__", False): # <<<<<<<<<<<<<< @@ -15550,7 +15575,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ */ } - /* "larch/pickle/pickle.pyx":1163 + /* "larch/pickle/pickle.pyx":1165 * return * * try: # <<<<<<<<<<<<<< @@ -15566,31 +15591,31 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ __Pyx_XGOTREF(__pyx_t_8); /*try:*/ { - /* "larch/pickle/pickle.pyx":1164 + /* "larch/pickle/pickle.pyx":1166 * * try: * add_module = getattr(pickle_register, "add_"+module.replace(".", "_")) # <<<<<<<<<<<<<< * except AttributeError: * pass */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_pickle_register); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1164, __pyx_L14_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_pickle_register); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1166, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_module, __pyx_n_s_replace); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1164, __pyx_L14_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_module, __pyx_n_s_replace); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1166, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1164, __pyx_L14_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1166, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyNumber_Add(__pyx_n_u_add, __pyx_t_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1164, __pyx_L14_error) + __pyx_t_1 = PyNumber_Add(__pyx_n_u_add, __pyx_t_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1166, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_GetAttr(__pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1164, __pyx_L14_error) + __pyx_t_3 = __Pyx_GetAttr(__pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1166, __pyx_L14_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_add_module = __pyx_t_3; __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1163 + /* "larch/pickle/pickle.pyx":1165 * return * * try: # <<<<<<<<<<<<<< @@ -15599,7 +15624,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ */ } - /* "larch/pickle/pickle.pyx":1168 + /* "larch/pickle/pickle.pyx":1170 * pass * else: * add_module() # <<<<<<<<<<<<<< @@ -15626,13 +15651,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ PyObject *__pyx_callargs[2] = {__pyx_t_2, NULL}; __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_1, __pyx_callargs+1-__pyx_t_5, 0+__pyx_t_5); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1168, __pyx_L16_except_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1170, __pyx_L16_except_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1169 + /* "larch/pickle/pickle.pyx":1171 * else: * add_module() * if obj in secure_objects: # <<<<<<<<<<<<<< @@ -15641,12 +15666,12 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ */ if (unlikely(__pyx_v_5larch_6pickle_6pickle_secure_objects == Py_None)) { PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); - __PYX_ERR(0, 1169, __pyx_L16_except_error) + __PYX_ERR(0, 1171, __pyx_L16_except_error) } - __pyx_t_6 = (__Pyx_PySet_ContainsTF(__pyx_v_obj, __pyx_v_5larch_6pickle_6pickle_secure_objects, Py_EQ)); if (unlikely((__pyx_t_6 < 0))) __PYX_ERR(0, 1169, __pyx_L16_except_error) + __pyx_t_6 = (__Pyx_PySet_ContainsTF(__pyx_v_obj, __pyx_v_5larch_6pickle_6pickle_secure_objects, Py_EQ)); if (unlikely((__pyx_t_6 < 0))) __PYX_ERR(0, 1171, __pyx_L16_except_error) if (__pyx_t_6) { - /* "larch/pickle/pickle.pyx":1170 + /* "larch/pickle/pickle.pyx":1172 * add_module() * if obj in secure_objects: * return # <<<<<<<<<<<<<< @@ -15657,7 +15682,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L17_except_return; - /* "larch/pickle/pickle.pyx":1169 + /* "larch/pickle/pickle.pyx":1171 * else: * add_module() * if obj in secure_objects: # <<<<<<<<<<<<<< @@ -15676,21 +15701,21 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":1165 + /* "larch/pickle/pickle.pyx":1167 * try: * add_module = getattr(pickle_register, "add_"+module.replace(".", "_")) * except AttributeError: # <<<<<<<<<<<<<< * pass * else: */ - __pyx_t_5 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_AttributeError); - if (__pyx_t_5) { + __pyx_t_12 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_AttributeError); + if (__pyx_t_12) { __Pyx_ErrRestore(0,0,0); goto __pyx_L15_exception_handled; } goto __pyx_L16_except_error; - /* "larch/pickle/pickle.pyx":1163 + /* "larch/pickle/pickle.pyx":1165 * return * * try: # <<<<<<<<<<<<<< @@ -15717,47 +15742,47 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ __pyx_L19_try_end:; } - /* "larch/pickle/pickle.pyx":1172 + /* "larch/pickle/pickle.pyx":1174 * return * * logger.error("SecurityError %r %r", obj, module, stack_info=True) # <<<<<<<<<<<<<< * raise SecurityError("object not save for loading", obj, module) * */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_logger); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1172, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_logger); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1174, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_error); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1172, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_error); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1174, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1172, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1174, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_kp_u_SecurityError_r_r); __Pyx_GIVEREF(__pyx_kp_u_SecurityError_r_r); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_u_SecurityError_r_r)) __PYX_ERR(0, 1172, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_u_SecurityError_r_r)) __PYX_ERR(0, 1174, __pyx_L1_error); __Pyx_INCREF(__pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_obj)) __PYX_ERR(0, 1172, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_obj)) __PYX_ERR(0, 1174, __pyx_L1_error); __Pyx_INCREF(__pyx_v_module); __Pyx_GIVEREF(__pyx_v_module); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_v_module)) __PYX_ERR(0, 1172, __pyx_L1_error); - __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1172, __pyx_L1_error) + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_v_module)) __PYX_ERR(0, 1174, __pyx_L1_error); + __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1174, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_stack_info, Py_True) < 0) __PYX_ERR(0, 1172, __pyx_L1_error) - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1172, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_stack_info, Py_True) < 0) __PYX_ERR(0, 1174, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1174, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":1173 + /* "larch/pickle/pickle.pyx":1175 * * logger.error("SecurityError %r %r", obj, module, stack_info=True) * raise SecurityError("object not save for loading", obj, module) # <<<<<<<<<<<<<< * * */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_SecurityError); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1173, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_SecurityError); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1175, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_5 = 0; @@ -15777,15 +15802,15 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ PyObject *__pyx_callargs[4] = {__pyx_t_3, __pyx_kp_u_object_not_save_for_loading, __pyx_v_obj, __pyx_v_module}; __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_5, 3+__pyx_t_5); __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1173, __pyx_L1_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1175, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } __Pyx_Raise(__pyx_t_4, 0, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __PYX_ERR(0, 1173, __pyx_L1_error) + __PYX_ERR(0, 1175, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":1153 + /* "larch/pickle/pickle.pyx":1155 * * cpdef verify_object(self, module, name, obj): * if (module not in secure_modules and obj not in secure_objects # <<<<<<<<<<<<<< @@ -15794,7 +15819,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(CYTHON_ */ } - /* "larch/pickle/pickle.pyx":1152 + /* "larch/pickle/pickle.pyx":1154 * self.last_refcount = self.unpacker.reset() * * cpdef verify_object(self, module, name, obj): # <<<<<<<<<<<<<< @@ -15878,7 +15903,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[0]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1152, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1154, __pyx_L3_error) else goto __pyx_L5_argtuple_error; CYTHON_FALLTHROUGH; case 1: @@ -15886,9 +15911,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[1]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1152, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1154, __pyx_L3_error) else { - __Pyx_RaiseArgtupleInvalid("verify_object", 1, 3, 3, 1); __PYX_ERR(0, 1152, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("verify_object", 1, 3, 3, 1); __PYX_ERR(0, 1154, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: @@ -15896,14 +15921,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[2]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1152, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1154, __pyx_L3_error) else { - __Pyx_RaiseArgtupleInvalid("verify_object", 1, 3, 3, 2); __PYX_ERR(0, 1152, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("verify_object", 1, 3, 3, 2); __PYX_ERR(0, 1154, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "verify_object") < 0)) __PYX_ERR(0, 1152, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "verify_object") < 0)) __PYX_ERR(0, 1154, __pyx_L3_error) } } else if (unlikely(__pyx_nargs != 3)) { goto __pyx_L5_argtuple_error; @@ -15918,7 +15943,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("verify_object", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 1152, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("verify_object", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 1154, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -15954,7 +15979,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_10verify_object(stru int __pyx_clineno = 0; __Pyx_RefNannySetupContext("verify_object", 1); __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(__pyx_v_self, __pyx_v_module, __pyx_v_name, __pyx_v_obj, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1152, __pyx_L1_error) + __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object(__pyx_v_self, __pyx_v_module, __pyx_v_name, __pyx_v_obj, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1154, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; @@ -15971,7 +15996,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_10verify_object(stru return __pyx_r; } -/* "larch/pickle/pickle.pyx":1059 +/* "larch/pickle/pickle.pyx":1061 * find_class_t call_find_class * default_find_class_t default_find_class * public uint32_t last_refcount # <<<<<<<<<<<<<< @@ -16003,7 +16028,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_13last_refcount___ge int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__get__", 1); __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyInt_From_uint32_t(__pyx_v_self->last_refcount); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1059, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyInt_From_uint32_t(__pyx_v_self->last_refcount); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1061, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; @@ -16041,7 +16066,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler_13last_refcount_2__set__(s int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; - __pyx_t_1 = __Pyx_PyInt_As_uint32_t(__pyx_v_value); if (unlikely((__pyx_t_1 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1059, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyInt_As_uint32_t(__pyx_v_value); if (unlikely((__pyx_t_1 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1061, __pyx_L1_error) __pyx_v_self->last_refcount = __pyx_t_1; /* function exit code */ @@ -16054,7 +16079,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler_13last_refcount_2__set__(s return __pyx_r; } -/* "larch/pickle/pickle.pyx":1060 +/* "larch/pickle/pickle.pyx":1062 * default_find_class_t default_find_class * public uint32_t last_refcount * public bool secure # <<<<<<<<<<<<<< @@ -16086,7 +16111,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_9Unpickler_6secure___get__(stru int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__get__", 1); __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_self->secure); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1060, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_self->secure); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1062, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; @@ -16124,7 +16149,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler_6secure_2__set__(struct __ int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_value); if (unlikely((__pyx_t_1 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1060, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_value); if (unlikely((__pyx_t_1 == ((bool)-1)) && PyErr_Occurred())) __PYX_ERR(0, 1062, __pyx_L1_error) __pyx_v_self->secure = __pyx_t_1; /* function exit code */ @@ -16137,7 +16162,7 @@ static int __pyx_pf_5larch_6pickle_6pickle_9Unpickler_6secure_2__set__(struct __ return __pyx_r; } -/* "larch/pickle/pickle.pyx":1176 +/* "larch/pickle/pickle.pyx":1178 * * * cpdef dumps(obj, protocol=-1, with_refs=True): # <<<<<<<<<<<<<< @@ -16161,7 +16186,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_dumps(PyObject *__pyx_v_obj, CYT PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; @@ -16175,7 +16200,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_dumps(PyObject *__pyx_v_obj, CYT } } - /* "larch/pickle/pickle.pyx":1177 + /* "larch/pickle/pickle.pyx":1179 * * cpdef dumps(obj, protocol=-1, with_refs=True): * return Pickler(protocol=protocol, with_refs=with_refs)\ # <<<<<<<<<<<<<< @@ -16184,37 +16209,37 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_dumps(PyObject *__pyx_v_obj, CYT */ __Pyx_XDECREF(__pyx_r); - /* "larch/pickle/pickle.pyx":1178 + /* "larch/pickle/pickle.pyx":1180 * cpdef dumps(obj, protocol=-1, with_refs=True): * return Pickler(protocol=protocol, with_refs=with_refs)\ * .dump(obj).get_output_string() # <<<<<<<<<<<<<< * * */ - __pyx_t_3 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1177, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - /* "larch/pickle/pickle.pyx":1177 + /* "larch/pickle/pickle.pyx":1179 * * cpdef dumps(obj, protocol=-1, with_refs=True): * return Pickler(protocol=protocol, with_refs=with_refs)\ # <<<<<<<<<<<<<< * .dump(obj).get_output_string() * */ - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_protocol, __pyx_v_protocol) < 0) __PYX_ERR(0, 1177, __pyx_L1_error) - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_with_refs, __pyx_v_with_refs) < 0) __PYX_ERR(0, 1177, __pyx_L1_error) - __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Pickler), __pyx_empty_tuple, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1177, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_protocol, __pyx_v_protocol) < 0) __PYX_ERR(0, 1179, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_with_refs, __pyx_v_with_refs) < 0) __PYX_ERR(0, 1179, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Pickler), __pyx_empty_tuple, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1179, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1178 + /* "larch/pickle/pickle.pyx":1180 * cpdef dumps(obj, protocol=-1, with_refs=True): * return Pickler(protocol=protocol, with_refs=with_refs)\ * .dump(obj).get_output_string() # <<<<<<<<<<<<<< * * */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_dump); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1178, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_dump); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1180, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_4 = NULL; @@ -16235,11 +16260,11 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_dumps(PyObject *__pyx_v_obj, CYT PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_obj}; __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1178, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1180, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_get_output_string); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1178, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_get_output_string); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1180, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = NULL; @@ -16260,7 +16285,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_dumps(PyObject *__pyx_v_obj, CYT PyObject *__pyx_callargs[2] = {__pyx_t_2, NULL}; __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 0+__pyx_t_5); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1178, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1180, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } @@ -16268,7 +16293,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_dumps(PyObject *__pyx_v_obj, CYT __pyx_t_1 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1176 + /* "larch/pickle/pickle.pyx":1178 * * * cpdef dumps(obj, protocol=-1, with_refs=True): # <<<<<<<<<<<<<< @@ -16351,26 +16376,26 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[0]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1176, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1178, __pyx_L3_error) else goto __pyx_L5_argtuple_error; CYTHON_FALLTHROUGH; case 1: if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_protocol); if (value) { values[1] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1176, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1178, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_with_refs); if (value) { values[2] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1176, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1178, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "dumps") < 0)) __PYX_ERR(0, 1176, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "dumps") < 0)) __PYX_ERR(0, 1178, __pyx_L3_error) } } else { switch (__pyx_nargs) { @@ -16389,7 +16414,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("dumps", 0, 1, 3, __pyx_nargs); __PYX_ERR(0, 1176, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("dumps", 0, 1, 3, __pyx_nargs); __PYX_ERR(0, 1178, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -16429,7 +16454,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_dumps(CYTHON_UNUSED PyObject *_ __pyx_t_2.__pyx_n = 2; __pyx_t_2.protocol = __pyx_v_protocol; __pyx_t_2.with_refs = __pyx_v_with_refs; - __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_dumps(__pyx_v_obj, 0, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1176, __pyx_L1_error) + __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_dumps(__pyx_v_obj, 0, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1178, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; @@ -16446,7 +16471,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_dumps(CYTHON_UNUSED PyObject *_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":1181 +/* "larch/pickle/pickle.pyx":1183 * * * cpdef dump(obj, file, protocol=-1): # <<<<<<<<<<<<<< @@ -16469,7 +16494,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_dump(PyObject *__pyx_v_obj, PyOb PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; + unsigned int __pyx_t_5; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; @@ -16480,26 +16505,26 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_dump(PyObject *__pyx_v_obj, PyOb } } - /* "larch/pickle/pickle.pyx":1182 + /* "larch/pickle/pickle.pyx":1184 * * cpdef dump(obj, file, protocol=-1): * Pickler(file, protocol=protocol).dump(obj) # <<<<<<<<<<<<<< * * */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1182, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1184, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_v_file); __Pyx_GIVEREF(__pyx_v_file); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_file)) __PYX_ERR(0, 1182, __pyx_L1_error); - __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1182, __pyx_L1_error) + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_file)) __PYX_ERR(0, 1184, __pyx_L1_error); + __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1184, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_protocol, __pyx_v_protocol) < 0) __PYX_ERR(0, 1182, __pyx_L1_error) - __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Pickler), __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1182, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_protocol, __pyx_v_protocol) < 0) __PYX_ERR(0, 1184, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Pickler), __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1184, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_dump); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1182, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_dump); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1184, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_4 = NULL; @@ -16520,13 +16545,13 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_dump(PyObject *__pyx_v_obj, PyOb PyObject *__pyx_callargs[2] = {__pyx_t_4, __pyx_v_obj}; __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1182, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1184, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "larch/pickle/pickle.pyx":1181 + /* "larch/pickle/pickle.pyx":1183 * * * cpdef dump(obj, file, protocol=-1): # <<<<<<<<<<<<<< @@ -16610,7 +16635,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[0]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1181, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1183, __pyx_L3_error) else goto __pyx_L5_argtuple_error; CYTHON_FALLTHROUGH; case 1: @@ -16618,21 +16643,21 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[1]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1181, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1183, __pyx_L3_error) else { - __Pyx_RaiseArgtupleInvalid("dump", 0, 2, 3, 1); __PYX_ERR(0, 1181, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("dump", 0, 2, 3, 1); __PYX_ERR(0, 1183, __pyx_L3_error) } CYTHON_FALLTHROUGH; case 2: if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_protocol); if (value) { values[2] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1181, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1183, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "dump") < 0)) __PYX_ERR(0, 1181, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "dump") < 0)) __PYX_ERR(0, 1183, __pyx_L3_error) } } else { switch (__pyx_nargs) { @@ -16650,7 +16675,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("dump", 0, 2, 3, __pyx_nargs); __PYX_ERR(0, 1181, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("dump", 0, 2, 3, __pyx_nargs); __PYX_ERR(0, 1183, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -16689,7 +16714,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_2dump(CYTHON_UNUSED PyObject *_ __Pyx_XDECREF(__pyx_r); __pyx_t_2.__pyx_n = 1; __pyx_t_2.protocol = __pyx_v_protocol; - __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_dump(__pyx_v_obj, __pyx_v_file, 0, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1181, __pyx_L1_error) + __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_dump(__pyx_v_obj, __pyx_v_file, 0, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1183, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; @@ -16706,7 +16731,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_2dump(CYTHON_UNUSED PyObject *_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":1185 +/* "larch/pickle/pickle.pyx":1187 * * * cpdef load(file, secure=False): # <<<<<<<<<<<<<< @@ -16729,7 +16754,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load(PyObject *__pyx_v_file, CYT PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + unsigned int __pyx_t_4; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; @@ -16740,29 +16765,29 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load(PyObject *__pyx_v_file, CYT } } - /* "larch/pickle/pickle.pyx":1186 + /* "larch/pickle/pickle.pyx":1188 * * cpdef load(file, secure=False): * cdef Unpickler unpickler = Unpickler(file, secure=secure) # <<<<<<<<<<<<<< * return unpickler.load() * */ - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1186, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1188, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_v_file); __Pyx_GIVEREF(__pyx_v_file); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_file)) __PYX_ERR(0, 1186, __pyx_L1_error); - __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1186, __pyx_L1_error) + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_file)) __PYX_ERR(0, 1188, __pyx_L1_error); + __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1188, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_secure, __pyx_v_secure) < 0) __PYX_ERR(0, 1186, __pyx_L1_error) - __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler), __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1186, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_secure, __pyx_v_secure) < 0) __PYX_ERR(0, 1188, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler), __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1188, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_unpickler = ((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1187 + /* "larch/pickle/pickle.pyx":1189 * cpdef load(file, secure=False): * cdef Unpickler unpickler = Unpickler(file, secure=secure) * return unpickler.load() # <<<<<<<<<<<<<< @@ -16770,7 +16795,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load(PyObject *__pyx_v_file, CYT * */ __Pyx_XDECREF(__pyx_r); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_unpickler), __pyx_n_s_load); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1187, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_unpickler), __pyx_n_s_load); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1189, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_1 = NULL; __pyx_t_4 = 0; @@ -16790,7 +16815,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load(PyObject *__pyx_v_file, CYT PyObject *__pyx_callargs[2] = {__pyx_t_1, NULL}; __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 0+__pyx_t_4); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1187, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1189, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } @@ -16798,7 +16823,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_load(PyObject *__pyx_v_file, CYT __pyx_t_3 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1185 + /* "larch/pickle/pickle.pyx":1187 * * * cpdef load(file, secure=False): # <<<<<<<<<<<<<< @@ -16877,19 +16902,19 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[0]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1185, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1187, __pyx_L3_error) else goto __pyx_L5_argtuple_error; CYTHON_FALLTHROUGH; case 1: if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_secure); if (value) { values[1] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1185, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1187, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "load") < 0)) __PYX_ERR(0, 1185, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "load") < 0)) __PYX_ERR(0, 1187, __pyx_L3_error) } } else { switch (__pyx_nargs) { @@ -16905,7 +16930,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("load", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 1185, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("load", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 1187, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -16944,7 +16969,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_4load(CYTHON_UNUSED PyObject *_ __Pyx_XDECREF(__pyx_r); __pyx_t_2.__pyx_n = 1; __pyx_t_2.secure = __pyx_v_secure; - __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_load(__pyx_v_file, 0, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1185, __pyx_L1_error) + __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_load(__pyx_v_file, 0, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1187, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; @@ -16961,7 +16986,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_4load(CYTHON_UNUSED PyObject *_ return __pyx_r; } -/* "larch/pickle/pickle.pyx":1190 +/* "larch/pickle/pickle.pyx":1192 * * * cpdef loads(bytes obj, secure=False): # <<<<<<<<<<<<<< @@ -16984,7 +17009,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_loads(PyObject *__pyx_v_obj, CYT PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + unsigned int __pyx_t_4; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; @@ -16995,34 +17020,34 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_loads(PyObject *__pyx_v_obj, CYT } } - /* "larch/pickle/pickle.pyx":1191 + /* "larch/pickle/pickle.pyx":1193 * * cpdef loads(bytes obj, secure=False): * cdef Unpickler unpickler = Unpickler(obj, secure=secure) # <<<<<<<<<<<<<< * return unpickler.load() */ - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1191, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1193, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_v_obj); __Pyx_GIVEREF(__pyx_v_obj); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_obj)) __PYX_ERR(0, 1191, __pyx_L1_error); - __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1191, __pyx_L1_error) + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_obj)) __PYX_ERR(0, 1193, __pyx_L1_error); + __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1193, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_secure, __pyx_v_secure) < 0) __PYX_ERR(0, 1191, __pyx_L1_error) - __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler), __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1191, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_secure, __pyx_v_secure) < 0) __PYX_ERR(0, 1193, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler), __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1193, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_unpickler = ((struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *)__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1192 + /* "larch/pickle/pickle.pyx":1194 * cpdef loads(bytes obj, secure=False): * cdef Unpickler unpickler = Unpickler(obj, secure=secure) * return unpickler.load() # <<<<<<<<<<<<<< */ __Pyx_XDECREF(__pyx_r); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_unpickler), __pyx_n_s_load); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1192, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_unpickler), __pyx_n_s_load); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1194, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_1 = NULL; __pyx_t_4 = 0; @@ -17042,7 +17067,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_loads(PyObject *__pyx_v_obj, CYT PyObject *__pyx_callargs[2] = {__pyx_t_1, NULL}; __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 0+__pyx_t_4); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1192, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1194, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; } @@ -17050,7 +17075,7 @@ static PyObject *__pyx_f_5larch_6pickle_6pickle_loads(PyObject *__pyx_v_obj, CYT __pyx_t_3 = 0; goto __pyx_L0; - /* "larch/pickle/pickle.pyx":1190 + /* "larch/pickle/pickle.pyx":1192 * * * cpdef loads(bytes obj, secure=False): # <<<<<<<<<<<<<< @@ -17129,19 +17154,19 @@ PyObject *__pyx_args, PyObject *__pyx_kwds (void)__Pyx_Arg_NewRef_FASTCALL(values[0]); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1190, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1192, __pyx_L3_error) else goto __pyx_L5_argtuple_error; CYTHON_FALLTHROUGH; case 1: if (kw_args > 0) { PyObject* value = __Pyx_GetKwValue_FASTCALL(__pyx_kwds, __pyx_kwvalues, __pyx_n_s_secure); if (value) { values[1] = __Pyx_Arg_NewRef_FASTCALL(value); kw_args--; } - else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1190, __pyx_L3_error) + else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 1192, __pyx_L3_error) } } if (unlikely(kw_args > 0)) { const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "loads") < 0)) __PYX_ERR(0, 1190, __pyx_L3_error) + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "loads") < 0)) __PYX_ERR(0, 1192, __pyx_L3_error) } } else { switch (__pyx_nargs) { @@ -17157,7 +17182,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds } goto __pyx_L6_skip; __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("loads", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 1190, __pyx_L3_error) + __Pyx_RaiseArgtupleInvalid("loads", 0, 1, 2, __pyx_nargs); __PYX_ERR(0, 1192, __pyx_L3_error) __pyx_L6_skip:; goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; @@ -17171,7 +17196,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_obj), (&PyBytes_Type), 1, "obj", 1))) __PYX_ERR(0, 1190, __pyx_L1_error) + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_obj), (&PyBytes_Type), 1, "obj", 1))) __PYX_ERR(0, 1192, __pyx_L1_error) __pyx_r = __pyx_pf_5larch_6pickle_6pickle_6loads(__pyx_self, __pyx_v_obj, __pyx_v_secure); /* function exit code */ @@ -17201,7 +17226,7 @@ static PyObject *__pyx_pf_5larch_6pickle_6pickle_6loads(CYTHON_UNUSED PyObject * __Pyx_XDECREF(__pyx_r); __pyx_t_2.__pyx_n = 1; __pyx_t_2.secure = __pyx_v_secure; - __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_loads(__pyx_v_obj, 0, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1190, __pyx_L1_error) + __pyx_t_1 = __pyx_f_5larch_6pickle_6pickle_loads(__pyx_v_obj, 0, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1192, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; @@ -17428,6 +17453,9 @@ static PyTypeObject __pyx_type_5larch_6pickle_6pickle_Pickler = { #if PY_VERSION_HEX >= 0x030C0000 0, /*tp_watched*/ #endif + #if PY_VERSION_HEX >= 0x030d00A4 + 0, /*tp_versions_used*/ + #endif #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 0, /*tp_pypy_flags*/ #endif @@ -17646,6 +17674,9 @@ static PyTypeObject __pyx_type_5larch_6pickle_6pickle_Unpickler = { #if PY_VERSION_HEX >= 0x030C0000 0, /*tp_watched*/ #endif + #if PY_VERSION_HEX >= 0x030d00A4 + 0, /*tp_versions_used*/ + #endif #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 0, /*tp_pypy_flags*/ #endif @@ -17794,6 +17825,9 @@ static PyTypeObject __pyx_type_5larch_6pickle_6pickle_OutputBuffer = { #if PY_VERSION_HEX >= 0x030C0000 0, /*tp_watched*/ #endif + #if PY_VERSION_HEX >= 0x030d00A4 + 0, /*tp_versions_used*/ + #endif #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 0, /*tp_pypy_flags*/ #endif @@ -17931,6 +17965,9 @@ static PyTypeObject __pyx_type_5larch_6pickle_6pickle__BufferContainer = { #if PY_VERSION_HEX >= 0x030C0000 0, /*tp_watched*/ #endif + #if PY_VERSION_HEX >= 0x030d00A4 + 0, /*tp_versions_used*/ + #endif #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 0, /*tp_pypy_flags*/ #endif @@ -18101,6 +18138,9 @@ static PyTypeObject __pyx_type_5larch_6pickle_6pickle__FileLike = { #if PY_VERSION_HEX >= 0x030C0000 0, /*tp_watched*/ #endif + #if PY_VERSION_HEX >= 0x030d00A4 + 0, /*tp_versions_used*/ + #endif #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 0, /*tp_pypy_flags*/ #endif @@ -18257,6 +18297,9 @@ static PyTypeObject __pyx_type_5larch_6pickle_6pickle_ExternFileLike = { #if PY_VERSION_HEX >= 0x030C0000 0, /*tp_watched*/ #endif + #if PY_VERSION_HEX >= 0x030d00A4 + 0, /*tp_versions_used*/ + #endif #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 0, /*tp_pypy_flags*/ #endif @@ -18415,14 +18458,14 @@ static int __Pyx_CreateStringTabAndInitStrings(void) { } /* #### Code section: cached_builtins ### */ static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) { - __pyx_builtin_object = __Pyx_GetBuiltinName(__pyx_n_s_object); if (!__pyx_builtin_object) __PYX_ERR(0, 261, __pyx_L1_error) - __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 950, __pyx_L1_error) - __pyx_builtin_EOFError = __Pyx_GetBuiltinName(__pyx_n_s_EOFError); if (!__pyx_builtin_EOFError) __PYX_ERR(0, 340, __pyx_L1_error) - __pyx_builtin_OverflowError = __Pyx_GetBuiltinName(__pyx_n_s_OverflowError); if (!__pyx_builtin_OverflowError) __PYX_ERR(0, 413, __pyx_L1_error) - __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 588, __pyx_L1_error) - __pyx_builtin___import__ = __Pyx_GetBuiltinName(__pyx_n_s_import); if (!__pyx_builtin___import__) __PYX_ERR(0, 1019, __pyx_L1_error) - __pyx_builtin_AttributeError = __Pyx_GetBuiltinName(__pyx_n_s_AttributeError); if (!__pyx_builtin_AttributeError) __PYX_ERR(0, 1030, __pyx_L1_error) - __pyx_builtin_KeyError = __Pyx_GetBuiltinName(__pyx_n_s_KeyError); if (!__pyx_builtin_KeyError) __PYX_ERR(0, 1113, __pyx_L1_error) + __pyx_builtin_object = __Pyx_GetBuiltinName(__pyx_n_s_object); if (!__pyx_builtin_object) __PYX_ERR(0, 263, __pyx_L1_error) + __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 952, __pyx_L1_error) + __pyx_builtin_EOFError = __Pyx_GetBuiltinName(__pyx_n_s_EOFError); if (!__pyx_builtin_EOFError) __PYX_ERR(0, 342, __pyx_L1_error) + __pyx_builtin_OverflowError = __Pyx_GetBuiltinName(__pyx_n_s_OverflowError); if (!__pyx_builtin_OverflowError) __PYX_ERR(0, 415, __pyx_L1_error) + __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 590, __pyx_L1_error) + __pyx_builtin___import__ = __Pyx_GetBuiltinName(__pyx_n_s_import); if (!__pyx_builtin___import__) __PYX_ERR(0, 1021, __pyx_L1_error) + __pyx_builtin_AttributeError = __Pyx_GetBuiltinName(__pyx_n_s_AttributeError); if (!__pyx_builtin_AttributeError) __PYX_ERR(0, 1032, __pyx_L1_error) + __pyx_builtin_KeyError = __Pyx_GetBuiltinName(__pyx_n_s_KeyError); if (!__pyx_builtin_KeyError) __PYX_ERR(0, 1115, __pyx_L1_error) return 0; __pyx_L1_error:; return -1; @@ -18433,14 +18476,14 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0); - /* "larch/pickle/pickle.pyx":1164 + /* "larch/pickle/pickle.pyx":1166 * * try: * add_module = getattr(pickle_register, "add_"+module.replace(".", "_")) # <<<<<<<<<<<<<< * except AttributeError: * pass */ - __pyx_tuple__5 = PyTuple_Pack(2, __pyx_kp_u__2, __pyx_n_u__4); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 1164, __pyx_L1_error) + __pyx_tuple__5 = PyTuple_Pack(2, __pyx_kp_u__2, __pyx_n_u__4); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 1166, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__5); __Pyx_GIVEREF(__pyx_tuple__5); @@ -18455,210 +18498,210 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_GOTREF(__pyx_tuple__7); __Pyx_GIVEREF(__pyx_tuple__7); - /* "larch/pickle/pickle.pyx":744 + /* "larch/pickle/pickle.pyx":746 * "{}.__init__()".format((self.__class__.__qualname__,))) * * def dump(self, obj, bool with_version=True): # <<<<<<<<<<<<<< * self.check_init() * if with_version: */ - __pyx_tuple__8 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_obj, __pyx_n_s_with_version); if (unlikely(!__pyx_tuple__8)) __PYX_ERR(0, 744, __pyx_L1_error) + __pyx_tuple__8 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_obj, __pyx_n_s_with_version); if (unlikely(!__pyx_tuple__8)) __PYX_ERR(0, 746, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__8); __Pyx_GIVEREF(__pyx_tuple__8); - __pyx_codeobj__9 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__8, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_dump, 744, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__9)) __PYX_ERR(0, 744, __pyx_L1_error) - __pyx_tuple__10 = PyTuple_Pack(1, Py_True); if (unlikely(!__pyx_tuple__10)) __PYX_ERR(0, 744, __pyx_L1_error) + __pyx_codeobj__9 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__8, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_dump, 746, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__9)) __PYX_ERR(0, 746, __pyx_L1_error) + __pyx_tuple__10 = PyTuple_Pack(1, Py_True); if (unlikely(!__pyx_tuple__10)) __PYX_ERR(0, 746, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__10); __Pyx_GIVEREF(__pyx_tuple__10); - /* "larch/pickle/pickle.pyx":754 + /* "larch/pickle/pickle.pyx":756 * return self * * def dumps(self, obj, bool with_version=True): # <<<<<<<<<<<<<< * self.check_init() * (self.file).reset() */ - __pyx_codeobj__11 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__8, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_dumps, 754, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__11)) __PYX_ERR(0, 754, __pyx_L1_error) + __pyx_codeobj__11 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__8, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_dumps, 756, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__11)) __PYX_ERR(0, 756, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":766 + /* "larch/pickle/pickle.pyx":768 * return self.get_output_string() * * cpdef bytes get_output_string(self): # <<<<<<<<<<<<<< * return (self.file).result() * */ - __pyx_tuple__12 = PyTuple_Pack(1, __pyx_n_s_self); if (unlikely(!__pyx_tuple__12)) __PYX_ERR(0, 766, __pyx_L1_error) + __pyx_tuple__12 = PyTuple_Pack(1, __pyx_n_s_self); if (unlikely(!__pyx_tuple__12)) __PYX_ERR(0, 768, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__12); __Pyx_GIVEREF(__pyx_tuple__12); - __pyx_codeobj__13 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__12, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_get_output_string, 766, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__13)) __PYX_ERR(0, 766, __pyx_L1_error) + __pyx_codeobj__13 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__12, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_get_output_string, 768, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__13)) __PYX_ERR(0, 768, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":950 + /* "larch/pickle/pickle.pyx":952 * unpickle_registry[i+offset] = loader * * _register_unpickle(load_wrong_code, range(0, 0x200)) # <<<<<<<<<<<<<< * _register_unpickle(load_uint4, range(0x80)) * _register_unpickle(load_int4, range(0xe0, 0x100)) */ - __pyx_tuple__14 = PyTuple_Pack(2, __pyx_int_0, __pyx_int_512); if (unlikely(!__pyx_tuple__14)) __PYX_ERR(0, 950, __pyx_L1_error) + __pyx_tuple__14 = PyTuple_Pack(2, __pyx_int_0, __pyx_int_512); if (unlikely(!__pyx_tuple__14)) __PYX_ERR(0, 952, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__14); __Pyx_GIVEREF(__pyx_tuple__14); - /* "larch/pickle/pickle.pyx":951 + /* "larch/pickle/pickle.pyx":953 * * _register_unpickle(load_wrong_code, range(0, 0x200)) * _register_unpickle(load_uint4, range(0x80)) # <<<<<<<<<<<<<< * _register_unpickle(load_int4, range(0xe0, 0x100)) * _register_unpickle(load_ref, [0xc1]) */ - __pyx_tuple__15 = PyTuple_Pack(1, __pyx_int_128); if (unlikely(!__pyx_tuple__15)) __PYX_ERR(0, 951, __pyx_L1_error) + __pyx_tuple__15 = PyTuple_Pack(1, __pyx_int_128); if (unlikely(!__pyx_tuple__15)) __PYX_ERR(0, 953, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__15); __Pyx_GIVEREF(__pyx_tuple__15); - /* "larch/pickle/pickle.pyx":952 + /* "larch/pickle/pickle.pyx":954 * _register_unpickle(load_wrong_code, range(0, 0x200)) * _register_unpickle(load_uint4, range(0x80)) * _register_unpickle(load_int4, range(0xe0, 0x100)) # <<<<<<<<<<<<<< * _register_unpickle(load_ref, [0xc1]) * _register_unpickle(load_uint8, [0xcc]) */ - __pyx_tuple__16 = PyTuple_Pack(2, __pyx_int_224, __pyx_int_256); if (unlikely(!__pyx_tuple__16)) __PYX_ERR(0, 952, __pyx_L1_error) + __pyx_tuple__16 = PyTuple_Pack(2, __pyx_int_224, __pyx_int_256); if (unlikely(!__pyx_tuple__16)) __PYX_ERR(0, 954, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__16); __Pyx_GIVEREF(__pyx_tuple__16); - /* "larch/pickle/pickle.pyx":962 + /* "larch/pickle/pickle.pyx":964 * _register_unpickle(load_int32, [0xd2]) * _register_unpickle(load_int64, [0xd3]) * _register_unpickle(load_map4, range(0x80, 0x90)) # <<<<<<<<<<<<<< * _register_unpickle(load_map16,[0xde]) * _register_unpickle(load_map32, [0xdf]) */ - __pyx_tuple__17 = PyTuple_Pack(2, __pyx_int_128, __pyx_int_144); if (unlikely(!__pyx_tuple__17)) __PYX_ERR(0, 962, __pyx_L1_error) + __pyx_tuple__17 = PyTuple_Pack(2, __pyx_int_128, __pyx_int_144); if (unlikely(!__pyx_tuple__17)) __PYX_ERR(0, 964, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__17); __Pyx_GIVEREF(__pyx_tuple__17); - /* "larch/pickle/pickle.pyx":968 + /* "larch/pickle/pickle.pyx":970 * _register_unpickle(load_false, [0xc2]) * _register_unpickle(load_true, [0xc3]) * _register_unpickle(load_str4, range(0xa0, 0xc0)) # <<<<<<<<<<<<<< * _register_unpickle(load_str8, [0xd9]) * _register_unpickle(load_str16, [0xda]) */ - __pyx_tuple__18 = PyTuple_Pack(2, __pyx_int_160, __pyx_int_192); if (unlikely(!__pyx_tuple__18)) __PYX_ERR(0, 968, __pyx_L1_error) + __pyx_tuple__18 = PyTuple_Pack(2, __pyx_int_160, __pyx_int_192); if (unlikely(!__pyx_tuple__18)) __PYX_ERR(0, 970, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__18); __Pyx_GIVEREF(__pyx_tuple__18); - /* "larch/pickle/pickle.pyx":975 + /* "larch/pickle/pickle.pyx":977 * _register_unpickle(load_bin16, [0xc5]) * _register_unpickle(load_bin32, [0xc6]) * _register_unpickle(load_array4, range(0x90, 0xa0)) # <<<<<<<<<<<<<< * _register_unpickle(load_array16, [0xdc]) * _register_unpickle(load_array32, [0xdd]) */ - __pyx_tuple__19 = PyTuple_Pack(2, __pyx_int_144, __pyx_int_160); if (unlikely(!__pyx_tuple__19)) __PYX_ERR(0, 975, __pyx_L1_error) + __pyx_tuple__19 = PyTuple_Pack(2, __pyx_int_144, __pyx_int_160); if (unlikely(!__pyx_tuple__19)) __PYX_ERR(0, 977, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__19); __Pyx_GIVEREF(__pyx_tuple__19); - /* "larch/pickle/pickle.pyx":1134 + /* "larch/pickle/pickle.pyx":1136 * "{}.__init__()".format((self.__class__.__name__,))) * * def find_class(self, str module, str name): # <<<<<<<<<<<<<< * return self.default_find_class(module, name) * */ - __pyx_tuple__20 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_module_2, __pyx_n_s_name_2); if (unlikely(!__pyx_tuple__20)) __PYX_ERR(0, 1134, __pyx_L1_error) + __pyx_tuple__20 = PyTuple_Pack(3, __pyx_n_s_self, __pyx_n_s_module_2, __pyx_n_s_name_2); if (unlikely(!__pyx_tuple__20)) __PYX_ERR(0, 1136, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__20); __Pyx_GIVEREF(__pyx_tuple__20); - __pyx_codeobj__21 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__20, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_find_class, 1134, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__21)) __PYX_ERR(0, 1134, __pyx_L1_error) + __pyx_codeobj__21 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__20, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_find_class, 1136, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__21)) __PYX_ERR(0, 1136, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":1137 + /* "larch/pickle/pickle.pyx":1139 * return self.default_find_class(module, name) * * def load(self): # <<<<<<<<<<<<<< * self.check_init() * try: */ - __pyx_codeobj__22 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__12, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_load, 1137, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__22)) __PYX_ERR(0, 1137, __pyx_L1_error) + __pyx_codeobj__22 = (PyObject*)__Pyx_PyCode_New(1, 0, 0, 1, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__12, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_load, 1139, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__22)) __PYX_ERR(0, 1139, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":1144 + /* "larch/pickle/pickle.pyx":1146 * self.last_refcount = self.unpacker.reset() * * def loads(self, bytes obj): # <<<<<<<<<<<<<< * self.check_init() * (<_BufferContainer>self.file).set(obj) */ - __pyx_tuple__23 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_obj); if (unlikely(!__pyx_tuple__23)) __PYX_ERR(0, 1144, __pyx_L1_error) + __pyx_tuple__23 = PyTuple_Pack(2, __pyx_n_s_self, __pyx_n_s_obj); if (unlikely(!__pyx_tuple__23)) __PYX_ERR(0, 1146, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__23); __Pyx_GIVEREF(__pyx_tuple__23); - __pyx_codeobj__24 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__23, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_loads, 1144, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__24)) __PYX_ERR(0, 1144, __pyx_L1_error) + __pyx_codeobj__24 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__23, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_loads, 1146, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__24)) __PYX_ERR(0, 1146, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":1152 + /* "larch/pickle/pickle.pyx":1154 * self.last_refcount = self.unpacker.reset() * * cpdef verify_object(self, module, name, obj): # <<<<<<<<<<<<<< * if (module not in secure_modules and obj not in secure_objects * and PyDict_GetItem(extension_registry, (module, name)) is NULL): */ - __pyx_tuple__25 = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_module_2, __pyx_n_s_name_2, __pyx_n_s_obj); if (unlikely(!__pyx_tuple__25)) __PYX_ERR(0, 1152, __pyx_L1_error) + __pyx_tuple__25 = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_module_2, __pyx_n_s_name_2, __pyx_n_s_obj); if (unlikely(!__pyx_tuple__25)) __PYX_ERR(0, 1154, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__25); __Pyx_GIVEREF(__pyx_tuple__25); - __pyx_codeobj__26 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_verify_object, 1152, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__26)) __PYX_ERR(0, 1152, __pyx_L1_error) + __pyx_codeobj__26 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_verify_object, 1154, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__26)) __PYX_ERR(0, 1154, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":1176 + /* "larch/pickle/pickle.pyx":1178 * * * cpdef dumps(obj, protocol=-1, with_refs=True): # <<<<<<<<<<<<<< * return Pickler(protocol=protocol, with_refs=with_refs)\ * .dump(obj).get_output_string() */ - __pyx_tuple__27 = PyTuple_Pack(3, __pyx_n_s_obj, __pyx_n_s_protocol, __pyx_n_s_with_refs); if (unlikely(!__pyx_tuple__27)) __PYX_ERR(0, 1176, __pyx_L1_error) + __pyx_tuple__27 = PyTuple_Pack(3, __pyx_n_s_obj, __pyx_n_s_protocol, __pyx_n_s_with_refs); if (unlikely(!__pyx_tuple__27)) __PYX_ERR(0, 1178, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__27); __Pyx_GIVEREF(__pyx_tuple__27); - __pyx_codeobj__28 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__27, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_dumps, 1176, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__28)) __PYX_ERR(0, 1176, __pyx_L1_error) - __pyx_tuple__29 = PyTuple_Pack(2, __pyx_int_neg_1, Py_True); if (unlikely(!__pyx_tuple__29)) __PYX_ERR(0, 1176, __pyx_L1_error) + __pyx_codeobj__28 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__27, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_dumps, 1178, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__28)) __PYX_ERR(0, 1178, __pyx_L1_error) + __pyx_tuple__29 = PyTuple_Pack(2, __pyx_int_neg_1, Py_True); if (unlikely(!__pyx_tuple__29)) __PYX_ERR(0, 1178, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__29); __Pyx_GIVEREF(__pyx_tuple__29); - /* "larch/pickle/pickle.pyx":1181 + /* "larch/pickle/pickle.pyx":1183 * * * cpdef dump(obj, file, protocol=-1): # <<<<<<<<<<<<<< * Pickler(file, protocol=protocol).dump(obj) * */ - __pyx_tuple__30 = PyTuple_Pack(3, __pyx_n_s_obj, __pyx_n_s_file, __pyx_n_s_protocol); if (unlikely(!__pyx_tuple__30)) __PYX_ERR(0, 1181, __pyx_L1_error) + __pyx_tuple__30 = PyTuple_Pack(3, __pyx_n_s_obj, __pyx_n_s_file, __pyx_n_s_protocol); if (unlikely(!__pyx_tuple__30)) __PYX_ERR(0, 1183, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__30); __Pyx_GIVEREF(__pyx_tuple__30); - __pyx_codeobj__31 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__30, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_dump, 1181, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__31)) __PYX_ERR(0, 1181, __pyx_L1_error) - __pyx_tuple__32 = PyTuple_Pack(1, __pyx_int_neg_1); if (unlikely(!__pyx_tuple__32)) __PYX_ERR(0, 1181, __pyx_L1_error) + __pyx_codeobj__31 = (PyObject*)__Pyx_PyCode_New(3, 0, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__30, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_dump, 1183, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__31)) __PYX_ERR(0, 1183, __pyx_L1_error) + __pyx_tuple__32 = PyTuple_Pack(1, __pyx_int_neg_1); if (unlikely(!__pyx_tuple__32)) __PYX_ERR(0, 1183, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__32); __Pyx_GIVEREF(__pyx_tuple__32); - /* "larch/pickle/pickle.pyx":1185 + /* "larch/pickle/pickle.pyx":1187 * * * cpdef load(file, secure=False): # <<<<<<<<<<<<<< * cdef Unpickler unpickler = Unpickler(file, secure=secure) * return unpickler.load() */ - __pyx_tuple__33 = PyTuple_Pack(2, __pyx_n_s_file, __pyx_n_s_secure); if (unlikely(!__pyx_tuple__33)) __PYX_ERR(0, 1185, __pyx_L1_error) + __pyx_tuple__33 = PyTuple_Pack(2, __pyx_n_s_file, __pyx_n_s_secure); if (unlikely(!__pyx_tuple__33)) __PYX_ERR(0, 1187, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__33); __Pyx_GIVEREF(__pyx_tuple__33); - __pyx_codeobj__34 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__33, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_load, 1185, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__34)) __PYX_ERR(0, 1185, __pyx_L1_error) - __pyx_tuple__35 = PyTuple_Pack(1, Py_False); if (unlikely(!__pyx_tuple__35)) __PYX_ERR(0, 1185, __pyx_L1_error) + __pyx_codeobj__34 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__33, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_load, 1187, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__34)) __PYX_ERR(0, 1187, __pyx_L1_error) + __pyx_tuple__35 = PyTuple_Pack(1, Py_False); if (unlikely(!__pyx_tuple__35)) __PYX_ERR(0, 1187, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__35); __Pyx_GIVEREF(__pyx_tuple__35); - /* "larch/pickle/pickle.pyx":1190 + /* "larch/pickle/pickle.pyx":1192 * * * cpdef loads(bytes obj, secure=False): # <<<<<<<<<<<<<< * cdef Unpickler unpickler = Unpickler(obj, secure=secure) * return unpickler.load() */ - __pyx_tuple__36 = PyTuple_Pack(2, __pyx_n_s_obj, __pyx_n_s_secure); if (unlikely(!__pyx_tuple__36)) __PYX_ERR(0, 1190, __pyx_L1_error) + __pyx_tuple__36 = PyTuple_Pack(2, __pyx_n_s_obj, __pyx_n_s_secure); if (unlikely(!__pyx_tuple__36)) __PYX_ERR(0, 1192, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__36); __Pyx_GIVEREF(__pyx_tuple__36); - __pyx_codeobj__37 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__36, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_loads, 1190, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__37)) __PYX_ERR(0, 1190, __pyx_L1_error) - __pyx_tuple__38 = PyTuple_Pack(1, Py_False); if (unlikely(!__pyx_tuple__38)) __PYX_ERR(0, 1190, __pyx_L1_error) + __pyx_codeobj__37 = (PyObject*)__Pyx_PyCode_New(2, 0, 0, 2, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__36, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_larch_pickle_pickle_pyx, __pyx_n_s_loads, 1192, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__37)) __PYX_ERR(0, 1192, __pyx_L1_error) + __pyx_tuple__38 = PyTuple_Pack(1, Py_False); if (unlikely(!__pyx_tuple__38)) __PYX_ERR(0, 1192, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__38); __Pyx_GIVEREF(__pyx_tuple__38); __Pyx_RefNannyFinishContext(); @@ -18786,15 +18829,15 @@ static int __Pyx_modinit_type_init_code(void) { __pyx_vtable_5larch_6pickle_6pickle_Pickler.check_init = (int (*)(struct __pyx_obj_5larch_6pickle_6pickle_Pickler *))__pyx_f_5larch_6pickle_6pickle_7Pickler_check_init; __pyx_vtable_5larch_6pickle_6pickle_Pickler.get_output_string = (PyObject *(*)(struct __pyx_obj_5larch_6pickle_6pickle_Pickler *, int __pyx_skip_dispatch))__pyx_f_5larch_6pickle_6pickle_7Pickler_get_output_string; #if CYTHON_USE_TYPE_SPECS - __pyx_ptype_5larch_6pickle_6pickle_Pickler = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle_Pickler_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle_Pickler)) __PYX_ERR(0, 685, __pyx_L1_error) - if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle_Pickler_spec, __pyx_ptype_5larch_6pickle_6pickle_Pickler) < 0) __PYX_ERR(0, 685, __pyx_L1_error) + __pyx_ptype_5larch_6pickle_6pickle_Pickler = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle_Pickler_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle_Pickler)) __PYX_ERR(0, 687, __pyx_L1_error) + if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle_Pickler_spec, __pyx_ptype_5larch_6pickle_6pickle_Pickler) < 0) __PYX_ERR(0, 687, __pyx_L1_error) #else __pyx_ptype_5larch_6pickle_6pickle_Pickler = &__pyx_type_5larch_6pickle_6pickle_Pickler; #endif #if !CYTHON_COMPILING_IN_LIMITED_API #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle_Pickler) < 0) __PYX_ERR(0, 685, __pyx_L1_error) + if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle_Pickler) < 0) __PYX_ERR(0, 687, __pyx_L1_error) #endif #if PY_MAJOR_VERSION < 3 __pyx_ptype_5larch_6pickle_6pickle_Pickler->tp_print = 0; @@ -18804,26 +18847,26 @@ static int __Pyx_modinit_type_init_code(void) { __pyx_ptype_5larch_6pickle_6pickle_Pickler->tp_getattro = __Pyx_PyObject_GenericGetAttr; } #endif - if (__Pyx_SetVtable(__pyx_ptype_5larch_6pickle_6pickle_Pickler, __pyx_vtabptr_5larch_6pickle_6pickle_Pickler) < 0) __PYX_ERR(0, 685, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_ptype_5larch_6pickle_6pickle_Pickler, __pyx_vtabptr_5larch_6pickle_6pickle_Pickler) < 0) __PYX_ERR(0, 687, __pyx_L1_error) #if !CYTHON_COMPILING_IN_LIMITED_API - if (__Pyx_MergeVtables(__pyx_ptype_5larch_6pickle_6pickle_Pickler) < 0) __PYX_ERR(0, 685, __pyx_L1_error) + if (__Pyx_MergeVtables(__pyx_ptype_5larch_6pickle_6pickle_Pickler) < 0) __PYX_ERR(0, 687, __pyx_L1_error) #endif - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Pickler, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle_Pickler) < 0) __PYX_ERR(0, 685, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Pickler, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle_Pickler) < 0) __PYX_ERR(0, 687, __pyx_L1_error) __pyx_vtabptr_5larch_6pickle_6pickle_Unpickler = &__pyx_vtable_5larch_6pickle_6pickle_Unpickler; __pyx_vtable_5larch_6pickle_6pickle_Unpickler.set_protocol = (int (*)(struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *, uint8_t))__pyx_f_5larch_6pickle_6pickle_9Unpickler_set_protocol; __pyx_vtable_5larch_6pickle_6pickle_Unpickler.unpack_import = (PyObject *(*)(struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *, size_t))__pyx_f_5larch_6pickle_6pickle_9Unpickler_unpack_import; __pyx_vtable_5larch_6pickle_6pickle_Unpickler.check_init = (int (*)(struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *))__pyx_f_5larch_6pickle_6pickle_9Unpickler_check_init; __pyx_vtable_5larch_6pickle_6pickle_Unpickler.verify_object = (PyObject *(*)(struct __pyx_obj_5larch_6pickle_6pickle_Unpickler *, PyObject *, PyObject *, PyObject *, int __pyx_skip_dispatch))__pyx_f_5larch_6pickle_6pickle_9Unpickler_verify_object; #if CYTHON_USE_TYPE_SPECS - __pyx_ptype_5larch_6pickle_6pickle_Unpickler = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle_Unpickler_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle_Unpickler)) __PYX_ERR(0, 1052, __pyx_L1_error) - if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle_Unpickler_spec, __pyx_ptype_5larch_6pickle_6pickle_Unpickler) < 0) __PYX_ERR(0, 1052, __pyx_L1_error) + __pyx_ptype_5larch_6pickle_6pickle_Unpickler = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle_Unpickler_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle_Unpickler)) __PYX_ERR(0, 1054, __pyx_L1_error) + if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle_Unpickler_spec, __pyx_ptype_5larch_6pickle_6pickle_Unpickler) < 0) __PYX_ERR(0, 1054, __pyx_L1_error) #else __pyx_ptype_5larch_6pickle_6pickle_Unpickler = &__pyx_type_5larch_6pickle_6pickle_Unpickler; #endif #if !CYTHON_COMPILING_IN_LIMITED_API #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle_Unpickler) < 0) __PYX_ERR(0, 1052, __pyx_L1_error) + if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle_Unpickler) < 0) __PYX_ERR(0, 1054, __pyx_L1_error) #endif #if PY_MAJOR_VERSION < 3 __pyx_ptype_5larch_6pickle_6pickle_Unpickler->tp_print = 0; @@ -18833,24 +18876,24 @@ static int __Pyx_modinit_type_init_code(void) { __pyx_ptype_5larch_6pickle_6pickle_Unpickler->tp_getattro = __Pyx_PyObject_GenericGetAttr; } #endif - if (__Pyx_SetVtable(__pyx_ptype_5larch_6pickle_6pickle_Unpickler, __pyx_vtabptr_5larch_6pickle_6pickle_Unpickler) < 0) __PYX_ERR(0, 1052, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_ptype_5larch_6pickle_6pickle_Unpickler, __pyx_vtabptr_5larch_6pickle_6pickle_Unpickler) < 0) __PYX_ERR(0, 1054, __pyx_L1_error) #if !CYTHON_COMPILING_IN_LIMITED_API - if (__Pyx_MergeVtables(__pyx_ptype_5larch_6pickle_6pickle_Unpickler) < 0) __PYX_ERR(0, 1052, __pyx_L1_error) + if (__Pyx_MergeVtables(__pyx_ptype_5larch_6pickle_6pickle_Unpickler) < 0) __PYX_ERR(0, 1054, __pyx_L1_error) #endif - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Unpickler, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle_Unpickler) < 0) __PYX_ERR(0, 1052, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Unpickler, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle_Unpickler) < 0) __PYX_ERR(0, 1054, __pyx_L1_error) __pyx_vtabptr_5larch_6pickle_6pickle_OutputBuffer = &__pyx_vtable_5larch_6pickle_6pickle_OutputBuffer; __pyx_vtable_5larch_6pickle_6pickle_OutputBuffer.reset = (void (*)(struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *))__pyx_f_5larch_6pickle_6pickle_12OutputBuffer_reset; __pyx_vtable_5larch_6pickle_6pickle_OutputBuffer.result = (PyObject *(*)(struct __pyx_obj_5larch_6pickle_6pickle_OutputBuffer *))__pyx_f_5larch_6pickle_6pickle_12OutputBuffer_result; #if CYTHON_USE_TYPE_SPECS - __pyx_ptype_5larch_6pickle_6pickle_OutputBuffer = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle_OutputBuffer_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle_OutputBuffer)) __PYX_ERR(0, 281, __pyx_L1_error) - if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle_OutputBuffer_spec, __pyx_ptype_5larch_6pickle_6pickle_OutputBuffer) < 0) __PYX_ERR(0, 281, __pyx_L1_error) + __pyx_ptype_5larch_6pickle_6pickle_OutputBuffer = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle_OutputBuffer_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle_OutputBuffer)) __PYX_ERR(0, 283, __pyx_L1_error) + if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle_OutputBuffer_spec, __pyx_ptype_5larch_6pickle_6pickle_OutputBuffer) < 0) __PYX_ERR(0, 283, __pyx_L1_error) #else __pyx_ptype_5larch_6pickle_6pickle_OutputBuffer = &__pyx_type_5larch_6pickle_6pickle_OutputBuffer; #endif #if !CYTHON_COMPILING_IN_LIMITED_API #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle_OutputBuffer) < 0) __PYX_ERR(0, 281, __pyx_L1_error) + if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle_OutputBuffer) < 0) __PYX_ERR(0, 283, __pyx_L1_error) #endif #if PY_MAJOR_VERSION < 3 __pyx_ptype_5larch_6pickle_6pickle_OutputBuffer->tp_print = 0; @@ -18860,23 +18903,23 @@ static int __Pyx_modinit_type_init_code(void) { __pyx_ptype_5larch_6pickle_6pickle_OutputBuffer->tp_getattro = __Pyx_PyObject_GenericGetAttr; } #endif - if (__Pyx_SetVtable(__pyx_ptype_5larch_6pickle_6pickle_OutputBuffer, __pyx_vtabptr_5larch_6pickle_6pickle_OutputBuffer) < 0) __PYX_ERR(0, 281, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_ptype_5larch_6pickle_6pickle_OutputBuffer, __pyx_vtabptr_5larch_6pickle_6pickle_OutputBuffer) < 0) __PYX_ERR(0, 283, __pyx_L1_error) #if !CYTHON_COMPILING_IN_LIMITED_API - if (__Pyx_MergeVtables(__pyx_ptype_5larch_6pickle_6pickle_OutputBuffer) < 0) __PYX_ERR(0, 281, __pyx_L1_error) + if (__Pyx_MergeVtables(__pyx_ptype_5larch_6pickle_6pickle_OutputBuffer) < 0) __PYX_ERR(0, 283, __pyx_L1_error) #endif - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_OutputBuffer, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle_OutputBuffer) < 0) __PYX_ERR(0, 281, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_OutputBuffer, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle_OutputBuffer) < 0) __PYX_ERR(0, 283, __pyx_L1_error) __pyx_vtabptr_5larch_6pickle_6pickle__BufferContainer = &__pyx_vtable_5larch_6pickle_6pickle__BufferContainer; __pyx_vtable_5larch_6pickle_6pickle__BufferContainer.set = (struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *(*)(struct __pyx_obj_5larch_6pickle_6pickle__BufferContainer *, PyObject *))__pyx_f_5larch_6pickle_6pickle_16_BufferContainer_set; #if CYTHON_USE_TYPE_SPECS - __pyx_ptype_5larch_6pickle_6pickle__BufferContainer = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle__BufferContainer_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle__BufferContainer)) __PYX_ERR(0, 302, __pyx_L1_error) - if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle__BufferContainer_spec, __pyx_ptype_5larch_6pickle_6pickle__BufferContainer) < 0) __PYX_ERR(0, 302, __pyx_L1_error) + __pyx_ptype_5larch_6pickle_6pickle__BufferContainer = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle__BufferContainer_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle__BufferContainer)) __PYX_ERR(0, 304, __pyx_L1_error) + if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle__BufferContainer_spec, __pyx_ptype_5larch_6pickle_6pickle__BufferContainer) < 0) __PYX_ERR(0, 304, __pyx_L1_error) #else __pyx_ptype_5larch_6pickle_6pickle__BufferContainer = &__pyx_type_5larch_6pickle_6pickle__BufferContainer; #endif #if !CYTHON_COMPILING_IN_LIMITED_API #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle__BufferContainer) < 0) __PYX_ERR(0, 302, __pyx_L1_error) + if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle__BufferContainer) < 0) __PYX_ERR(0, 304, __pyx_L1_error) #endif #if PY_MAJOR_VERSION < 3 __pyx_ptype_5larch_6pickle_6pickle__BufferContainer->tp_print = 0; @@ -18886,21 +18929,21 @@ static int __Pyx_modinit_type_init_code(void) { __pyx_ptype_5larch_6pickle_6pickle__BufferContainer->tp_getattro = __Pyx_PyObject_GenericGetAttr; } #endif - if (__Pyx_SetVtable(__pyx_ptype_5larch_6pickle_6pickle__BufferContainer, __pyx_vtabptr_5larch_6pickle_6pickle__BufferContainer) < 0) __PYX_ERR(0, 302, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_ptype_5larch_6pickle_6pickle__BufferContainer, __pyx_vtabptr_5larch_6pickle_6pickle__BufferContainer) < 0) __PYX_ERR(0, 304, __pyx_L1_error) #if !CYTHON_COMPILING_IN_LIMITED_API - if (__Pyx_MergeVtables(__pyx_ptype_5larch_6pickle_6pickle__BufferContainer) < 0) __PYX_ERR(0, 302, __pyx_L1_error) + if (__Pyx_MergeVtables(__pyx_ptype_5larch_6pickle_6pickle__BufferContainer) < 0) __PYX_ERR(0, 304, __pyx_L1_error) #endif - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_BufferContainer, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle__BufferContainer) < 0) __PYX_ERR(0, 302, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_BufferContainer, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle__BufferContainer) < 0) __PYX_ERR(0, 304, __pyx_L1_error) #if CYTHON_USE_TYPE_SPECS - __pyx_ptype_5larch_6pickle_6pickle__FileLike = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle__FileLike_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle__FileLike)) __PYX_ERR(0, 318, __pyx_L1_error) - if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle__FileLike_spec, __pyx_ptype_5larch_6pickle_6pickle__FileLike) < 0) __PYX_ERR(0, 318, __pyx_L1_error) + __pyx_ptype_5larch_6pickle_6pickle__FileLike = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle__FileLike_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle__FileLike)) __PYX_ERR(0, 320, __pyx_L1_error) + if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle__FileLike_spec, __pyx_ptype_5larch_6pickle_6pickle__FileLike) < 0) __PYX_ERR(0, 320, __pyx_L1_error) #else __pyx_ptype_5larch_6pickle_6pickle__FileLike = &__pyx_type_5larch_6pickle_6pickle__FileLike; #endif #if !CYTHON_COMPILING_IN_LIMITED_API #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle__FileLike) < 0) __PYX_ERR(0, 318, __pyx_L1_error) + if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle__FileLike) < 0) __PYX_ERR(0, 320, __pyx_L1_error) #endif #if PY_MAJOR_VERSION < 3 __pyx_ptype_5larch_6pickle_6pickle__FileLike->tp_print = 0; @@ -18910,17 +18953,17 @@ static int __Pyx_modinit_type_init_code(void) { __pyx_ptype_5larch_6pickle_6pickle__FileLike->tp_getattro = __Pyx_PyObject_GenericGetAttr; } #endif - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_FileLike, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle__FileLike) < 0) __PYX_ERR(0, 318, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_FileLike, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle__FileLike) < 0) __PYX_ERR(0, 320, __pyx_L1_error) #if CYTHON_USE_TYPE_SPECS - __pyx_ptype_5larch_6pickle_6pickle_ExternFileLike = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle_ExternFileLike_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle_ExternFileLike)) __PYX_ERR(0, 347, __pyx_L1_error) - if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle_ExternFileLike_spec, __pyx_ptype_5larch_6pickle_6pickle_ExternFileLike) < 0) __PYX_ERR(0, 347, __pyx_L1_error) + __pyx_ptype_5larch_6pickle_6pickle_ExternFileLike = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_5larch_6pickle_6pickle_ExternFileLike_spec, NULL); if (unlikely(!__pyx_ptype_5larch_6pickle_6pickle_ExternFileLike)) __PYX_ERR(0, 349, __pyx_L1_error) + if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_5larch_6pickle_6pickle_ExternFileLike_spec, __pyx_ptype_5larch_6pickle_6pickle_ExternFileLike) < 0) __PYX_ERR(0, 349, __pyx_L1_error) #else __pyx_ptype_5larch_6pickle_6pickle_ExternFileLike = &__pyx_type_5larch_6pickle_6pickle_ExternFileLike; #endif #if !CYTHON_COMPILING_IN_LIMITED_API #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle_ExternFileLike) < 0) __PYX_ERR(0, 347, __pyx_L1_error) + if (__Pyx_PyType_Ready(__pyx_ptype_5larch_6pickle_6pickle_ExternFileLike) < 0) __PYX_ERR(0, 349, __pyx_L1_error) #endif #if PY_MAJOR_VERSION < 3 __pyx_ptype_5larch_6pickle_6pickle_ExternFileLike->tp_print = 0; @@ -18930,7 +18973,7 @@ static int __Pyx_modinit_type_init_code(void) { __pyx_ptype_5larch_6pickle_6pickle_ExternFileLike->tp_getattro = __Pyx_PyObject_GenericGetAttr; } #endif - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_ExternFileLike, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle_ExternFileLike) < 0) __PYX_ERR(0, 347, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_ExternFileLike, (PyObject *) __pyx_ptype_5larch_6pickle_6pickle_ExternFileLike) < 0) __PYX_ERR(0, 349, __pyx_L1_error) __Pyx_RefNannyFinishContext(); return 0; __pyx_L1_error:; @@ -18948,15 +18991,15 @@ static int __Pyx_modinit_type_import_code(void) { /*--- Type import code ---*/ __pyx_t_1 = PyImport_ImportModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 9, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_0_8(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type", + __pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_0_11(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyTypeObject), + sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(PyTypeObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyTypeObject), + sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(PyTypeObject), #else - sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyHeapTypeObject), + sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_11(PyHeapTypeObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_7cpython_4type_type) __PYX_ERR(1, 9, __pyx_L1_error) + __Pyx_ImportType_CheckSize_Warn_3_0_11); if (!__pyx_ptype_7cpython_4type_type) __PYX_ERR(1, 9, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_RefNannyFinishContext(); return 0; @@ -19151,7 +19194,7 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec_pickle(PyObject *__pyx_pyinit_modu PyObject *__pyx_t_6 = NULL; PyObject *__pyx_t_7 = NULL; PyObject *__pyx_t_8 = NULL; - int __pyx_t_9; + unsigned int __pyx_t_9; struct __pyx_opt_args_5larch_6pickle_6pickle__register_unpickle __pyx_t_10; int __pyx_lineno = 0; const char *__pyx_filename = NULL; @@ -19523,154 +19566,154 @@ if (!__Pyx_RefNanny) { __Pyx_DECREF_SET(__pyx_v_5larch_6pickle_6pickle_MAX_PROTOCOL_VERSION, __pyx_int_4); __Pyx_GIVEREF(__pyx_int_4); - /* "larch/pickle/pickle.pyx":256 + /* "larch/pickle/pickle.pyx":258 * * cdef: * dict dispatch_table = copyreg.dispatch_table # <<<<<<<<<<<<<< * dict extension_registry = copyreg._extension_registry * dict inverted_registry = copyreg._inverted_registry */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_copyreg); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 256, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_copyreg); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 258, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_dispatch_table); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 256, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_dispatch_table); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 258, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (!(likely(PyDict_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_t_2))) __PYX_ERR(0, 256, __pyx_L1_error) + if (!(likely(PyDict_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_t_2))) __PYX_ERR(0, 258, __pyx_L1_error) __Pyx_XGOTREF(__pyx_v_5larch_6pickle_6pickle_dispatch_table); __Pyx_DECREF_SET(__pyx_v_5larch_6pickle_6pickle_dispatch_table, ((PyObject*)__pyx_t_2)); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":257 + /* "larch/pickle/pickle.pyx":259 * cdef: * dict dispatch_table = copyreg.dispatch_table * dict extension_registry = copyreg._extension_registry # <<<<<<<<<<<<<< * dict inverted_registry = copyreg._inverted_registry * dict extension_cache = copyreg._extension_cache */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_copyreg); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 257, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_copyreg); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 259, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_extension_registry); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 257, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_extension_registry); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 259, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (!(likely(PyDict_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_t_3))) __PYX_ERR(0, 257, __pyx_L1_error) + if (!(likely(PyDict_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_t_3))) __PYX_ERR(0, 259, __pyx_L1_error) __Pyx_XGOTREF(__pyx_v_5larch_6pickle_6pickle_extension_registry); __Pyx_DECREF_SET(__pyx_v_5larch_6pickle_6pickle_extension_registry, ((PyObject*)__pyx_t_3)); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":258 + /* "larch/pickle/pickle.pyx":260 * dict dispatch_table = copyreg.dispatch_table * dict extension_registry = copyreg._extension_registry * dict inverted_registry = copyreg._inverted_registry # <<<<<<<<<<<<<< * dict extension_cache = copyreg._extension_cache * dict modules = sys.modules */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_copyreg); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 258, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_copyreg); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 260, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_inverted_registry); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 258, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_inverted_registry); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 260, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (!(likely(PyDict_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_t_2))) __PYX_ERR(0, 258, __pyx_L1_error) + if (!(likely(PyDict_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_t_2))) __PYX_ERR(0, 260, __pyx_L1_error) __Pyx_XGOTREF(__pyx_v_5larch_6pickle_6pickle_inverted_registry); __Pyx_DECREF_SET(__pyx_v_5larch_6pickle_6pickle_inverted_registry, ((PyObject*)__pyx_t_2)); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":259 + /* "larch/pickle/pickle.pyx":261 * dict extension_registry = copyreg._extension_registry * dict inverted_registry = copyreg._inverted_registry * dict extension_cache = copyreg._extension_cache # <<<<<<<<<<<<<< * dict modules = sys.modules * _end_item = object() */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_copyreg); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 259, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_copyreg); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 261, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_extension_cache); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 259, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_extension_cache); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 261, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (!(likely(PyDict_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_t_3))) __PYX_ERR(0, 259, __pyx_L1_error) + if (!(likely(PyDict_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_t_3))) __PYX_ERR(0, 261, __pyx_L1_error) __Pyx_XGOTREF(__pyx_v_5larch_6pickle_6pickle_extension_cache); __Pyx_DECREF_SET(__pyx_v_5larch_6pickle_6pickle_extension_cache, ((PyObject*)__pyx_t_3)); __Pyx_GIVEREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":260 + /* "larch/pickle/pickle.pyx":262 * dict inverted_registry = copyreg._inverted_registry * dict extension_cache = copyreg._extension_cache * dict modules = sys.modules # <<<<<<<<<<<<<< * _end_item = object() * */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_sys); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 260, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_sys); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 262, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_modules); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 260, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_modules); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 262, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (!(likely(PyDict_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_t_2))) __PYX_ERR(0, 260, __pyx_L1_error) + if (!(likely(PyDict_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None) || __Pyx_RaiseUnexpectedTypeError("dict", __pyx_t_2))) __PYX_ERR(0, 262, __pyx_L1_error) __Pyx_XGOTREF(__pyx_v_5larch_6pickle_6pickle_modules); __Pyx_DECREF_SET(__pyx_v_5larch_6pickle_6pickle_modules, ((PyObject*)__pyx_t_2)); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":261 + /* "larch/pickle/pickle.pyx":263 * dict extension_cache = copyreg._extension_cache * dict modules = sys.modules * _end_item = object() # <<<<<<<<<<<<<< * * */ - __pyx_t_2 = __Pyx_PyObject_CallNoArg(__pyx_builtin_object); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 261, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_CallNoArg(__pyx_builtin_object); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 263, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_XGOTREF(__pyx_v_5larch_6pickle_6pickle__end_item); __Pyx_DECREF_SET(__pyx_v_5larch_6pickle_6pickle__end_item, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":364 + /* "larch/pickle/pickle.pyx":366 * * @pickle_register.secure_unpickle * class PickleError(Exception): # <<<<<<<<<<<<<< * pass * */ - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 364, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 366, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])); __Pyx_GIVEREF((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])))) __PYX_ERR(0, 364, __pyx_L1_error); - __pyx_t_3 = __Pyx_PEP560_update_bases(__pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 364, __pyx_L1_error) + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])))) __PYX_ERR(0, 366, __pyx_L1_error); + __pyx_t_3 = __Pyx_PEP560_update_bases(__pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 366, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __Pyx_CalculateMetaclass(NULL, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 364, __pyx_L1_error) + __pyx_t_4 = __Pyx_CalculateMetaclass(NULL, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 366, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = __Pyx_Py3MetaclassPrepare(__pyx_t_4, __pyx_t_3, __pyx_n_s_PickleError, __pyx_n_s_PickleError, (PyObject *) NULL, __pyx_n_s_larch_pickle_pickle, (PyObject *) NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 364, __pyx_L1_error) + __pyx_t_5 = __Pyx_Py3MetaclassPrepare(__pyx_t_4, __pyx_t_3, __pyx_n_s_PickleError, __pyx_n_s_PickleError, (PyObject *) NULL, __pyx_n_s_larch_pickle_pickle, (PyObject *) NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 366, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_3 != __pyx_t_2) { - if (unlikely((PyDict_SetItemString(__pyx_t_5, "__orig_bases__", __pyx_t_2) < 0))) __PYX_ERR(0, 364, __pyx_L1_error) + if (unlikely((PyDict_SetItemString(__pyx_t_5, "__orig_bases__", __pyx_t_2) < 0))) __PYX_ERR(0, 366, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":363 + /* "larch/pickle/pickle.pyx":365 * * * @pickle_register.secure_unpickle # <<<<<<<<<<<<<< * class PickleError(Exception): * pass */ - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_pickle_register); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 363, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_pickle_register); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 365, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_secure_unpickle); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 363, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_secure_unpickle); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 365, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "larch/pickle/pickle.pyx":364 + /* "larch/pickle/pickle.pyx":366 * * @pickle_register.secure_unpickle * class PickleError(Exception): # <<<<<<<<<<<<<< * pass * */ - __pyx_t_6 = __Pyx_Py3ClassCreate(__pyx_t_4, __pyx_n_s_PickleError, __pyx_t_3, __pyx_t_5, NULL, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 364, __pyx_L1_error) + __pyx_t_6 = __Pyx_Py3ClassCreate(__pyx_t_4, __pyx_n_s_PickleError, __pyx_t_3, __pyx_t_5, NULL, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 366, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __pyx_t_8 = NULL; __pyx_t_9 = 0; @@ -19691,62 +19734,62 @@ if (!__Pyx_RefNanny) { __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_7, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 363, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 365, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } - if (PyDict_SetItem(__pyx_d, __pyx_n_s_PickleError, __pyx_t_2) < 0) __PYX_ERR(0, 364, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_PickleError, __pyx_t_2) < 0) __PYX_ERR(0, 366, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":369 + /* "larch/pickle/pickle.pyx":371 * * @pickle_register.secure_unpickle * class PicklingError(PickleError): # <<<<<<<<<<<<<< * pass * */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_PickleError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 369, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_PickleError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 371, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 369, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 371, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3)) __PYX_ERR(0, 369, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3)) __PYX_ERR(0, 371, __pyx_L1_error); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PEP560_update_bases(__pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 369, __pyx_L1_error) + __pyx_t_3 = __Pyx_PEP560_update_bases(__pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 371, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = __Pyx_CalculateMetaclass(NULL, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 369, __pyx_L1_error) + __pyx_t_5 = __Pyx_CalculateMetaclass(NULL, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 371, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_2 = __Pyx_Py3MetaclassPrepare(__pyx_t_5, __pyx_t_3, __pyx_n_s_PicklingError, __pyx_n_s_PicklingError, (PyObject *) NULL, __pyx_n_s_larch_pickle_pickle, (PyObject *) NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 369, __pyx_L1_error) + __pyx_t_2 = __Pyx_Py3MetaclassPrepare(__pyx_t_5, __pyx_t_3, __pyx_n_s_PicklingError, __pyx_n_s_PicklingError, (PyObject *) NULL, __pyx_n_s_larch_pickle_pickle, (PyObject *) NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 371, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); if (__pyx_t_3 != __pyx_t_4) { - if (unlikely((PyDict_SetItemString(__pyx_t_2, "__orig_bases__", __pyx_t_4) < 0))) __PYX_ERR(0, 369, __pyx_L1_error) + if (unlikely((PyDict_SetItemString(__pyx_t_2, "__orig_bases__", __pyx_t_4) < 0))) __PYX_ERR(0, 371, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":368 + /* "larch/pickle/pickle.pyx":370 * * * @pickle_register.secure_unpickle # <<<<<<<<<<<<<< * class PicklingError(PickleError): * pass */ - __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_pickle_register); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 368, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_pickle_register); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 370, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_secure_unpickle); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 368, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_secure_unpickle); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 370, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "larch/pickle/pickle.pyx":369 + /* "larch/pickle/pickle.pyx":371 * * @pickle_register.secure_unpickle * class PicklingError(PickleError): # <<<<<<<<<<<<<< * pass * */ - __pyx_t_7 = __Pyx_Py3ClassCreate(__pyx_t_5, __pyx_n_s_PicklingError, __pyx_t_3, __pyx_t_2, NULL, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 369, __pyx_L1_error) + __pyx_t_7 = __Pyx_Py3ClassCreate(__pyx_t_5, __pyx_n_s_PicklingError, __pyx_t_3, __pyx_t_2, NULL, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 371, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_8 = NULL; __pyx_t_9 = 0; @@ -19767,62 +19810,62 @@ if (!__Pyx_RefNanny) { __pyx_t_4 = __Pyx_PyObject_FastCall(__pyx_t_6, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 368, __pyx_L1_error) + if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 370, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } - if (PyDict_SetItem(__pyx_d, __pyx_n_s_PicklingError, __pyx_t_4) < 0) __PYX_ERR(0, 369, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_PicklingError, __pyx_t_4) < 0) __PYX_ERR(0, 371, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":374 + /* "larch/pickle/pickle.pyx":376 * * @pickle_register.secure_unpickle * class UnpicklingError(PickleError): # <<<<<<<<<<<<<< * pass * */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_PickleError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 374, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_PickleError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 374, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 374, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 376, __pyx_L1_error); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PEP560_update_bases(__pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 374, __pyx_L1_error) + __pyx_t_3 = __Pyx_PEP560_update_bases(__pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 374, __pyx_L1_error) + __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_3, __pyx_n_s_UnpicklingError, __pyx_n_s_UnpicklingError, (PyObject *) NULL, __pyx_n_s_larch_pickle_pickle, (PyObject *) NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 374, __pyx_L1_error) + __pyx_t_4 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_3, __pyx_n_s_UnpicklingError, __pyx_n_s_UnpicklingError, (PyObject *) NULL, __pyx_n_s_larch_pickle_pickle, (PyObject *) NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); if (__pyx_t_3 != __pyx_t_5) { - if (unlikely((PyDict_SetItemString(__pyx_t_4, "__orig_bases__", __pyx_t_5) < 0))) __PYX_ERR(0, 374, __pyx_L1_error) + if (unlikely((PyDict_SetItemString(__pyx_t_4, "__orig_bases__", __pyx_t_5) < 0))) __PYX_ERR(0, 376, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "larch/pickle/pickle.pyx":373 + /* "larch/pickle/pickle.pyx":375 * * * @pickle_register.secure_unpickle # <<<<<<<<<<<<<< * class UnpicklingError(PickleError): * pass */ - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_pickle_register); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 373, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_pickle_register); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 375, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_secure_unpickle); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 373, __pyx_L1_error) + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_secure_unpickle); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 375, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "larch/pickle/pickle.pyx":374 + /* "larch/pickle/pickle.pyx":376 * * @pickle_register.secure_unpickle * class UnpicklingError(PickleError): # <<<<<<<<<<<<<< * pass * */ - __pyx_t_6 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_UnpicklingError, __pyx_t_3, __pyx_t_4, NULL, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 374, __pyx_L1_error) + __pyx_t_6 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_UnpicklingError, __pyx_t_3, __pyx_t_4, NULL, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __pyx_t_8 = NULL; __pyx_t_9 = 0; @@ -19843,62 +19886,62 @@ if (!__Pyx_RefNanny) { __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_7, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 373, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 375, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } - if (PyDict_SetItem(__pyx_d, __pyx_n_s_UnpicklingError, __pyx_t_5) < 0) __PYX_ERR(0, 374, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_UnpicklingError, __pyx_t_5) < 0) __PYX_ERR(0, 376, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":379 + /* "larch/pickle/pickle.pyx":381 * * @pickle_register.secure_unpickle * class SecurityError(UnpicklingError): # <<<<<<<<<<<<<< * pass * */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 379, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_UnpicklingError); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 381, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 379, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 381, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 379, __pyx_L1_error); + if (__Pyx_PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3)) __PYX_ERR(0, 381, __pyx_L1_error); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PEP560_update_bases(__pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 379, __pyx_L1_error) + __pyx_t_3 = __Pyx_PEP560_update_bases(__pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 381, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __Pyx_CalculateMetaclass(NULL, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 379, __pyx_L1_error) + __pyx_t_4 = __Pyx_CalculateMetaclass(NULL, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 381, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = __Pyx_Py3MetaclassPrepare(__pyx_t_4, __pyx_t_3, __pyx_n_s_SecurityError, __pyx_n_s_SecurityError, (PyObject *) NULL, __pyx_n_s_larch_pickle_pickle, (PyObject *) NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 379, __pyx_L1_error) + __pyx_t_5 = __Pyx_Py3MetaclassPrepare(__pyx_t_4, __pyx_t_3, __pyx_n_s_SecurityError, __pyx_n_s_SecurityError, (PyObject *) NULL, __pyx_n_s_larch_pickle_pickle, (PyObject *) NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 381, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); if (__pyx_t_3 != __pyx_t_2) { - if (unlikely((PyDict_SetItemString(__pyx_t_5, "__orig_bases__", __pyx_t_2) < 0))) __PYX_ERR(0, 379, __pyx_L1_error) + if (unlikely((PyDict_SetItemString(__pyx_t_5, "__orig_bases__", __pyx_t_2) < 0))) __PYX_ERR(0, 381, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "larch/pickle/pickle.pyx":378 + /* "larch/pickle/pickle.pyx":380 * * * @pickle_register.secure_unpickle # <<<<<<<<<<<<<< * class SecurityError(UnpicklingError): * pass */ - __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_pickle_register); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 378, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_pickle_register); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 380, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_secure_unpickle); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 378, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_secure_unpickle); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 380, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "larch/pickle/pickle.pyx":379 + /* "larch/pickle/pickle.pyx":381 * * @pickle_register.secure_unpickle * class SecurityError(UnpicklingError): # <<<<<<<<<<<<<< * pass * */ - __pyx_t_7 = __Pyx_Py3ClassCreate(__pyx_t_4, __pyx_n_s_SecurityError, __pyx_t_3, __pyx_t_5, NULL, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 379, __pyx_L1_error) + __pyx_t_7 = __Pyx_Py3ClassCreate(__pyx_t_4, __pyx_n_s_SecurityError, __pyx_t_3, __pyx_t_5, NULL, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 381, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __pyx_t_8 = NULL; __pyx_t_9 = 0; @@ -19919,17 +19962,17 @@ if (!__Pyx_RefNanny) { __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_6, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9); __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 378, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 380, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; } - if (PyDict_SetItem(__pyx_d, __pyx_n_s_SecurityError, __pyx_t_2) < 0) __PYX_ERR(0, 379, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_SecurityError, __pyx_t_2) < 0) __PYX_ERR(0, 381, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":624 + /* "larch/pickle/pickle.pyx":626 * reraise() * * save_object_ptr = save_object # <<<<<<<<<<<<<< @@ -19938,136 +19981,136 @@ if (!__Pyx_RefNanny) { */ save_object_ptr = __pyx_f_5larch_6pickle_6pickle_save_object; - /* "larch/pickle/pickle.pyx":640 + /* "larch/pickle/pickle.pyx":642 * * * register_type(1, save_int) # <<<<<<<<<<<<<< * register_type(1L, save_long) * register_type(True, save_bool) */ - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_int_1, save_int); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 640, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_int_1, save_int); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 642, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":641 + /* "larch/pickle/pickle.pyx":643 * * register_type(1, save_int) * register_type(1L, save_long) # <<<<<<<<<<<<<< * register_type(True, save_bool) * register_type(None, save_none) */ - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_int_1L, __pyx_f_5larch_6pickle_6pickle_save_long); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 641, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_int_1L, __pyx_f_5larch_6pickle_6pickle_save_long); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 643, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":642 + /* "larch/pickle/pickle.pyx":644 * register_type(1, save_int) * register_type(1L, save_long) * register_type(True, save_bool) # <<<<<<<<<<<<<< * register_type(None, save_none) * register_type(1.0, save_float) */ - __pyx_f_5larch_6pickle_6pickle_register_type(Py_True, save_bool); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 642, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(Py_True, save_bool); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 644, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":643 + /* "larch/pickle/pickle.pyx":645 * register_type(1L, save_long) * register_type(True, save_bool) * register_type(None, save_none) # <<<<<<<<<<<<<< * register_type(1.0, save_float) * register_type((), save_tuple) */ - __pyx_f_5larch_6pickle_6pickle_register_type(Py_None, save_none); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 643, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(Py_None, save_none); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 645, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":644 + /* "larch/pickle/pickle.pyx":646 * register_type(True, save_bool) * register_type(None, save_none) * register_type(1.0, save_float) # <<<<<<<<<<<<<< * register_type((), save_tuple) * register_type([], save_list) */ - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_float_1_0, save_float); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 644, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_float_1_0, save_float); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 646, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":645 + /* "larch/pickle/pickle.pyx":647 * register_type(None, save_none) * register_type(1.0, save_float) * register_type((), save_tuple) # <<<<<<<<<<<<<< * register_type([], save_list) * register_type({}, save_dict) */ - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_empty_tuple, save_tuple); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 645, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_empty_tuple, save_tuple); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 647, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":646 + /* "larch/pickle/pickle.pyx":648 * register_type(1.0, save_float) * register_type((), save_tuple) * register_type([], save_list) # <<<<<<<<<<<<<< * register_type({}, save_dict) * register_type(type, save_global) */ - __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 646, __pyx_L1_error) + __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 648, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_t_3, save_list); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 646, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_t_3, save_list); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 648, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":647 + /* "larch/pickle/pickle.pyx":649 * register_type((), save_tuple) * register_type([], save_list) * register_type({}, save_dict) # <<<<<<<<<<<<<< * register_type(type, save_global) * register_type(iter([]), save_impossible) */ - __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 647, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 649, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_t_3, save_dict); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 647, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_t_3, save_dict); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 649, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":648 + /* "larch/pickle/pickle.pyx":650 * register_type([], save_list) * register_type({}, save_dict) * register_type(type, save_global) # <<<<<<<<<<<<<< * register_type(iter([]), save_impossible) * register_type(iter(()), save_impossible) */ - __pyx_f_5larch_6pickle_6pickle_register_type(((PyObject *)(&PyType_Type)), __pyx_f_5larch_6pickle_6pickle_save_global); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 648, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(((PyObject *)(&PyType_Type)), __pyx_f_5larch_6pickle_6pickle_save_global); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 650, __pyx_L1_error) - /* "larch/pickle/pickle.pyx":649 + /* "larch/pickle/pickle.pyx":651 * register_type({}, save_dict) * register_type(type, save_global) * register_type(iter([]), save_impossible) # <<<<<<<<<<<<<< * register_type(iter(()), save_impossible) * pickle_registry.register_type(types.GeneratorType, save_impossible) */ - __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 649, __pyx_L1_error) + __pyx_t_3 = PyList_New(0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 649, __pyx_L1_error) + __pyx_t_4 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_t_4, __pyx_f_5larch_6pickle_6pickle_save_impossible); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 649, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_t_4, __pyx_f_5larch_6pickle_6pickle_save_impossible); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 651, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":650 + /* "larch/pickle/pickle.pyx":652 * register_type(type, save_global) * register_type(iter([]), save_impossible) * register_type(iter(()), save_impossible) # <<<<<<<<<<<<<< * pickle_registry.register_type(types.GeneratorType, save_impossible) * */ - __pyx_t_4 = PyObject_GetIter(__pyx_empty_tuple); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 650, __pyx_L1_error) + __pyx_t_4 = PyObject_GetIter(__pyx_empty_tuple); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 652, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_t_4, __pyx_f_5larch_6pickle_6pickle_save_impossible); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 650, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_t_4, __pyx_f_5larch_6pickle_6pickle_save_impossible); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 652, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":651 + /* "larch/pickle/pickle.pyx":653 * register_type(iter([]), save_impossible) * register_type(iter(()), save_impossible) * pickle_registry.register_type(types.GeneratorType, save_impossible) # <<<<<<<<<<<<<< * * */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_types); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 651, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_types); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 653, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_GeneratorType); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 651, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_GeneratorType); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 653, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; pickle_registry.register_type(__pyx_t_3, __pyx_f_5larch_6pickle_6pickle_save_impossible); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":655 + /* "larch/pickle/pickle.pyx":657 * * #the string type will be used as first dump candidate! * cdef _string_type = type(unicode()) # <<<<<<<<<<<<<< @@ -20079,7 +20122,7 @@ if (!__Pyx_RefNanny) { __Pyx_DECREF_SET(__pyx_v_5larch_6pickle_6pickle__string_type, ((PyObject *)Py_TYPE(__pyx_kp_u__3))); __Pyx_GIVEREF(((PyObject *)Py_TYPE(__pyx_kp_u__3))); - /* "larch/pickle/pickle.pyx":656 + /* "larch/pickle/pickle.pyx":658 * #the string type will be used as first dump candidate! * cdef _string_type = type(unicode()) * string_type = _string_type # <<<<<<<<<<<<<< @@ -20088,7 +20131,7 @@ if (!__Pyx_RefNanny) { */ string_type = ((void *)__pyx_v_5larch_6pickle_6pickle__string_type); - /* "larch/pickle/pickle.pyx":657 + /* "larch/pickle/pickle.pyx":659 * cdef _string_type = type(unicode()) * string_type = _string_type * save_string_ptr = save_str3 # <<<<<<<<<<<<<< @@ -20097,19 +20140,19 @@ if (!__Pyx_RefNanny) { */ save_string_ptr = save_str3; - /* "larch/pickle/pickle.pyx":658 + /* "larch/pickle/pickle.pyx":660 * string_type = _string_type * save_string_ptr = save_str3 * register_type(bytes(), save_bytes) # <<<<<<<<<<<<<< * * */ - __pyx_t_3 = __Pyx_PyObject_CallNoArg(((PyObject *)(&PyBytes_Type))); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 658, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_CallNoArg(((PyObject *)(&PyBytes_Type))); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 660, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_t_3, save_bytes); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 658, __pyx_L1_error) + __pyx_f_5larch_6pickle_6pickle_register_type(__pyx_t_3, save_bytes); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 660, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":695 + /* "larch/pickle/pickle.pyx":697 * * def __init__( * self, file=None, protocol=MAX_PROTOCOL_VERSION, with_refs=True): # <<<<<<<<<<<<<< @@ -20120,1003 +20163,1003 @@ if (!__Pyx_RefNanny) { __pyx_k_ = __pyx_v_5larch_6pickle_6pickle_MAX_PROTOCOL_VERSION; __Pyx_GIVEREF(__pyx_v_5larch_6pickle_6pickle_MAX_PROTOCOL_VERSION); - /* "larch/pickle/pickle.pyx":744 + /* "larch/pickle/pickle.pyx":746 * "{}.__init__()".format((self.__class__.__qualname__,))) * * def dump(self, obj, bool with_version=True): # <<<<<<<<<<<<<< * self.check_init() * if with_version: */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_7Pickler_5dump, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Pickler_dump, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__9)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 744, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_7Pickler_5dump, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Pickler_dump, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__9)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 746, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__10); - if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Pickler, __pyx_n_s_dump, __pyx_t_3) < 0) __PYX_ERR(0, 744, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Pickler, __pyx_n_s_dump, __pyx_t_3) < 0) __PYX_ERR(0, 746, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; PyType_Modified(__pyx_ptype_5larch_6pickle_6pickle_Pickler); - /* "larch/pickle/pickle.pyx":754 + /* "larch/pickle/pickle.pyx":756 * return self * * def dumps(self, obj, bool with_version=True): # <<<<<<<<<<<<<< * self.check_init() * (self.file).reset() */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_7Pickler_7dumps, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Pickler_dumps, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__11)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 754, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_7Pickler_7dumps, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Pickler_dumps, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__11)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 756, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__10); - if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Pickler, __pyx_n_s_dumps, __pyx_t_3) < 0) __PYX_ERR(0, 754, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Pickler, __pyx_n_s_dumps, __pyx_t_3) < 0) __PYX_ERR(0, 756, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; PyType_Modified(__pyx_ptype_5larch_6pickle_6pickle_Pickler); - /* "larch/pickle/pickle.pyx":766 + /* "larch/pickle/pickle.pyx":768 * return self.get_output_string() * * cpdef bytes get_output_string(self): # <<<<<<<<<<<<<< * return (self.file).result() * */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_7Pickler_9get_output_string, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Pickler_get_output_string, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__13)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 766, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_7Pickler_9get_output_string, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Pickler_get_output_string, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__13)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 768, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Pickler, __pyx_n_s_get_output_string, __pyx_t_3) < 0) __PYX_ERR(0, 766, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Pickler, __pyx_n_s_get_output_string, __pyx_t_3) < 0) __PYX_ERR(0, 768, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; PyType_Modified(__pyx_ptype_5larch_6pickle_6pickle_Pickler); - /* "larch/pickle/pickle.pyx":950 + /* "larch/pickle/pickle.pyx":952 * unpickle_registry[i+offset] = loader * * _register_unpickle(load_wrong_code, range(0, 0x200)) # <<<<<<<<<<<<<< * _register_unpickle(load_uint4, range(0x80)) * _register_unpickle(load_int4, range(0xe0, 0x100)) */ - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__14, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 950, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__14, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 952, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_wrong_code), __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 950, __pyx_L1_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_wrong_code), __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 952, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":951 + /* "larch/pickle/pickle.pyx":953 * * _register_unpickle(load_wrong_code, range(0, 0x200)) * _register_unpickle(load_uint4, range(0x80)) # <<<<<<<<<<<<<< * _register_unpickle(load_int4, range(0xe0, 0x100)) * _register_unpickle(load_ref, [0xc1]) */ - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__15, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 951, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__15, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 953, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_uint4, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 951, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_uint4, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 953, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":952 + /* "larch/pickle/pickle.pyx":954 * _register_unpickle(load_wrong_code, range(0, 0x200)) * _register_unpickle(load_uint4, range(0x80)) * _register_unpickle(load_int4, range(0xe0, 0x100)) # <<<<<<<<<<<<<< * _register_unpickle(load_ref, [0xc1]) * _register_unpickle(load_uint8, [0xcc]) */ - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__16, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 952, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__16, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 954, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_int4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 952, __pyx_L1_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_int4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 954, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":953 + /* "larch/pickle/pickle.pyx":955 * _register_unpickle(load_uint4, range(0x80)) * _register_unpickle(load_int4, range(0xe0, 0x100)) * _register_unpickle(load_ref, [0xc1]) # <<<<<<<<<<<<<< * _register_unpickle(load_uint8, [0xcc]) * _register_unpickle(load_uint16, [0xcd]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 953, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 955, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_193); __Pyx_GIVEREF(__pyx_int_193); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_193)) __PYX_ERR(0, 953, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_ref), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 953, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_193)) __PYX_ERR(0, 955, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_ref), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 955, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":954 + /* "larch/pickle/pickle.pyx":956 * _register_unpickle(load_int4, range(0xe0, 0x100)) * _register_unpickle(load_ref, [0xc1]) * _register_unpickle(load_uint8, [0xcc]) # <<<<<<<<<<<<<< * _register_unpickle(load_uint16, [0xcd]) * _register_unpickle(load_uint32, [0xce]) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 954, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 956, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_204); __Pyx_GIVEREF(__pyx_int_204); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_204)) __PYX_ERR(0, 954, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_uint8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 954, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_204)) __PYX_ERR(0, 956, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_uint8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 956, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":955 + /* "larch/pickle/pickle.pyx":957 * _register_unpickle(load_ref, [0xc1]) * _register_unpickle(load_uint8, [0xcc]) * _register_unpickle(load_uint16, [0xcd]) # <<<<<<<<<<<<<< * _register_unpickle(load_uint32, [0xce]) * _register_unpickle(load_uint64, [0xcf]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 955, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 957, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_205); __Pyx_GIVEREF(__pyx_int_205); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_205)) __PYX_ERR(0, 955, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_uint16, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 955, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_205)) __PYX_ERR(0, 957, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_uint16, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 957, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":956 + /* "larch/pickle/pickle.pyx":958 * _register_unpickle(load_uint8, [0xcc]) * _register_unpickle(load_uint16, [0xcd]) * _register_unpickle(load_uint32, [0xce]) # <<<<<<<<<<<<<< * _register_unpickle(load_uint64, [0xcf]) * _register_unpickle(load_int8, [0xd0]) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 956, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 958, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_206); __Pyx_GIVEREF(__pyx_int_206); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_206)) __PYX_ERR(0, 956, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_uint32, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 956, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_206)) __PYX_ERR(0, 958, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_uint32, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 958, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":957 + /* "larch/pickle/pickle.pyx":959 * _register_unpickle(load_uint16, [0xcd]) * _register_unpickle(load_uint32, [0xce]) * _register_unpickle(load_uint64, [0xcf]) # <<<<<<<<<<<<<< * _register_unpickle(load_int8, [0xd0]) * _register_unpickle(load_int16, [0xd1]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 957, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 959, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_207); __Pyx_GIVEREF(__pyx_int_207); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_207)) __PYX_ERR(0, 957, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_uint64, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 957, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_207)) __PYX_ERR(0, 959, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_uint64, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 959, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":958 + /* "larch/pickle/pickle.pyx":960 * _register_unpickle(load_uint32, [0xce]) * _register_unpickle(load_uint64, [0xcf]) * _register_unpickle(load_int8, [0xd0]) # <<<<<<<<<<<<<< * _register_unpickle(load_int16, [0xd1]) * _register_unpickle(load_int32, [0xd2]) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 958, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 960, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_208); __Pyx_GIVEREF(__pyx_int_208); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_208)) __PYX_ERR(0, 958, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_int8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 958, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_208)) __PYX_ERR(0, 960, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_int8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 960, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":959 + /* "larch/pickle/pickle.pyx":961 * _register_unpickle(load_uint64, [0xcf]) * _register_unpickle(load_int8, [0xd0]) * _register_unpickle(load_int16, [0xd1]) # <<<<<<<<<<<<<< * _register_unpickle(load_int32, [0xd2]) * _register_unpickle(load_int64, [0xd3]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 959, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 961, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_209); __Pyx_GIVEREF(__pyx_int_209); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_209)) __PYX_ERR(0, 959, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_int16, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 959, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_209)) __PYX_ERR(0, 961, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_int16, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 961, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":960 + /* "larch/pickle/pickle.pyx":962 * _register_unpickle(load_int8, [0xd0]) * _register_unpickle(load_int16, [0xd1]) * _register_unpickle(load_int32, [0xd2]) # <<<<<<<<<<<<<< * _register_unpickle(load_int64, [0xd3]) * _register_unpickle(load_map4, range(0x80, 0x90)) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 960, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 962, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_210); __Pyx_GIVEREF(__pyx_int_210); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_210)) __PYX_ERR(0, 960, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_int32, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 960, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_210)) __PYX_ERR(0, 962, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_int32, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 962, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":961 + /* "larch/pickle/pickle.pyx":963 * _register_unpickle(load_int16, [0xd1]) * _register_unpickle(load_int32, [0xd2]) * _register_unpickle(load_int64, [0xd3]) # <<<<<<<<<<<<<< * _register_unpickle(load_map4, range(0x80, 0x90)) * _register_unpickle(load_map16,[0xde]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 961, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 963, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_211); __Pyx_GIVEREF(__pyx_int_211); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_211)) __PYX_ERR(0, 961, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_int64, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 961, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_211)) __PYX_ERR(0, 963, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_int64, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 963, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":962 + /* "larch/pickle/pickle.pyx":964 * _register_unpickle(load_int32, [0xd2]) * _register_unpickle(load_int64, [0xd3]) * _register_unpickle(load_map4, range(0x80, 0x90)) # <<<<<<<<<<<<<< * _register_unpickle(load_map16,[0xde]) * _register_unpickle(load_map32, [0xdf]) */ - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__17, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 962, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__17, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 964, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_map4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 962, __pyx_L1_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_map4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 964, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":963 + /* "larch/pickle/pickle.pyx":965 * _register_unpickle(load_int64, [0xd3]) * _register_unpickle(load_map4, range(0x80, 0x90)) * _register_unpickle(load_map16,[0xde]) # <<<<<<<<<<<<<< * _register_unpickle(load_map32, [0xdf]) * _register_unpickle(load_nil, [0xc0]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 963, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 965, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_222); __Pyx_GIVEREF(__pyx_int_222); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_222)) __PYX_ERR(0, 963, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_map16, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 963, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_222)) __PYX_ERR(0, 965, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_map16, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 965, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":964 + /* "larch/pickle/pickle.pyx":966 * _register_unpickle(load_map4, range(0x80, 0x90)) * _register_unpickle(load_map16,[0xde]) * _register_unpickle(load_map32, [0xdf]) # <<<<<<<<<<<<<< * _register_unpickle(load_nil, [0xc0]) * _register_unpickle(load_false, [0xc2]) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 964, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 966, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_223); __Pyx_GIVEREF(__pyx_int_223); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_223)) __PYX_ERR(0, 964, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_map32, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 964, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_223)) __PYX_ERR(0, 966, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_map32, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 966, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":965 + /* "larch/pickle/pickle.pyx":967 * _register_unpickle(load_map16,[0xde]) * _register_unpickle(load_map32, [0xdf]) * _register_unpickle(load_nil, [0xc0]) # <<<<<<<<<<<<<< * _register_unpickle(load_false, [0xc2]) * _register_unpickle(load_true, [0xc3]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 965, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 967, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_192); __Pyx_GIVEREF(__pyx_int_192); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_192)) __PYX_ERR(0, 965, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_nil, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 965, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_192)) __PYX_ERR(0, 967, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_nil, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 967, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":966 + /* "larch/pickle/pickle.pyx":968 * _register_unpickle(load_map32, [0xdf]) * _register_unpickle(load_nil, [0xc0]) * _register_unpickle(load_false, [0xc2]) # <<<<<<<<<<<<<< * _register_unpickle(load_true, [0xc3]) * _register_unpickle(load_str4, range(0xa0, 0xc0)) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 966, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 968, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_194); __Pyx_GIVEREF(__pyx_int_194); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_194)) __PYX_ERR(0, 966, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_false, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 966, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_194)) __PYX_ERR(0, 968, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_false, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 968, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":967 + /* "larch/pickle/pickle.pyx":969 * _register_unpickle(load_nil, [0xc0]) * _register_unpickle(load_false, [0xc2]) * _register_unpickle(load_true, [0xc3]) # <<<<<<<<<<<<<< * _register_unpickle(load_str4, range(0xa0, 0xc0)) * _register_unpickle(load_str8, [0xd9]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 967, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 969, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_195); __Pyx_GIVEREF(__pyx_int_195); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_195)) __PYX_ERR(0, 967, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_true, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 967, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_195)) __PYX_ERR(0, 969, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_true, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 969, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":968 + /* "larch/pickle/pickle.pyx":970 * _register_unpickle(load_false, [0xc2]) * _register_unpickle(load_true, [0xc3]) * _register_unpickle(load_str4, range(0xa0, 0xc0)) # <<<<<<<<<<<<<< * _register_unpickle(load_str8, [0xd9]) * _register_unpickle(load_str16, [0xda]) */ - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__18, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 968, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__18, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 970, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_str4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 968, __pyx_L1_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_str4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 970, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":969 + /* "larch/pickle/pickle.pyx":971 * _register_unpickle(load_true, [0xc3]) * _register_unpickle(load_str4, range(0xa0, 0xc0)) * _register_unpickle(load_str8, [0xd9]) # <<<<<<<<<<<<<< * _register_unpickle(load_str16, [0xda]) * _register_unpickle(load_str32, [0xdb]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 969, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 971, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_217); __Pyx_GIVEREF(__pyx_int_217); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_217)) __PYX_ERR(0, 969, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_str8, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 969, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_217)) __PYX_ERR(0, 971, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_str8, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 971, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":970 + /* "larch/pickle/pickle.pyx":972 * _register_unpickle(load_str4, range(0xa0, 0xc0)) * _register_unpickle(load_str8, [0xd9]) * _register_unpickle(load_str16, [0xda]) # <<<<<<<<<<<<<< * _register_unpickle(load_str32, [0xdb]) * _register_unpickle(load_bin8, [0xc4]) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 970, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 972, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_218); __Pyx_GIVEREF(__pyx_int_218); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_218)) __PYX_ERR(0, 970, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_str16, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 970, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_218)) __PYX_ERR(0, 972, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_str16, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 972, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":971 + /* "larch/pickle/pickle.pyx":973 * _register_unpickle(load_str8, [0xd9]) * _register_unpickle(load_str16, [0xda]) * _register_unpickle(load_str32, [0xdb]) # <<<<<<<<<<<<<< * _register_unpickle(load_bin8, [0xc4]) * _register_unpickle(load_bin16, [0xc5]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 971, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 973, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_219); __Pyx_GIVEREF(__pyx_int_219); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_219)) __PYX_ERR(0, 971, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_str32, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 971, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_219)) __PYX_ERR(0, 973, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_str32, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 973, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":972 + /* "larch/pickle/pickle.pyx":974 * _register_unpickle(load_str16, [0xda]) * _register_unpickle(load_str32, [0xdb]) * _register_unpickle(load_bin8, [0xc4]) # <<<<<<<<<<<<<< * _register_unpickle(load_bin16, [0xc5]) * _register_unpickle(load_bin32, [0xc6]) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 972, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 974, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_196); __Pyx_GIVEREF(__pyx_int_196); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_196)) __PYX_ERR(0, 972, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_bin8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 972, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_196)) __PYX_ERR(0, 974, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_bin8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 974, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":973 + /* "larch/pickle/pickle.pyx":975 * _register_unpickle(load_str32, [0xdb]) * _register_unpickle(load_bin8, [0xc4]) * _register_unpickle(load_bin16, [0xc5]) # <<<<<<<<<<<<<< * _register_unpickle(load_bin32, [0xc6]) * _register_unpickle(load_array4, range(0x90, 0xa0)) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 973, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 975, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_197); __Pyx_GIVEREF(__pyx_int_197); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_197)) __PYX_ERR(0, 973, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_bin16, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 973, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_197)) __PYX_ERR(0, 975, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_bin16, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 975, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":974 + /* "larch/pickle/pickle.pyx":976 * _register_unpickle(load_bin8, [0xc4]) * _register_unpickle(load_bin16, [0xc5]) * _register_unpickle(load_bin32, [0xc6]) # <<<<<<<<<<<<<< * _register_unpickle(load_array4, range(0x90, 0xa0)) * _register_unpickle(load_array16, [0xdc]) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 974, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 976, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_198); __Pyx_GIVEREF(__pyx_int_198); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_198)) __PYX_ERR(0, 974, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_bin32, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 974, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_198)) __PYX_ERR(0, 976, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_bin32, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 976, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":975 + /* "larch/pickle/pickle.pyx":977 * _register_unpickle(load_bin16, [0xc5]) * _register_unpickle(load_bin32, [0xc6]) * _register_unpickle(load_array4, range(0x90, 0xa0)) # <<<<<<<<<<<<<< * _register_unpickle(load_array16, [0xdc]) * _register_unpickle(load_array32, [0xdd]) */ - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__19, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 975, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_tuple__19, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 977, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_array4, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 975, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_array4, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 977, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":976 + /* "larch/pickle/pickle.pyx":978 * _register_unpickle(load_bin32, [0xc6]) * _register_unpickle(load_array4, range(0x90, 0xa0)) * _register_unpickle(load_array16, [0xdc]) # <<<<<<<<<<<<<< * _register_unpickle(load_array32, [0xdd]) * _register_unpickle(load_float, [0xcb]) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 976, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 978, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_220); __Pyx_GIVEREF(__pyx_int_220); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_220)) __PYX_ERR(0, 976, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_array16, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 976, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_220)) __PYX_ERR(0, 978, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_array16, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 978, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":977 + /* "larch/pickle/pickle.pyx":979 * _register_unpickle(load_array4, range(0x90, 0xa0)) * _register_unpickle(load_array16, [0xdc]) * _register_unpickle(load_array32, [0xdd]) # <<<<<<<<<<<<<< * _register_unpickle(load_float, [0xcb]) * _register_unpickle(load_extf, [0xd4, 0xd5, 0xd6, 0xd7, 0xd8]) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 977, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 979, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_221); __Pyx_GIVEREF(__pyx_int_221); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_221)) __PYX_ERR(0, 977, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_array32, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 977, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_221)) __PYX_ERR(0, 979, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_array32, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 979, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":978 + /* "larch/pickle/pickle.pyx":980 * _register_unpickle(load_array16, [0xdc]) * _register_unpickle(load_array32, [0xdd]) * _register_unpickle(load_float, [0xcb]) # <<<<<<<<<<<<<< * _register_unpickle(load_extf, [0xd4, 0xd5, 0xd6, 0xd7, 0xd8]) * _register_unpickle(load_ext8, [0xc7]) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 978, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 980, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_203); __Pyx_GIVEREF(__pyx_int_203); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_203)) __PYX_ERR(0, 978, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_float, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 978, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_203)) __PYX_ERR(0, 980, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_float, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 980, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":979 + /* "larch/pickle/pickle.pyx":981 * _register_unpickle(load_array32, [0xdd]) * _register_unpickle(load_float, [0xcb]) * _register_unpickle(load_extf, [0xd4, 0xd5, 0xd6, 0xd7, 0xd8]) # <<<<<<<<<<<<<< * _register_unpickle(load_ext8, [0xc7]) * _register_unpickle(load_ext16, [0xc8]) */ - __pyx_t_4 = PyList_New(5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 979, __pyx_L1_error) + __pyx_t_4 = PyList_New(5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 981, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_212); __Pyx_GIVEREF(__pyx_int_212); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_212)) __PYX_ERR(0, 979, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_212)) __PYX_ERR(0, 981, __pyx_L1_error); __Pyx_INCREF(__pyx_int_213); __Pyx_GIVEREF(__pyx_int_213); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 1, __pyx_int_213)) __PYX_ERR(0, 979, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 1, __pyx_int_213)) __PYX_ERR(0, 981, __pyx_L1_error); __Pyx_INCREF(__pyx_int_214); __Pyx_GIVEREF(__pyx_int_214); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 2, __pyx_int_214)) __PYX_ERR(0, 979, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 2, __pyx_int_214)) __PYX_ERR(0, 981, __pyx_L1_error); __Pyx_INCREF(__pyx_int_215); __Pyx_GIVEREF(__pyx_int_215); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 3, __pyx_int_215)) __PYX_ERR(0, 979, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 3, __pyx_int_215)) __PYX_ERR(0, 981, __pyx_L1_error); __Pyx_INCREF(__pyx_int_216); __Pyx_GIVEREF(__pyx_int_216); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 4, __pyx_int_216)) __PYX_ERR(0, 979, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_extf, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 979, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 4, __pyx_int_216)) __PYX_ERR(0, 981, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_extf, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 981, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":980 + /* "larch/pickle/pickle.pyx":982 * _register_unpickle(load_float, [0xcb]) * _register_unpickle(load_extf, [0xd4, 0xd5, 0xd6, 0xd7, 0xd8]) * _register_unpickle(load_ext8, [0xc7]) # <<<<<<<<<<<<<< * _register_unpickle(load_ext16, [0xc8]) * _register_unpickle(load_ext32, [0xc9]) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 980, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 982, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_199); __Pyx_GIVEREF(__pyx_int_199); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_199)) __PYX_ERR(0, 980, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_ext8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 980, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_199)) __PYX_ERR(0, 982, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_ext8, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 982, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":981 + /* "larch/pickle/pickle.pyx":983 * _register_unpickle(load_extf, [0xd4, 0xd5, 0xd6, 0xd7, 0xd8]) * _register_unpickle(load_ext8, [0xc7]) * _register_unpickle(load_ext16, [0xc8]) # <<<<<<<<<<<<<< * _register_unpickle(load_ext32, [0xc9]) * _register_unpickle(load_version, [VERSION], 0x100) */ - __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 981, __pyx_L1_error) + __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 983, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_INCREF(__pyx_int_200); __Pyx_GIVEREF(__pyx_int_200); - if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_200)) __PYX_ERR(0, 981, __pyx_L1_error); - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_ext16, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 981, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_4, 0, __pyx_int_200)) __PYX_ERR(0, 983, __pyx_L1_error); + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_ext16, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 983, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":982 + /* "larch/pickle/pickle.pyx":984 * _register_unpickle(load_ext8, [0xc7]) * _register_unpickle(load_ext16, [0xc8]) * _register_unpickle(load_ext32, [0xc9]) # <<<<<<<<<<<<<< * _register_unpickle(load_version, [VERSION], 0x100) * _register_unpickle(load_long, [LONG], 0x100) */ - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 982, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 984, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_INCREF(__pyx_int_201); __Pyx_GIVEREF(__pyx_int_201); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_201)) __PYX_ERR(0, 982, __pyx_L1_error); - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_ext32, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 982, __pyx_L1_error) + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_201)) __PYX_ERR(0, 984, __pyx_L1_error); + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_ext32, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 984, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":983 + /* "larch/pickle/pickle.pyx":985 * _register_unpickle(load_ext16, [0xc8]) * _register_unpickle(load_ext32, [0xc9]) * _register_unpickle(load_version, [VERSION], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_long, [LONG], 0x100) * _register_unpickle(load_list, [LIST], 0x100) */ - __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(VERSION); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 983, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(VERSION); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 985, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 983, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 985, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_4); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 983, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 985, __pyx_L1_error); __pyx_t_4 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_version), __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 983, __pyx_L1_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_version), __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 985, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":984 + /* "larch/pickle/pickle.pyx":986 * _register_unpickle(load_ext32, [0xc9]) * _register_unpickle(load_version, [VERSION], 0x100) * _register_unpickle(load_long, [LONG], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_list, [LIST], 0x100) * _register_unpickle(load_global, [GLOBAL], 0x100) */ - __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(LONG); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 984, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(LONG); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 986, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 984, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 986, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_4); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 984, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 986, __pyx_L1_error); __pyx_t_4 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_long, __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 984, __pyx_L1_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_long, __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 986, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":985 + /* "larch/pickle/pickle.pyx":987 * _register_unpickle(load_version, [VERSION], 0x100) * _register_unpickle(load_long, [LONG], 0x100) * _register_unpickle(load_list, [LIST], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_global, [GLOBAL], 0x100) * _register_unpickle(load_global_object, [GLOBAL_OBJECT], 0x100) */ - __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(LIST); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 985, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(LIST); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 987, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 985, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 987, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_4); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 985, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 987, __pyx_L1_error); __pyx_t_4 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_list, __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 985, __pyx_L1_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_list, __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 987, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":986 + /* "larch/pickle/pickle.pyx":988 * _register_unpickle(load_long, [LONG], 0x100) * _register_unpickle(load_list, [LIST], 0x100) * _register_unpickle(load_global, [GLOBAL], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_global_object, [GLOBAL_OBJECT], 0x100) * _register_unpickle(load_object, [OBJECT], 0x100) */ - __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(GLOBAL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 986, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(GLOBAL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 988, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 986, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 988, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_4); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 986, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 988, __pyx_L1_error); __pyx_t_4 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_global), __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 986, __pyx_L1_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_global), __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 988, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":987 + /* "larch/pickle/pickle.pyx":989 * _register_unpickle(load_list, [LIST], 0x100) * _register_unpickle(load_global, [GLOBAL], 0x100) * _register_unpickle(load_global_object, [GLOBAL_OBJECT], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_object, [OBJECT], 0x100) * _register_unpickle(load_object_new, [OBJECT_NEW, OBJECT_NEW_CUSTOM], 0x100) */ - __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(GLOBAL_OBJECT); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 987, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(GLOBAL_OBJECT); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 989, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 987, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 989, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_4); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 987, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 989, __pyx_L1_error); __pyx_t_4 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_global_object), __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 987, __pyx_L1_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_global_object), __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 989, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":988 + /* "larch/pickle/pickle.pyx":990 * _register_unpickle(load_global, [GLOBAL], 0x100) * _register_unpickle(load_global_object, [GLOBAL_OBJECT], 0x100) * _register_unpickle(load_object, [OBJECT], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_object_new, [OBJECT_NEW, OBJECT_NEW_CUSTOM], 0x100) * _register_unpickle(load_object_fast, [FAST_NEW], 0x100) */ - __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(OBJECT); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 988, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(OBJECT); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 990, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 988, __pyx_L1_error) + __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 990, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_4); - if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 988, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_4)) __PYX_ERR(0, 990, __pyx_L1_error); __pyx_t_4 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_object), __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 988, __pyx_L1_error) + __pyx_t_4 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_object), __pyx_t_3, &__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 990, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "larch/pickle/pickle.pyx":989 + /* "larch/pickle/pickle.pyx":991 * _register_unpickle(load_global_object, [GLOBAL_OBJECT], 0x100) * _register_unpickle(load_object, [OBJECT], 0x100) * _register_unpickle(load_object_new, [OBJECT_NEW, OBJECT_NEW_CUSTOM], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_object_fast, [FAST_NEW], 0x100) * _register_unpickle(load_singleton, [SINGLETON], 0x100) */ - __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(OBJECT_NEW); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 989, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_enum__EXT_TYPES(OBJECT_NEW); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 991, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(OBJECT_NEW_CUSTOM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 989, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(OBJECT_NEW_CUSTOM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 991, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyList_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 989, __pyx_L1_error) + __pyx_t_5 = PyList_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 991, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_4); - if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_4)) __PYX_ERR(0, 989, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_4)) __PYX_ERR(0, 991, __pyx_L1_error); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 1, __pyx_t_3)) __PYX_ERR(0, 989, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 1, __pyx_t_3)) __PYX_ERR(0, 991, __pyx_L1_error); __pyx_t_4 = 0; __pyx_t_3 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_object_new), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 989, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_object_new), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 991, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":990 + /* "larch/pickle/pickle.pyx":992 * _register_unpickle(load_object, [OBJECT], 0x100) * _register_unpickle(load_object_new, [OBJECT_NEW, OBJECT_NEW_CUSTOM], 0x100) * _register_unpickle(load_object_fast, [FAST_NEW], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_singleton, [SINGLETON], 0x100) * _register_unpickle(load_oldstyle, [OLD_STYLE], 0x100) */ - __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(FAST_NEW); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 990, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(FAST_NEW); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 992, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 990, __pyx_L1_error) + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 992, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 990, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 992, __pyx_L1_error); __pyx_t_3 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_object_fast), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 990, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_object_fast), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 992, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":991 + /* "larch/pickle/pickle.pyx":993 * _register_unpickle(load_object_new, [OBJECT_NEW, OBJECT_NEW_CUSTOM], 0x100) * _register_unpickle(load_object_fast, [FAST_NEW], 0x100) * _register_unpickle(load_singleton, [SINGLETON], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_oldstyle, [OLD_STYLE], 0x100) * _register_unpickle(load_initargs, [INIT_ARGS], 0x100) */ - __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(SINGLETON); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 991, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(SINGLETON); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 993, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 991, __pyx_L1_error) + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 993, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 991, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 993, __pyx_L1_error); __pyx_t_3 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_singleton), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 991, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_singleton), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 993, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":992 + /* "larch/pickle/pickle.pyx":994 * _register_unpickle(load_object_fast, [FAST_NEW], 0x100) * _register_unpickle(load_singleton, [SINGLETON], 0x100) * _register_unpickle(load_oldstyle, [OLD_STYLE], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_initargs, [INIT_ARGS], 0x100) * _register_unpickle(load_end_item, [END_OBJECT_ITEMS], 0x100) */ - __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(OLD_STYLE); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 992, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(OLD_STYLE); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 994, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 992, __pyx_L1_error) + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 994, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 992, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 994, __pyx_L1_error); __pyx_t_3 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_oldstyle), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 992, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_oldstyle), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 994, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":993 + /* "larch/pickle/pickle.pyx":995 * _register_unpickle(load_singleton, [SINGLETON], 0x100) * _register_unpickle(load_oldstyle, [OLD_STYLE], 0x100) * _register_unpickle(load_initargs, [INIT_ARGS], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_end_item, [END_OBJECT_ITEMS], 0x100) * _register_unpickle(load_bytes, [BYTES], 0x100) */ - __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(INIT_ARGS); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 993, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(INIT_ARGS); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 995, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 993, __pyx_L1_error) + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 995, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 993, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 995, __pyx_L1_error); __pyx_t_3 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_initargs), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 993, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_initargs), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 995, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":994 + /* "larch/pickle/pickle.pyx":996 * _register_unpickle(load_oldstyle, [OLD_STYLE], 0x100) * _register_unpickle(load_initargs, [INIT_ARGS], 0x100) * _register_unpickle(load_end_item, [END_OBJECT_ITEMS], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_bytes, [BYTES], 0x100) * _register_unpickle(load_unicode, [UNISTR], 0x100) */ - __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(END_OBJECT_ITEMS); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 994, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(END_OBJECT_ITEMS); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 996, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 994, __pyx_L1_error) + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 996, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 994, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 996, __pyx_L1_error); __pyx_t_3 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_end_item), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 994, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(((unpack_t)__pyx_f_5larch_6pickle_6pickle_load_end_item), __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 996, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":995 + /* "larch/pickle/pickle.pyx":997 * _register_unpickle(load_initargs, [INIT_ARGS], 0x100) * _register_unpickle(load_end_item, [END_OBJECT_ITEMS], 0x100) * _register_unpickle(load_bytes, [BYTES], 0x100) # <<<<<<<<<<<<<< * _register_unpickle(load_unicode, [UNISTR], 0x100) * */ - __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(BYTES); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 995, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(BYTES); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 997, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 995, __pyx_L1_error) + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 997, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 995, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 997, __pyx_L1_error); __pyx_t_3 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_bytes, __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 995, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_bytes, __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 997, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":996 + /* "larch/pickle/pickle.pyx":998 * _register_unpickle(load_end_item, [END_OBJECT_ITEMS], 0x100) * _register_unpickle(load_bytes, [BYTES], 0x100) * _register_unpickle(load_unicode, [UNISTR], 0x100) # <<<<<<<<<<<<<< * * */ - __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(UNISTR); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 996, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_enum__EXT_TYPES(UNISTR); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 998, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 996, __pyx_L1_error) + __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 998, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_3); - if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 996, __pyx_L1_error); + if (__Pyx_PyList_SET_ITEM(__pyx_t_5, 0, __pyx_t_3)) __PYX_ERR(0, 998, __pyx_L1_error); __pyx_t_3 = 0; __pyx_t_10.__pyx_n = 1; __pyx_t_10.offset = 0x100; - __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_unicode, __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 996, __pyx_L1_error) + __pyx_t_3 = __pyx_f_5larch_6pickle_6pickle__register_unpickle(load_unicode, __pyx_t_5, &__pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 998, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1134 + /* "larch/pickle/pickle.pyx":1136 * "{}.__init__()".format((self.__class__.__name__,))) * * def find_class(self, str module, str name): # <<<<<<<<<<<<<< * return self.default_find_class(module, name) * */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_9Unpickler_5find_class, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpickler_find_class, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__21)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1134, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_9Unpickler_5find_class, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpickler_find_class, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__21)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1136, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler, __pyx_n_s_find_class, __pyx_t_3) < 0) __PYX_ERR(0, 1134, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler, __pyx_n_s_find_class, __pyx_t_3) < 0) __PYX_ERR(0, 1136, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; PyType_Modified(__pyx_ptype_5larch_6pickle_6pickle_Unpickler); - /* "larch/pickle/pickle.pyx":1137 + /* "larch/pickle/pickle.pyx":1139 * return self.default_find_class(module, name) * * def load(self): # <<<<<<<<<<<<<< * self.check_init() * try: */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_9Unpickler_7load, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpickler_load, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__22)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1137, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_9Unpickler_7load, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpickler_load, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__22)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1139, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler, __pyx_n_s_load, __pyx_t_3) < 0) __PYX_ERR(0, 1137, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler, __pyx_n_s_load, __pyx_t_3) < 0) __PYX_ERR(0, 1139, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; PyType_Modified(__pyx_ptype_5larch_6pickle_6pickle_Unpickler); - /* "larch/pickle/pickle.pyx":1144 + /* "larch/pickle/pickle.pyx":1146 * self.last_refcount = self.unpacker.reset() * * def loads(self, bytes obj): # <<<<<<<<<<<<<< * self.check_init() * (<_BufferContainer>self.file).set(obj) */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_9Unpickler_9loads, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpickler_loads, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__24)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1144, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_9Unpickler_9loads, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpickler_loads, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__24)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1146, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler, __pyx_n_s_loads, __pyx_t_3) < 0) __PYX_ERR(0, 1144, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler, __pyx_n_s_loads, __pyx_t_3) < 0) __PYX_ERR(0, 1146, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; PyType_Modified(__pyx_ptype_5larch_6pickle_6pickle_Unpickler); - /* "larch/pickle/pickle.pyx":1152 + /* "larch/pickle/pickle.pyx":1154 * self.last_refcount = self.unpacker.reset() * * cpdef verify_object(self, module, name, obj): # <<<<<<<<<<<<<< * if (module not in secure_modules and obj not in secure_objects * and PyDict_GetItem(extension_registry, (module, name)) is NULL): */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_9Unpickler_11verify_object, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpickler_verify_object, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__26)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1152, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_9Unpickler_11verify_object, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_Unpickler_verify_object, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__26)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1154, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler, __pyx_n_s_verify_object, __pyx_t_3) < 0) __PYX_ERR(0, 1152, __pyx_L1_error) + if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_5larch_6pickle_6pickle_Unpickler, __pyx_n_s_verify_object, __pyx_t_3) < 0) __PYX_ERR(0, 1154, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; PyType_Modified(__pyx_ptype_5larch_6pickle_6pickle_Unpickler); - /* "larch/pickle/pickle.pyx":1176 + /* "larch/pickle/pickle.pyx":1178 * * * cpdef dumps(obj, protocol=-1, with_refs=True): # <<<<<<<<<<<<<< * return Pickler(protocol=protocol, with_refs=with_refs)\ * .dump(obj).get_output_string() */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_1dumps, 0, __pyx_n_s_dumps, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__28)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1176, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_1dumps, 0, __pyx_n_s_dumps, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__28)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1178, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__29); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_dumps, __pyx_t_3) < 0) __PYX_ERR(0, 1176, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_dumps, __pyx_t_3) < 0) __PYX_ERR(0, 1178, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1181 + /* "larch/pickle/pickle.pyx":1183 * * * cpdef dump(obj, file, protocol=-1): # <<<<<<<<<<<<<< * Pickler(file, protocol=protocol).dump(obj) * */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_3dump, 0, __pyx_n_s_dump, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__31)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1181, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_3dump, 0, __pyx_n_s_dump, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__31)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1183, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__32); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_dump, __pyx_t_3) < 0) __PYX_ERR(0, 1181, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_dump, __pyx_t_3) < 0) __PYX_ERR(0, 1183, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1185 + /* "larch/pickle/pickle.pyx":1187 * * * cpdef load(file, secure=False): # <<<<<<<<<<<<<< * cdef Unpickler unpickler = Unpickler(file, secure=secure) * return unpickler.load() */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_5load, 0, __pyx_n_s_load, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__34)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1185, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_5load, 0, __pyx_n_s_load, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__34)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1187, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__35); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_load, __pyx_t_3) < 0) __PYX_ERR(0, 1185, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_load, __pyx_t_3) < 0) __PYX_ERR(0, 1187, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "larch/pickle/pickle.pyx":1190 + /* "larch/pickle/pickle.pyx":1192 * * * cpdef loads(bytes obj, secure=False): # <<<<<<<<<<<<<< * cdef Unpickler unpickler = Unpickler(obj, secure=secure) * return unpickler.load() */ - __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_7loads, 0, __pyx_n_s_loads, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__37)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1190, __pyx_L1_error) + __pyx_t_3 = __Pyx_CyFunction_New(&__pyx_mdef_5larch_6pickle_6pickle_7loads, 0, __pyx_n_s_loads, NULL, __pyx_n_s_larch_pickle_pickle, __pyx_d, ((PyObject *)__pyx_codeobj__37)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1192, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_3, __pyx_tuple__38); - if (PyDict_SetItem(__pyx_d, __pyx_n_s_loads, __pyx_t_3) < 0) __PYX_ERR(0, 1190, __pyx_L1_error) + if (PyDict_SetItem(__pyx_d, __pyx_n_s_loads, __pyx_t_3) < 0) __PYX_ERR(0, 1192, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; /* "larch/pickle/pickle.pyx":1 @@ -22519,7 +22562,7 @@ static void __Pyx_WriteUnraisable(const char *name, int clineno, Py_XINCREF(old_val); Py_XINCREF(old_tb); __Pyx_ErrRestore(old_exc, old_val, old_tb); - PyErr_PrintEx(1); + PyErr_PrintEx(0); } #if PY_MAJOR_VERSION < 3 ctx = PyString_FromString(name); @@ -22720,7 +22763,6 @@ static CYTHON_INLINE PyObject *__Pyx_GetAttr(PyObject *o, PyObject *n) { } /* HasAttr */ -#if __PYX_LIMITED_VERSION_HEX < 0x030d00A1 static CYTHON_INLINE int __Pyx_HasAttr(PyObject *o, PyObject *n) { PyObject *r; if (unlikely(!__Pyx_PyBaseString_Check(n))) { @@ -22737,7 +22779,6 @@ static CYTHON_INLINE int __Pyx_HasAttr(PyObject *o, PyObject *n) { return 1; } } -#endif /* PyObjectCallOneArg */ static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) { @@ -23790,10 +23831,10 @@ static int __Pyx_MergeVtables(PyTypeObject *type) { #endif /* TypeImport */ -#ifndef __PYX_HAVE_RT_ImportType_3_0_8 -#define __PYX_HAVE_RT_ImportType_3_0_8 -static PyTypeObject *__Pyx_ImportType_3_0_8(PyObject *module, const char *module_name, const char *class_name, - size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_8 check_size) +#ifndef __PYX_HAVE_RT_ImportType_3_0_11 +#define __PYX_HAVE_RT_ImportType_3_0_11 +static PyTypeObject *__Pyx_ImportType_3_0_11(PyObject *module, const char *module_name, const char *class_name, + size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_11 check_size) { PyObject *result = 0; char warning[200]; @@ -23847,7 +23888,7 @@ static PyTypeObject *__Pyx_ImportType_3_0_8(PyObject *module, const char *module module_name, class_name, size, basicsize+itemsize); goto bad; } - if (check_size == __Pyx_ImportType_CheckSize_Error_3_0_8 && + if (check_size == __Pyx_ImportType_CheckSize_Error_3_0_11 && ((size_t)basicsize > size || (size_t)(basicsize + itemsize) < size)) { PyErr_Format(PyExc_ValueError, "%.200s.%.200s size changed, may indicate binary incompatibility. " @@ -23855,7 +23896,7 @@ static PyTypeObject *__Pyx_ImportType_3_0_8(PyObject *module, const char *module module_name, class_name, size, basicsize, basicsize+itemsize); goto bad; } - else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_0_8 && (size_t)basicsize > size) { + else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_0_11 && (size_t)basicsize > size) { PyOS_snprintf(warning, sizeof(warning), "%s.%s size changed, may indicate binary incompatibility. " "Expected %zd from C header, got %zd from PyObject", @@ -25439,7 +25480,7 @@ static PyObject * __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS(PyObject *func, default: return NULL; } - return ((_PyCFunctionFastWithKeywords)(void(*)(void))def->ml_meth)(self, args, nargs, kwnames); + return ((__Pyx_PyCFunctionFastWithKeywords)(void(*)(void))def->ml_meth)(self, args, nargs, kwnames); } static PyObject * __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS_METHOD(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames) { @@ -25574,6 +25615,9 @@ static PyTypeObject __pyx_CyFunctionType_type = { #if PY_VERSION_HEX >= 0x030C0000 0, #endif +#if PY_VERSION_HEX >= 0x030d00A4 + 0, +#endif #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000 0, #endif @@ -26000,12 +26044,19 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_enum__EXT_TYPES(enum EXT_TYPES v } } { - int one = 1; int little = (int)*(unsigned char *)&one; unsigned char *bytes = (unsigned char *)&value; -#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000 +#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX >= 0x030d00A4 + if (is_unsigned) { + return PyLong_FromUnsignedNativeBytes(bytes, sizeof(value), -1); + } else { + return PyLong_FromNativeBytes(bytes, sizeof(value), -1); + } +#elif !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000 + int one = 1; int little = (int)*(unsigned char *)&one; return _PyLong_FromByteArray(bytes, sizeof(enum EXT_TYPES), little, !is_unsigned); #else + int one = 1; int little = (int)*(unsigned char *)&one; PyObject *from_bytes, *result = NULL; PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL; from_bytes = PyObject_GetAttrString((PyObject*)&PyLong_Type, "from_bytes"); @@ -26055,245 +26106,239 @@ static CYTHON_INLINE uint8_t __Pyx_PyInt_As_uint8_t(PyObject *x) { } return (uint8_t) val; } - } else + } #endif - if (likely(PyLong_Check(x))) { - if (is_unsigned) { + if (unlikely(!PyLong_Check(x))) { + uint8_t val; + PyObject *tmp = __Pyx_PyNumber_IntOrLong(x); + if (!tmp) return (uint8_t) -1; + val = __Pyx_PyInt_As_uint8_t(tmp); + Py_DECREF(tmp); + return val; + } + if (is_unsigned) { #if CYTHON_USE_PYLONG_INTERNALS - if (unlikely(__Pyx_PyLong_IsNeg(x))) { - goto raise_neg_overflow; - } else if (__Pyx_PyLong_IsCompact(x)) { - __PYX_VERIFY_RETURN_INT(uint8_t, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x)) - } else { - const digit* digits = __Pyx_PyLong_Digits(x); - assert(__Pyx_PyLong_DigitCount(x) > 1); - switch (__Pyx_PyLong_DigitCount(x)) { - case 2: - if ((8 * sizeof(uint8_t) > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint8_t) >= 2 * PyLong_SHIFT)) { - return (uint8_t) (((((uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])); - } + if (unlikely(__Pyx_PyLong_IsNeg(x))) { + goto raise_neg_overflow; + } else if (__Pyx_PyLong_IsCompact(x)) { + __PYX_VERIFY_RETURN_INT(uint8_t, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x)) + } else { + const digit* digits = __Pyx_PyLong_Digits(x); + assert(__Pyx_PyLong_DigitCount(x) > 1); + switch (__Pyx_PyLong_DigitCount(x)) { + case 2: + if ((8 * sizeof(uint8_t) > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint8_t) >= 2 * PyLong_SHIFT)) { + return (uint8_t) (((((uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])); } - break; - case 3: - if ((8 * sizeof(uint8_t) > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint8_t) >= 3 * PyLong_SHIFT)) { - return (uint8_t) (((((((uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])); - } + } + break; + case 3: + if ((8 * sizeof(uint8_t) > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint8_t) >= 3 * PyLong_SHIFT)) { + return (uint8_t) (((((((uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])); } - break; - case 4: - if ((8 * sizeof(uint8_t) > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint8_t) >= 4 * PyLong_SHIFT)) { - return (uint8_t) (((((((((uint8_t)digits[3]) << PyLong_SHIFT) | (uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])); - } + } + break; + case 4: + if ((8 * sizeof(uint8_t) > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint8_t) >= 4 * PyLong_SHIFT)) { + return (uint8_t) (((((((((uint8_t)digits[3]) << PyLong_SHIFT) | (uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])); } - break; - } + } + break; } + } #endif #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7 - if (unlikely(Py_SIZE(x) < 0)) { - goto raise_neg_overflow; - } + if (unlikely(Py_SIZE(x) < 0)) { + goto raise_neg_overflow; + } #else - { - int result = PyObject_RichCompareBool(x, Py_False, Py_LT); - if (unlikely(result < 0)) - return (uint8_t) -1; - if (unlikely(result == 1)) - goto raise_neg_overflow; - } + { + int result = PyObject_RichCompareBool(x, Py_False, Py_LT); + if (unlikely(result < 0)) + return (uint8_t) -1; + if (unlikely(result == 1)) + goto raise_neg_overflow; + } #endif - if ((sizeof(uint8_t) <= sizeof(unsigned long))) { - __PYX_VERIFY_RETURN_INT_EXC(uint8_t, unsigned long, PyLong_AsUnsignedLong(x)) + if ((sizeof(uint8_t) <= sizeof(unsigned long))) { + __PYX_VERIFY_RETURN_INT_EXC(uint8_t, unsigned long, PyLong_AsUnsignedLong(x)) #ifdef HAVE_LONG_LONG - } else if ((sizeof(uint8_t) <= sizeof(unsigned PY_LONG_LONG))) { - __PYX_VERIFY_RETURN_INT_EXC(uint8_t, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x)) + } else if ((sizeof(uint8_t) <= sizeof(unsigned PY_LONG_LONG))) { + __PYX_VERIFY_RETURN_INT_EXC(uint8_t, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x)) #endif - } - } else { + } + } else { #if CYTHON_USE_PYLONG_INTERNALS - if (__Pyx_PyLong_IsCompact(x)) { - __PYX_VERIFY_RETURN_INT(uint8_t, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x)) - } else { - const digit* digits = __Pyx_PyLong_Digits(x); - assert(__Pyx_PyLong_DigitCount(x) > 1); - switch (__Pyx_PyLong_SignedDigitCount(x)) { - case -2: - if ((8 * sizeof(uint8_t) - 1 > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint8_t, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint8_t) - 1 > 2 * PyLong_SHIFT)) { - return (uint8_t) (((uint8_t)-1)*(((((uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); - } + if (__Pyx_PyLong_IsCompact(x)) { + __PYX_VERIFY_RETURN_INT(uint8_t, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x)) + } else { + const digit* digits = __Pyx_PyLong_Digits(x); + assert(__Pyx_PyLong_DigitCount(x) > 1); + switch (__Pyx_PyLong_SignedDigitCount(x)) { + case -2: + if ((8 * sizeof(uint8_t) - 1 > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint8_t, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint8_t) - 1 > 2 * PyLong_SHIFT)) { + return (uint8_t) (((uint8_t)-1)*(((((uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); } - break; - case 2: - if ((8 * sizeof(uint8_t) > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint8_t) - 1 > 2 * PyLong_SHIFT)) { - return (uint8_t) ((((((uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); - } + } + break; + case 2: + if ((8 * sizeof(uint8_t) > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint8_t) - 1 > 2 * PyLong_SHIFT)) { + return (uint8_t) ((((((uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); } - break; - case -3: - if ((8 * sizeof(uint8_t) - 1 > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint8_t, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint8_t) - 1 > 3 * PyLong_SHIFT)) { - return (uint8_t) (((uint8_t)-1)*(((((((uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); - } + } + break; + case -3: + if ((8 * sizeof(uint8_t) - 1 > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint8_t, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint8_t) - 1 > 3 * PyLong_SHIFT)) { + return (uint8_t) (((uint8_t)-1)*(((((((uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); } - break; - case 3: - if ((8 * sizeof(uint8_t) > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint8_t) - 1 > 3 * PyLong_SHIFT)) { - return (uint8_t) ((((((((uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); - } + } + break; + case 3: + if ((8 * sizeof(uint8_t) > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint8_t) - 1 > 3 * PyLong_SHIFT)) { + return (uint8_t) ((((((((uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); } - break; - case -4: - if ((8 * sizeof(uint8_t) - 1 > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint8_t, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint8_t) - 1 > 4 * PyLong_SHIFT)) { - return (uint8_t) (((uint8_t)-1)*(((((((((uint8_t)digits[3]) << PyLong_SHIFT) | (uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); - } + } + break; + case -4: + if ((8 * sizeof(uint8_t) - 1 > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint8_t, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint8_t) - 1 > 4 * PyLong_SHIFT)) { + return (uint8_t) (((uint8_t)-1)*(((((((((uint8_t)digits[3]) << PyLong_SHIFT) | (uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); } - break; - case 4: - if ((8 * sizeof(uint8_t) > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint8_t) - 1 > 4 * PyLong_SHIFT)) { - return (uint8_t) ((((((((((uint8_t)digits[3]) << PyLong_SHIFT) | (uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); - } + } + break; + case 4: + if ((8 * sizeof(uint8_t) > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint8_t) - 1 > 4 * PyLong_SHIFT)) { + return (uint8_t) ((((((((((uint8_t)digits[3]) << PyLong_SHIFT) | (uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]))); } - break; - } + } + break; } + } #endif - if ((sizeof(uint8_t) <= sizeof(long))) { - __PYX_VERIFY_RETURN_INT_EXC(uint8_t, long, PyLong_AsLong(x)) + if ((sizeof(uint8_t) <= sizeof(long))) { + __PYX_VERIFY_RETURN_INT_EXC(uint8_t, long, PyLong_AsLong(x)) #ifdef HAVE_LONG_LONG - } else if ((sizeof(uint8_t) <= sizeof(PY_LONG_LONG))) { - __PYX_VERIFY_RETURN_INT_EXC(uint8_t, PY_LONG_LONG, PyLong_AsLongLong(x)) + } else if ((sizeof(uint8_t) <= sizeof(PY_LONG_LONG))) { + __PYX_VERIFY_RETURN_INT_EXC(uint8_t, PY_LONG_LONG, PyLong_AsLongLong(x)) #endif - } } - { - uint8_t val; - PyObject *v = __Pyx_PyNumber_IntOrLong(x); -#if PY_MAJOR_VERSION < 3 - if (likely(v) && !PyLong_Check(v)) { - PyObject *tmp = v; - v = PyNumber_Long(tmp); - Py_DECREF(tmp); - } -#endif - if (likely(v)) { - int ret = -1; -#if PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray) - int one = 1; int is_little = (int)*(unsigned char *)&one; - unsigned char *bytes = (unsigned char *)&val; - ret = _PyLong_AsByteArray((PyLongObject *)v, - bytes, sizeof(val), - is_little, !is_unsigned); -#else - PyObject *stepval = NULL, *mask = NULL, *shift = NULL; - int bits, remaining_bits, is_negative = 0; - long idigit; - int chunk_size = (sizeof(long) < 8) ? 30 : 62; - if (unlikely(!PyLong_CheckExact(v))) { - PyObject *tmp = v; - v = PyNumber_Long(v); - assert(PyLong_CheckExact(v)); - Py_DECREF(tmp); - if (unlikely(!v)) return (uint8_t) -1; - } -#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - if (Py_SIZE(x) == 0) - return (uint8_t) 0; - is_negative = Py_SIZE(x) < 0; + } + { + uint8_t val; + int ret = -1; +#if PY_VERSION_HEX >= 0x030d00A6 && !CYTHON_COMPILING_IN_LIMITED_API + Py_ssize_t bytes_copied = PyLong_AsNativeBytes( + x, &val, sizeof(val), Py_ASNATIVEBYTES_NATIVE_ENDIAN | (is_unsigned ? Py_ASNATIVEBYTES_UNSIGNED_BUFFER | Py_ASNATIVEBYTES_REJECT_NEGATIVE : 0)); + if (unlikely(bytes_copied == -1)) { + } else if (unlikely(bytes_copied > (Py_ssize_t) sizeof(val))) { + goto raise_overflow; + } else { + ret = 0; + } +#elif PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray) + int one = 1; int is_little = (int)*(unsigned char *)&one; + unsigned char *bytes = (unsigned char *)&val; + ret = _PyLong_AsByteArray((PyLongObject *)x, + bytes, sizeof(val), + is_little, !is_unsigned); #else - { - int result = PyObject_RichCompareBool(x, Py_False, Py_LT); - if (unlikely(result < 0)) - return (uint8_t) -1; - is_negative = result == 1; - } -#endif - if (is_unsigned && unlikely(is_negative)) { - goto raise_neg_overflow; - } else if (is_negative) { - stepval = PyNumber_Invert(v); - if (unlikely(!stepval)) - return (uint8_t) -1; - } else { - stepval = __Pyx_NewRef(v); - } - val = (uint8_t) 0; - mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done; - shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done; - for (bits = 0; bits < (int) sizeof(uint8_t) * 8 - chunk_size; bits += chunk_size) { - PyObject *tmp, *digit; - digit = PyNumber_And(stepval, mask); - if (unlikely(!digit)) goto done; - idigit = PyLong_AsLong(digit); - Py_DECREF(digit); - if (unlikely(idigit < 0)) goto done; - tmp = PyNumber_Rshift(stepval, shift); - if (unlikely(!tmp)) goto done; - Py_DECREF(stepval); stepval = tmp; - val |= ((uint8_t) idigit) << bits; - #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - if (Py_SIZE(stepval) == 0) - goto unpacking_done; - #endif - } - idigit = PyLong_AsLong(stepval); - if (unlikely(idigit < 0)) goto done; - remaining_bits = ((int) sizeof(uint8_t) * 8) - bits - (is_unsigned ? 0 : 1); - if (unlikely(idigit >= (1L << remaining_bits))) - goto raise_overflow; - val |= ((uint8_t) idigit) << bits; - #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - unpacking_done: - #endif - if (!is_unsigned) { - if (unlikely(val & (((uint8_t) 1) << (sizeof(uint8_t) * 8 - 1)))) - goto raise_overflow; - if (is_negative) - val = ~val; - } - ret = 0; - done: - Py_XDECREF(shift); - Py_XDECREF(mask); - Py_XDECREF(stepval); -#endif + PyObject *v; + PyObject *stepval = NULL, *mask = NULL, *shift = NULL; + int bits, remaining_bits, is_negative = 0; + int chunk_size = (sizeof(long) < 8) ? 30 : 62; + if (likely(PyLong_CheckExact(x))) { + v = __Pyx_NewRef(x); + } else { + v = PyNumber_Long(x); + if (unlikely(!v)) return (uint8_t) -1; + assert(PyLong_CheckExact(v)); + } + { + int result = PyObject_RichCompareBool(v, Py_False, Py_LT); + if (unlikely(result < 0)) { Py_DECREF(v); - if (likely(!ret)) - return val; + return (uint8_t) -1; } - return (uint8_t) -1; + is_negative = result == 1; } - } else { - uint8_t val; - PyObject *tmp = __Pyx_PyNumber_IntOrLong(x); - if (!tmp) return (uint8_t) -1; - val = __Pyx_PyInt_As_uint8_t(tmp); - Py_DECREF(tmp); + if (is_unsigned && unlikely(is_negative)) { + Py_DECREF(v); + goto raise_neg_overflow; + } else if (is_negative) { + stepval = PyNumber_Invert(v); + Py_DECREF(v); + if (unlikely(!stepval)) + return (uint8_t) -1; + } else { + stepval = v; + } + v = NULL; + val = (uint8_t) 0; + mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done; + shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done; + for (bits = 0; bits < (int) sizeof(uint8_t) * 8 - chunk_size; bits += chunk_size) { + PyObject *tmp, *digit; + long idigit; + digit = PyNumber_And(stepval, mask); + if (unlikely(!digit)) goto done; + idigit = PyLong_AsLong(digit); + Py_DECREF(digit); + if (unlikely(idigit < 0)) goto done; + val |= ((uint8_t) idigit) << bits; + tmp = PyNumber_Rshift(stepval, shift); + if (unlikely(!tmp)) goto done; + Py_DECREF(stepval); stepval = tmp; + } + Py_DECREF(shift); shift = NULL; + Py_DECREF(mask); mask = NULL; + { + long idigit = PyLong_AsLong(stepval); + if (unlikely(idigit < 0)) goto done; + remaining_bits = ((int) sizeof(uint8_t) * 8) - bits - (is_unsigned ? 0 : 1); + if (unlikely(idigit >= (1L << remaining_bits))) + goto raise_overflow; + val |= ((uint8_t) idigit) << bits; + } + if (!is_unsigned) { + if (unlikely(val & (((uint8_t) 1) << (sizeof(uint8_t) * 8 - 1)))) + goto raise_overflow; + if (is_negative) + val = ~val; + } + ret = 0; + done: + Py_XDECREF(shift); + Py_XDECREF(mask); + Py_XDECREF(stepval); +#endif + if (unlikely(ret)) + return (uint8_t) -1; return val; } raise_overflow: @@ -26328,245 +26373,239 @@ static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) { } return (int) val; } - } else + } #endif - if (likely(PyLong_Check(x))) { - if (is_unsigned) { + if (unlikely(!PyLong_Check(x))) { + int val; + PyObject *tmp = __Pyx_PyNumber_IntOrLong(x); + if (!tmp) return (int) -1; + val = __Pyx_PyInt_As_int(tmp); + Py_DECREF(tmp); + return val; + } + if (is_unsigned) { #if CYTHON_USE_PYLONG_INTERNALS - if (unlikely(__Pyx_PyLong_IsNeg(x))) { - goto raise_neg_overflow; - } else if (__Pyx_PyLong_IsCompact(x)) { - __PYX_VERIFY_RETURN_INT(int, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x)) - } else { - const digit* digits = __Pyx_PyLong_Digits(x); - assert(__Pyx_PyLong_DigitCount(x) > 1); - switch (__Pyx_PyLong_DigitCount(x)) { - case 2: - if ((8 * sizeof(int) > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(int) >= 2 * PyLong_SHIFT)) { - return (int) (((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])); - } + if (unlikely(__Pyx_PyLong_IsNeg(x))) { + goto raise_neg_overflow; + } else if (__Pyx_PyLong_IsCompact(x)) { + __PYX_VERIFY_RETURN_INT(int, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x)) + } else { + const digit* digits = __Pyx_PyLong_Digits(x); + assert(__Pyx_PyLong_DigitCount(x) > 1); + switch (__Pyx_PyLong_DigitCount(x)) { + case 2: + if ((8 * sizeof(int) > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(int) >= 2 * PyLong_SHIFT)) { + return (int) (((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])); } - break; - case 3: - if ((8 * sizeof(int) > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(int) >= 3 * PyLong_SHIFT)) { - return (int) (((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])); - } + } + break; + case 3: + if ((8 * sizeof(int) > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(int) >= 3 * PyLong_SHIFT)) { + return (int) (((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])); } - break; - case 4: - if ((8 * sizeof(int) > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(int) >= 4 * PyLong_SHIFT)) { - return (int) (((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])); - } + } + break; + case 4: + if ((8 * sizeof(int) > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(int) >= 4 * PyLong_SHIFT)) { + return (int) (((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])); } - break; - } + } + break; } + } #endif #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7 - if (unlikely(Py_SIZE(x) < 0)) { - goto raise_neg_overflow; - } + if (unlikely(Py_SIZE(x) < 0)) { + goto raise_neg_overflow; + } #else - { - int result = PyObject_RichCompareBool(x, Py_False, Py_LT); - if (unlikely(result < 0)) - return (int) -1; - if (unlikely(result == 1)) - goto raise_neg_overflow; - } + { + int result = PyObject_RichCompareBool(x, Py_False, Py_LT); + if (unlikely(result < 0)) + return (int) -1; + if (unlikely(result == 1)) + goto raise_neg_overflow; + } #endif - if ((sizeof(int) <= sizeof(unsigned long))) { - __PYX_VERIFY_RETURN_INT_EXC(int, unsigned long, PyLong_AsUnsignedLong(x)) + if ((sizeof(int) <= sizeof(unsigned long))) { + __PYX_VERIFY_RETURN_INT_EXC(int, unsigned long, PyLong_AsUnsignedLong(x)) #ifdef HAVE_LONG_LONG - } else if ((sizeof(int) <= sizeof(unsigned PY_LONG_LONG))) { - __PYX_VERIFY_RETURN_INT_EXC(int, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x)) + } else if ((sizeof(int) <= sizeof(unsigned PY_LONG_LONG))) { + __PYX_VERIFY_RETURN_INT_EXC(int, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x)) #endif - } - } else { + } + } else { #if CYTHON_USE_PYLONG_INTERNALS - if (__Pyx_PyLong_IsCompact(x)) { - __PYX_VERIFY_RETURN_INT(int, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x)) - } else { - const digit* digits = __Pyx_PyLong_Digits(x); - assert(__Pyx_PyLong_DigitCount(x) > 1); - switch (__Pyx_PyLong_SignedDigitCount(x)) { - case -2: - if ((8 * sizeof(int) - 1 > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) { - return (int) (((int)-1)*(((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); - } + if (__Pyx_PyLong_IsCompact(x)) { + __PYX_VERIFY_RETURN_INT(int, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x)) + } else { + const digit* digits = __Pyx_PyLong_Digits(x); + assert(__Pyx_PyLong_DigitCount(x) > 1); + switch (__Pyx_PyLong_SignedDigitCount(x)) { + case -2: + if ((8 * sizeof(int) - 1 > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) { + return (int) (((int)-1)*(((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); } - break; - case 2: - if ((8 * sizeof(int) > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) { - return (int) ((((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); - } + } + break; + case 2: + if ((8 * sizeof(int) > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) { + return (int) ((((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); } - break; - case -3: - if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) { - return (int) (((int)-1)*(((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); - } + } + break; + case -3: + if ((8 * sizeof(int) - 1 > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) { + return (int) (((int)-1)*(((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); } - break; - case 3: - if ((8 * sizeof(int) > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) { - return (int) ((((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); - } + } + break; + case 3: + if ((8 * sizeof(int) > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) { + return (int) ((((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); } - break; - case -4: - if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(int) - 1 > 4 * PyLong_SHIFT)) { - return (int) (((int)-1)*(((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); - } + } + break; + case -4: + if ((8 * sizeof(int) - 1 > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(int) - 1 > 4 * PyLong_SHIFT)) { + return (int) (((int)-1)*(((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); } - break; - case 4: - if ((8 * sizeof(int) > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(int) - 1 > 4 * PyLong_SHIFT)) { - return (int) ((((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); - } + } + break; + case 4: + if ((8 * sizeof(int) > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(int) - 1 > 4 * PyLong_SHIFT)) { + return (int) ((((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]))); } - break; - } + } + break; } + } #endif - if ((sizeof(int) <= sizeof(long))) { - __PYX_VERIFY_RETURN_INT_EXC(int, long, PyLong_AsLong(x)) + if ((sizeof(int) <= sizeof(long))) { + __PYX_VERIFY_RETURN_INT_EXC(int, long, PyLong_AsLong(x)) #ifdef HAVE_LONG_LONG - } else if ((sizeof(int) <= sizeof(PY_LONG_LONG))) { - __PYX_VERIFY_RETURN_INT_EXC(int, PY_LONG_LONG, PyLong_AsLongLong(x)) + } else if ((sizeof(int) <= sizeof(PY_LONG_LONG))) { + __PYX_VERIFY_RETURN_INT_EXC(int, PY_LONG_LONG, PyLong_AsLongLong(x)) #endif - } } - { - int val; - PyObject *v = __Pyx_PyNumber_IntOrLong(x); -#if PY_MAJOR_VERSION < 3 - if (likely(v) && !PyLong_Check(v)) { - PyObject *tmp = v; - v = PyNumber_Long(tmp); - Py_DECREF(tmp); - } -#endif - if (likely(v)) { - int ret = -1; -#if PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray) - int one = 1; int is_little = (int)*(unsigned char *)&one; - unsigned char *bytes = (unsigned char *)&val; - ret = _PyLong_AsByteArray((PyLongObject *)v, - bytes, sizeof(val), - is_little, !is_unsigned); -#else - PyObject *stepval = NULL, *mask = NULL, *shift = NULL; - int bits, remaining_bits, is_negative = 0; - long idigit; - int chunk_size = (sizeof(long) < 8) ? 30 : 62; - if (unlikely(!PyLong_CheckExact(v))) { - PyObject *tmp = v; - v = PyNumber_Long(v); - assert(PyLong_CheckExact(v)); - Py_DECREF(tmp); - if (unlikely(!v)) return (int) -1; - } -#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - if (Py_SIZE(x) == 0) - return (int) 0; - is_negative = Py_SIZE(x) < 0; + } + { + int val; + int ret = -1; +#if PY_VERSION_HEX >= 0x030d00A6 && !CYTHON_COMPILING_IN_LIMITED_API + Py_ssize_t bytes_copied = PyLong_AsNativeBytes( + x, &val, sizeof(val), Py_ASNATIVEBYTES_NATIVE_ENDIAN | (is_unsigned ? Py_ASNATIVEBYTES_UNSIGNED_BUFFER | Py_ASNATIVEBYTES_REJECT_NEGATIVE : 0)); + if (unlikely(bytes_copied == -1)) { + } else if (unlikely(bytes_copied > (Py_ssize_t) sizeof(val))) { + goto raise_overflow; + } else { + ret = 0; + } +#elif PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray) + int one = 1; int is_little = (int)*(unsigned char *)&one; + unsigned char *bytes = (unsigned char *)&val; + ret = _PyLong_AsByteArray((PyLongObject *)x, + bytes, sizeof(val), + is_little, !is_unsigned); #else - { - int result = PyObject_RichCompareBool(x, Py_False, Py_LT); - if (unlikely(result < 0)) - return (int) -1; - is_negative = result == 1; - } -#endif - if (is_unsigned && unlikely(is_negative)) { - goto raise_neg_overflow; - } else if (is_negative) { - stepval = PyNumber_Invert(v); - if (unlikely(!stepval)) - return (int) -1; - } else { - stepval = __Pyx_NewRef(v); - } - val = (int) 0; - mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done; - shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done; - for (bits = 0; bits < (int) sizeof(int) * 8 - chunk_size; bits += chunk_size) { - PyObject *tmp, *digit; - digit = PyNumber_And(stepval, mask); - if (unlikely(!digit)) goto done; - idigit = PyLong_AsLong(digit); - Py_DECREF(digit); - if (unlikely(idigit < 0)) goto done; - tmp = PyNumber_Rshift(stepval, shift); - if (unlikely(!tmp)) goto done; - Py_DECREF(stepval); stepval = tmp; - val |= ((int) idigit) << bits; - #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - if (Py_SIZE(stepval) == 0) - goto unpacking_done; - #endif - } - idigit = PyLong_AsLong(stepval); - if (unlikely(idigit < 0)) goto done; - remaining_bits = ((int) sizeof(int) * 8) - bits - (is_unsigned ? 0 : 1); - if (unlikely(idigit >= (1L << remaining_bits))) - goto raise_overflow; - val |= ((int) idigit) << bits; - #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - unpacking_done: - #endif - if (!is_unsigned) { - if (unlikely(val & (((int) 1) << (sizeof(int) * 8 - 1)))) - goto raise_overflow; - if (is_negative) - val = ~val; - } - ret = 0; - done: - Py_XDECREF(shift); - Py_XDECREF(mask); - Py_XDECREF(stepval); -#endif + PyObject *v; + PyObject *stepval = NULL, *mask = NULL, *shift = NULL; + int bits, remaining_bits, is_negative = 0; + int chunk_size = (sizeof(long) < 8) ? 30 : 62; + if (likely(PyLong_CheckExact(x))) { + v = __Pyx_NewRef(x); + } else { + v = PyNumber_Long(x); + if (unlikely(!v)) return (int) -1; + assert(PyLong_CheckExact(v)); + } + { + int result = PyObject_RichCompareBool(v, Py_False, Py_LT); + if (unlikely(result < 0)) { Py_DECREF(v); - if (likely(!ret)) - return val; + return (int) -1; } - return (int) -1; + is_negative = result == 1; } - } else { - int val; - PyObject *tmp = __Pyx_PyNumber_IntOrLong(x); - if (!tmp) return (int) -1; - val = __Pyx_PyInt_As_int(tmp); - Py_DECREF(tmp); + if (is_unsigned && unlikely(is_negative)) { + Py_DECREF(v); + goto raise_neg_overflow; + } else if (is_negative) { + stepval = PyNumber_Invert(v); + Py_DECREF(v); + if (unlikely(!stepval)) + return (int) -1; + } else { + stepval = v; + } + v = NULL; + val = (int) 0; + mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done; + shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done; + for (bits = 0; bits < (int) sizeof(int) * 8 - chunk_size; bits += chunk_size) { + PyObject *tmp, *digit; + long idigit; + digit = PyNumber_And(stepval, mask); + if (unlikely(!digit)) goto done; + idigit = PyLong_AsLong(digit); + Py_DECREF(digit); + if (unlikely(idigit < 0)) goto done; + val |= ((int) idigit) << bits; + tmp = PyNumber_Rshift(stepval, shift); + if (unlikely(!tmp)) goto done; + Py_DECREF(stepval); stepval = tmp; + } + Py_DECREF(shift); shift = NULL; + Py_DECREF(mask); mask = NULL; + { + long idigit = PyLong_AsLong(stepval); + if (unlikely(idigit < 0)) goto done; + remaining_bits = ((int) sizeof(int) * 8) - bits - (is_unsigned ? 0 : 1); + if (unlikely(idigit >= (1L << remaining_bits))) + goto raise_overflow; + val |= ((int) idigit) << bits; + } + if (!is_unsigned) { + if (unlikely(val & (((int) 1) << (sizeof(int) * 8 - 1)))) + goto raise_overflow; + if (is_negative) + val = ~val; + } + ret = 0; + done: + Py_XDECREF(shift); + Py_XDECREF(mask); + Py_XDECREF(stepval); +#endif + if (unlikely(ret)) + return (int) -1; return val; } raise_overflow: @@ -26601,245 +26640,239 @@ static CYTHON_INLINE uint32_t __Pyx_PyInt_As_uint32_t(PyObject *x) { } return (uint32_t) val; } - } else + } #endif - if (likely(PyLong_Check(x))) { - if (is_unsigned) { + if (unlikely(!PyLong_Check(x))) { + uint32_t val; + PyObject *tmp = __Pyx_PyNumber_IntOrLong(x); + if (!tmp) return (uint32_t) -1; + val = __Pyx_PyInt_As_uint32_t(tmp); + Py_DECREF(tmp); + return val; + } + if (is_unsigned) { #if CYTHON_USE_PYLONG_INTERNALS - if (unlikely(__Pyx_PyLong_IsNeg(x))) { - goto raise_neg_overflow; - } else if (__Pyx_PyLong_IsCompact(x)) { - __PYX_VERIFY_RETURN_INT(uint32_t, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x)) - } else { - const digit* digits = __Pyx_PyLong_Digits(x); - assert(__Pyx_PyLong_DigitCount(x) > 1); - switch (__Pyx_PyLong_DigitCount(x)) { - case 2: - if ((8 * sizeof(uint32_t) > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint32_t) >= 2 * PyLong_SHIFT)) { - return (uint32_t) (((((uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0])); - } + if (unlikely(__Pyx_PyLong_IsNeg(x))) { + goto raise_neg_overflow; + } else if (__Pyx_PyLong_IsCompact(x)) { + __PYX_VERIFY_RETURN_INT(uint32_t, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x)) + } else { + const digit* digits = __Pyx_PyLong_Digits(x); + assert(__Pyx_PyLong_DigitCount(x) > 1); + switch (__Pyx_PyLong_DigitCount(x)) { + case 2: + if ((8 * sizeof(uint32_t) > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint32_t) >= 2 * PyLong_SHIFT)) { + return (uint32_t) (((((uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0])); } - break; - case 3: - if ((8 * sizeof(uint32_t) > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint32_t) >= 3 * PyLong_SHIFT)) { - return (uint32_t) (((((((uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0])); - } + } + break; + case 3: + if ((8 * sizeof(uint32_t) > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint32_t) >= 3 * PyLong_SHIFT)) { + return (uint32_t) (((((((uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0])); } - break; - case 4: - if ((8 * sizeof(uint32_t) > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint32_t) >= 4 * PyLong_SHIFT)) { - return (uint32_t) (((((((((uint32_t)digits[3]) << PyLong_SHIFT) | (uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0])); - } + } + break; + case 4: + if ((8 * sizeof(uint32_t) > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint32_t) >= 4 * PyLong_SHIFT)) { + return (uint32_t) (((((((((uint32_t)digits[3]) << PyLong_SHIFT) | (uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0])); } - break; - } + } + break; } + } #endif #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7 - if (unlikely(Py_SIZE(x) < 0)) { - goto raise_neg_overflow; - } + if (unlikely(Py_SIZE(x) < 0)) { + goto raise_neg_overflow; + } #else - { - int result = PyObject_RichCompareBool(x, Py_False, Py_LT); - if (unlikely(result < 0)) - return (uint32_t) -1; - if (unlikely(result == 1)) - goto raise_neg_overflow; - } + { + int result = PyObject_RichCompareBool(x, Py_False, Py_LT); + if (unlikely(result < 0)) + return (uint32_t) -1; + if (unlikely(result == 1)) + goto raise_neg_overflow; + } #endif - if ((sizeof(uint32_t) <= sizeof(unsigned long))) { - __PYX_VERIFY_RETURN_INT_EXC(uint32_t, unsigned long, PyLong_AsUnsignedLong(x)) + if ((sizeof(uint32_t) <= sizeof(unsigned long))) { + __PYX_VERIFY_RETURN_INT_EXC(uint32_t, unsigned long, PyLong_AsUnsignedLong(x)) #ifdef HAVE_LONG_LONG - } else if ((sizeof(uint32_t) <= sizeof(unsigned PY_LONG_LONG))) { - __PYX_VERIFY_RETURN_INT_EXC(uint32_t, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x)) + } else if ((sizeof(uint32_t) <= sizeof(unsigned PY_LONG_LONG))) { + __PYX_VERIFY_RETURN_INT_EXC(uint32_t, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x)) #endif - } - } else { + } + } else { #if CYTHON_USE_PYLONG_INTERNALS - if (__Pyx_PyLong_IsCompact(x)) { - __PYX_VERIFY_RETURN_INT(uint32_t, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x)) - } else { - const digit* digits = __Pyx_PyLong_Digits(x); - assert(__Pyx_PyLong_DigitCount(x) > 1); - switch (__Pyx_PyLong_SignedDigitCount(x)) { - case -2: - if ((8 * sizeof(uint32_t) - 1 > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint32_t, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint32_t) - 1 > 2 * PyLong_SHIFT)) { - return (uint32_t) (((uint32_t)-1)*(((((uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); - } + if (__Pyx_PyLong_IsCompact(x)) { + __PYX_VERIFY_RETURN_INT(uint32_t, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x)) + } else { + const digit* digits = __Pyx_PyLong_Digits(x); + assert(__Pyx_PyLong_DigitCount(x) > 1); + switch (__Pyx_PyLong_SignedDigitCount(x)) { + case -2: + if ((8 * sizeof(uint32_t) - 1 > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint32_t, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint32_t) - 1 > 2 * PyLong_SHIFT)) { + return (uint32_t) (((uint32_t)-1)*(((((uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); } - break; - case 2: - if ((8 * sizeof(uint32_t) > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint32_t) - 1 > 2 * PyLong_SHIFT)) { - return (uint32_t) ((((((uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); - } + } + break; + case 2: + if ((8 * sizeof(uint32_t) > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint32_t) - 1 > 2 * PyLong_SHIFT)) { + return (uint32_t) ((((((uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); } - break; - case -3: - if ((8 * sizeof(uint32_t) - 1 > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint32_t, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint32_t) - 1 > 3 * PyLong_SHIFT)) { - return (uint32_t) (((uint32_t)-1)*(((((((uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); - } + } + break; + case -3: + if ((8 * sizeof(uint32_t) - 1 > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint32_t, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint32_t) - 1 > 3 * PyLong_SHIFT)) { + return (uint32_t) (((uint32_t)-1)*(((((((uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); } - break; - case 3: - if ((8 * sizeof(uint32_t) > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint32_t) - 1 > 3 * PyLong_SHIFT)) { - return (uint32_t) ((((((((uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); - } + } + break; + case 3: + if ((8 * sizeof(uint32_t) > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint32_t) - 1 > 3 * PyLong_SHIFT)) { + return (uint32_t) ((((((((uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); } - break; - case -4: - if ((8 * sizeof(uint32_t) - 1 > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint32_t, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint32_t) - 1 > 4 * PyLong_SHIFT)) { - return (uint32_t) (((uint32_t)-1)*(((((((((uint32_t)digits[3]) << PyLong_SHIFT) | (uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); - } + } + break; + case -4: + if ((8 * sizeof(uint32_t) - 1 > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint32_t, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint32_t) - 1 > 4 * PyLong_SHIFT)) { + return (uint32_t) (((uint32_t)-1)*(((((((((uint32_t)digits[3]) << PyLong_SHIFT) | (uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); } - break; - case 4: - if ((8 * sizeof(uint32_t) > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(uint32_t) - 1 > 4 * PyLong_SHIFT)) { - return (uint32_t) ((((((((((uint32_t)digits[3]) << PyLong_SHIFT) | (uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); - } + } + break; + case 4: + if ((8 * sizeof(uint32_t) > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(uint32_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(uint32_t) - 1 > 4 * PyLong_SHIFT)) { + return (uint32_t) ((((((((((uint32_t)digits[3]) << PyLong_SHIFT) | (uint32_t)digits[2]) << PyLong_SHIFT) | (uint32_t)digits[1]) << PyLong_SHIFT) | (uint32_t)digits[0]))); } - break; - } + } + break; } + } #endif - if ((sizeof(uint32_t) <= sizeof(long))) { - __PYX_VERIFY_RETURN_INT_EXC(uint32_t, long, PyLong_AsLong(x)) + if ((sizeof(uint32_t) <= sizeof(long))) { + __PYX_VERIFY_RETURN_INT_EXC(uint32_t, long, PyLong_AsLong(x)) #ifdef HAVE_LONG_LONG - } else if ((sizeof(uint32_t) <= sizeof(PY_LONG_LONG))) { - __PYX_VERIFY_RETURN_INT_EXC(uint32_t, PY_LONG_LONG, PyLong_AsLongLong(x)) + } else if ((sizeof(uint32_t) <= sizeof(PY_LONG_LONG))) { + __PYX_VERIFY_RETURN_INT_EXC(uint32_t, PY_LONG_LONG, PyLong_AsLongLong(x)) #endif - } } - { - uint32_t val; - PyObject *v = __Pyx_PyNumber_IntOrLong(x); -#if PY_MAJOR_VERSION < 3 - if (likely(v) && !PyLong_Check(v)) { - PyObject *tmp = v; - v = PyNumber_Long(tmp); - Py_DECREF(tmp); - } -#endif - if (likely(v)) { - int ret = -1; -#if PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray) - int one = 1; int is_little = (int)*(unsigned char *)&one; - unsigned char *bytes = (unsigned char *)&val; - ret = _PyLong_AsByteArray((PyLongObject *)v, - bytes, sizeof(val), - is_little, !is_unsigned); -#else - PyObject *stepval = NULL, *mask = NULL, *shift = NULL; - int bits, remaining_bits, is_negative = 0; - long idigit; - int chunk_size = (sizeof(long) < 8) ? 30 : 62; - if (unlikely(!PyLong_CheckExact(v))) { - PyObject *tmp = v; - v = PyNumber_Long(v); - assert(PyLong_CheckExact(v)); - Py_DECREF(tmp); - if (unlikely(!v)) return (uint32_t) -1; - } -#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - if (Py_SIZE(x) == 0) - return (uint32_t) 0; - is_negative = Py_SIZE(x) < 0; + } + { + uint32_t val; + int ret = -1; +#if PY_VERSION_HEX >= 0x030d00A6 && !CYTHON_COMPILING_IN_LIMITED_API + Py_ssize_t bytes_copied = PyLong_AsNativeBytes( + x, &val, sizeof(val), Py_ASNATIVEBYTES_NATIVE_ENDIAN | (is_unsigned ? Py_ASNATIVEBYTES_UNSIGNED_BUFFER | Py_ASNATIVEBYTES_REJECT_NEGATIVE : 0)); + if (unlikely(bytes_copied == -1)) { + } else if (unlikely(bytes_copied > (Py_ssize_t) sizeof(val))) { + goto raise_overflow; + } else { + ret = 0; + } +#elif PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray) + int one = 1; int is_little = (int)*(unsigned char *)&one; + unsigned char *bytes = (unsigned char *)&val; + ret = _PyLong_AsByteArray((PyLongObject *)x, + bytes, sizeof(val), + is_little, !is_unsigned); #else - { - int result = PyObject_RichCompareBool(x, Py_False, Py_LT); - if (unlikely(result < 0)) - return (uint32_t) -1; - is_negative = result == 1; - } -#endif - if (is_unsigned && unlikely(is_negative)) { - goto raise_neg_overflow; - } else if (is_negative) { - stepval = PyNumber_Invert(v); - if (unlikely(!stepval)) - return (uint32_t) -1; - } else { - stepval = __Pyx_NewRef(v); - } - val = (uint32_t) 0; - mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done; - shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done; - for (bits = 0; bits < (int) sizeof(uint32_t) * 8 - chunk_size; bits += chunk_size) { - PyObject *tmp, *digit; - digit = PyNumber_And(stepval, mask); - if (unlikely(!digit)) goto done; - idigit = PyLong_AsLong(digit); - Py_DECREF(digit); - if (unlikely(idigit < 0)) goto done; - tmp = PyNumber_Rshift(stepval, shift); - if (unlikely(!tmp)) goto done; - Py_DECREF(stepval); stepval = tmp; - val |= ((uint32_t) idigit) << bits; - #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - if (Py_SIZE(stepval) == 0) - goto unpacking_done; - #endif - } - idigit = PyLong_AsLong(stepval); - if (unlikely(idigit < 0)) goto done; - remaining_bits = ((int) sizeof(uint32_t) * 8) - bits - (is_unsigned ? 0 : 1); - if (unlikely(idigit >= (1L << remaining_bits))) - goto raise_overflow; - val |= ((uint32_t) idigit) << bits; - #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - unpacking_done: - #endif - if (!is_unsigned) { - if (unlikely(val & (((uint32_t) 1) << (sizeof(uint32_t) * 8 - 1)))) - goto raise_overflow; - if (is_negative) - val = ~val; - } - ret = 0; - done: - Py_XDECREF(shift); - Py_XDECREF(mask); - Py_XDECREF(stepval); -#endif + PyObject *v; + PyObject *stepval = NULL, *mask = NULL, *shift = NULL; + int bits, remaining_bits, is_negative = 0; + int chunk_size = (sizeof(long) < 8) ? 30 : 62; + if (likely(PyLong_CheckExact(x))) { + v = __Pyx_NewRef(x); + } else { + v = PyNumber_Long(x); + if (unlikely(!v)) return (uint32_t) -1; + assert(PyLong_CheckExact(v)); + } + { + int result = PyObject_RichCompareBool(v, Py_False, Py_LT); + if (unlikely(result < 0)) { Py_DECREF(v); - if (likely(!ret)) - return val; + return (uint32_t) -1; } - return (uint32_t) -1; + is_negative = result == 1; } - } else { - uint32_t val; - PyObject *tmp = __Pyx_PyNumber_IntOrLong(x); - if (!tmp) return (uint32_t) -1; - val = __Pyx_PyInt_As_uint32_t(tmp); - Py_DECREF(tmp); + if (is_unsigned && unlikely(is_negative)) { + Py_DECREF(v); + goto raise_neg_overflow; + } else if (is_negative) { + stepval = PyNumber_Invert(v); + Py_DECREF(v); + if (unlikely(!stepval)) + return (uint32_t) -1; + } else { + stepval = v; + } + v = NULL; + val = (uint32_t) 0; + mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done; + shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done; + for (bits = 0; bits < (int) sizeof(uint32_t) * 8 - chunk_size; bits += chunk_size) { + PyObject *tmp, *digit; + long idigit; + digit = PyNumber_And(stepval, mask); + if (unlikely(!digit)) goto done; + idigit = PyLong_AsLong(digit); + Py_DECREF(digit); + if (unlikely(idigit < 0)) goto done; + val |= ((uint32_t) idigit) << bits; + tmp = PyNumber_Rshift(stepval, shift); + if (unlikely(!tmp)) goto done; + Py_DECREF(stepval); stepval = tmp; + } + Py_DECREF(shift); shift = NULL; + Py_DECREF(mask); mask = NULL; + { + long idigit = PyLong_AsLong(stepval); + if (unlikely(idigit < 0)) goto done; + remaining_bits = ((int) sizeof(uint32_t) * 8) - bits - (is_unsigned ? 0 : 1); + if (unlikely(idigit >= (1L << remaining_bits))) + goto raise_overflow; + val |= ((uint32_t) idigit) << bits; + } + if (!is_unsigned) { + if (unlikely(val & (((uint32_t) 1) << (sizeof(uint32_t) * 8 - 1)))) + goto raise_overflow; + if (is_negative) + val = ~val; + } + ret = 0; + done: + Py_XDECREF(shift); + Py_XDECREF(mask); + Py_XDECREF(stepval); +#endif + if (unlikely(ret)) + return (uint32_t) -1; return val; } raise_overflow: @@ -26883,12 +26916,19 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_uint32_t(uint32_t value) { } } { - int one = 1; int little = (int)*(unsigned char *)&one; unsigned char *bytes = (unsigned char *)&value; -#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000 +#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX >= 0x030d00A4 + if (is_unsigned) { + return PyLong_FromUnsignedNativeBytes(bytes, sizeof(value), -1); + } else { + return PyLong_FromNativeBytes(bytes, sizeof(value), -1); + } +#elif !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000 + int one = 1; int little = (int)*(unsigned char *)&one; return _PyLong_FromByteArray(bytes, sizeof(uint32_t), little, !is_unsigned); #else + int one = 1; int little = (int)*(unsigned char *)&one; PyObject *from_bytes, *result = NULL; PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL; from_bytes = PyObject_GetAttrString((PyObject*)&PyLong_Type, "from_bytes"); @@ -26947,12 +26987,19 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) { } } { - int one = 1; int little = (int)*(unsigned char *)&one; unsigned char *bytes = (unsigned char *)&value; -#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000 +#if !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX >= 0x030d00A4 + if (is_unsigned) { + return PyLong_FromUnsignedNativeBytes(bytes, sizeof(value), -1); + } else { + return PyLong_FromNativeBytes(bytes, sizeof(value), -1); + } +#elif !CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030d0000 + int one = 1; int little = (int)*(unsigned char *)&one; return _PyLong_FromByteArray(bytes, sizeof(long), little, !is_unsigned); #else + int one = 1; int little = (int)*(unsigned char *)&one; PyObject *from_bytes, *result = NULL; PyObject *py_bytes = NULL, *arg_tuple = NULL, *kwds = NULL, *order_str = NULL; from_bytes = PyObject_GetAttrString((PyObject*)&PyLong_Type, "from_bytes"); @@ -27002,245 +27049,239 @@ static CYTHON_INLINE size_t __Pyx_PyInt_As_size_t(PyObject *x) { } return (size_t) val; } - } else + } #endif - if (likely(PyLong_Check(x))) { - if (is_unsigned) { + if (unlikely(!PyLong_Check(x))) { + size_t val; + PyObject *tmp = __Pyx_PyNumber_IntOrLong(x); + if (!tmp) return (size_t) -1; + val = __Pyx_PyInt_As_size_t(tmp); + Py_DECREF(tmp); + return val; + } + if (is_unsigned) { #if CYTHON_USE_PYLONG_INTERNALS - if (unlikely(__Pyx_PyLong_IsNeg(x))) { - goto raise_neg_overflow; - } else if (__Pyx_PyLong_IsCompact(x)) { - __PYX_VERIFY_RETURN_INT(size_t, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x)) - } else { - const digit* digits = __Pyx_PyLong_Digits(x); - assert(__Pyx_PyLong_DigitCount(x) > 1); - switch (__Pyx_PyLong_DigitCount(x)) { - case 2: - if ((8 * sizeof(size_t) > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(size_t) >= 2 * PyLong_SHIFT)) { - return (size_t) (((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])); - } + if (unlikely(__Pyx_PyLong_IsNeg(x))) { + goto raise_neg_overflow; + } else if (__Pyx_PyLong_IsCompact(x)) { + __PYX_VERIFY_RETURN_INT(size_t, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x)) + } else { + const digit* digits = __Pyx_PyLong_Digits(x); + assert(__Pyx_PyLong_DigitCount(x) > 1); + switch (__Pyx_PyLong_DigitCount(x)) { + case 2: + if ((8 * sizeof(size_t) > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(size_t) >= 2 * PyLong_SHIFT)) { + return (size_t) (((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])); } - break; - case 3: - if ((8 * sizeof(size_t) > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(size_t) >= 3 * PyLong_SHIFT)) { - return (size_t) (((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])); - } + } + break; + case 3: + if ((8 * sizeof(size_t) > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(size_t) >= 3 * PyLong_SHIFT)) { + return (size_t) (((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])); } - break; - case 4: - if ((8 * sizeof(size_t) > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(size_t) >= 4 * PyLong_SHIFT)) { - return (size_t) (((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])); - } + } + break; + case 4: + if ((8 * sizeof(size_t) > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(size_t) >= 4 * PyLong_SHIFT)) { + return (size_t) (((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])); } - break; - } + } + break; } + } #endif #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7 - if (unlikely(Py_SIZE(x) < 0)) { - goto raise_neg_overflow; - } + if (unlikely(Py_SIZE(x) < 0)) { + goto raise_neg_overflow; + } #else - { - int result = PyObject_RichCompareBool(x, Py_False, Py_LT); - if (unlikely(result < 0)) - return (size_t) -1; - if (unlikely(result == 1)) - goto raise_neg_overflow; - } + { + int result = PyObject_RichCompareBool(x, Py_False, Py_LT); + if (unlikely(result < 0)) + return (size_t) -1; + if (unlikely(result == 1)) + goto raise_neg_overflow; + } #endif - if ((sizeof(size_t) <= sizeof(unsigned long))) { - __PYX_VERIFY_RETURN_INT_EXC(size_t, unsigned long, PyLong_AsUnsignedLong(x)) + if ((sizeof(size_t) <= sizeof(unsigned long))) { + __PYX_VERIFY_RETURN_INT_EXC(size_t, unsigned long, PyLong_AsUnsignedLong(x)) #ifdef HAVE_LONG_LONG - } else if ((sizeof(size_t) <= sizeof(unsigned PY_LONG_LONG))) { - __PYX_VERIFY_RETURN_INT_EXC(size_t, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x)) + } else if ((sizeof(size_t) <= sizeof(unsigned PY_LONG_LONG))) { + __PYX_VERIFY_RETURN_INT_EXC(size_t, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x)) #endif - } - } else { + } + } else { #if CYTHON_USE_PYLONG_INTERNALS - if (__Pyx_PyLong_IsCompact(x)) { - __PYX_VERIFY_RETURN_INT(size_t, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x)) - } else { - const digit* digits = __Pyx_PyLong_Digits(x); - assert(__Pyx_PyLong_DigitCount(x) > 1); - switch (__Pyx_PyLong_SignedDigitCount(x)) { - case -2: - if ((8 * sizeof(size_t) - 1 > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(size_t, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT)) { - return (size_t) (((size_t)-1)*(((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); - } + if (__Pyx_PyLong_IsCompact(x)) { + __PYX_VERIFY_RETURN_INT(size_t, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x)) + } else { + const digit* digits = __Pyx_PyLong_Digits(x); + assert(__Pyx_PyLong_DigitCount(x) > 1); + switch (__Pyx_PyLong_SignedDigitCount(x)) { + case -2: + if ((8 * sizeof(size_t) - 1 > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(size_t, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT)) { + return (size_t) (((size_t)-1)*(((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); } - break; - case 2: - if ((8 * sizeof(size_t) > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT)) { - return (size_t) ((((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); - } + } + break; + case 2: + if ((8 * sizeof(size_t) > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT)) { + return (size_t) ((((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); } - break; - case -3: - if ((8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(size_t, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT)) { - return (size_t) (((size_t)-1)*(((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); - } + } + break; + case -3: + if ((8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(size_t, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT)) { + return (size_t) (((size_t)-1)*(((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); } - break; - case 3: - if ((8 * sizeof(size_t) > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT)) { - return (size_t) ((((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); - } + } + break; + case 3: + if ((8 * sizeof(size_t) > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT)) { + return (size_t) ((((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); } - break; - case -4: - if ((8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(size_t, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(size_t) - 1 > 4 * PyLong_SHIFT)) { - return (size_t) (((size_t)-1)*(((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); - } + } + break; + case -4: + if ((8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(size_t, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(size_t) - 1 > 4 * PyLong_SHIFT)) { + return (size_t) (((size_t)-1)*(((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); } - break; - case 4: - if ((8 * sizeof(size_t) > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(size_t) - 1 > 4 * PyLong_SHIFT)) { - return (size_t) ((((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); - } + } + break; + case 4: + if ((8 * sizeof(size_t) > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(size_t) - 1 > 4 * PyLong_SHIFT)) { + return (size_t) ((((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]))); } - break; - } + } + break; } + } #endif - if ((sizeof(size_t) <= sizeof(long))) { - __PYX_VERIFY_RETURN_INT_EXC(size_t, long, PyLong_AsLong(x)) + if ((sizeof(size_t) <= sizeof(long))) { + __PYX_VERIFY_RETURN_INT_EXC(size_t, long, PyLong_AsLong(x)) #ifdef HAVE_LONG_LONG - } else if ((sizeof(size_t) <= sizeof(PY_LONG_LONG))) { - __PYX_VERIFY_RETURN_INT_EXC(size_t, PY_LONG_LONG, PyLong_AsLongLong(x)) + } else if ((sizeof(size_t) <= sizeof(PY_LONG_LONG))) { + __PYX_VERIFY_RETURN_INT_EXC(size_t, PY_LONG_LONG, PyLong_AsLongLong(x)) #endif - } } - { - size_t val; - PyObject *v = __Pyx_PyNumber_IntOrLong(x); -#if PY_MAJOR_VERSION < 3 - if (likely(v) && !PyLong_Check(v)) { - PyObject *tmp = v; - v = PyNumber_Long(tmp); - Py_DECREF(tmp); - } -#endif - if (likely(v)) { - int ret = -1; -#if PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray) - int one = 1; int is_little = (int)*(unsigned char *)&one; - unsigned char *bytes = (unsigned char *)&val; - ret = _PyLong_AsByteArray((PyLongObject *)v, - bytes, sizeof(val), - is_little, !is_unsigned); -#else - PyObject *stepval = NULL, *mask = NULL, *shift = NULL; - int bits, remaining_bits, is_negative = 0; - long idigit; - int chunk_size = (sizeof(long) < 8) ? 30 : 62; - if (unlikely(!PyLong_CheckExact(v))) { - PyObject *tmp = v; - v = PyNumber_Long(v); - assert(PyLong_CheckExact(v)); - Py_DECREF(tmp); - if (unlikely(!v)) return (size_t) -1; - } -#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - if (Py_SIZE(x) == 0) - return (size_t) 0; - is_negative = Py_SIZE(x) < 0; + } + { + size_t val; + int ret = -1; +#if PY_VERSION_HEX >= 0x030d00A6 && !CYTHON_COMPILING_IN_LIMITED_API + Py_ssize_t bytes_copied = PyLong_AsNativeBytes( + x, &val, sizeof(val), Py_ASNATIVEBYTES_NATIVE_ENDIAN | (is_unsigned ? Py_ASNATIVEBYTES_UNSIGNED_BUFFER | Py_ASNATIVEBYTES_REJECT_NEGATIVE : 0)); + if (unlikely(bytes_copied == -1)) { + } else if (unlikely(bytes_copied > (Py_ssize_t) sizeof(val))) { + goto raise_overflow; + } else { + ret = 0; + } +#elif PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray) + int one = 1; int is_little = (int)*(unsigned char *)&one; + unsigned char *bytes = (unsigned char *)&val; + ret = _PyLong_AsByteArray((PyLongObject *)x, + bytes, sizeof(val), + is_little, !is_unsigned); #else - { - int result = PyObject_RichCompareBool(x, Py_False, Py_LT); - if (unlikely(result < 0)) - return (size_t) -1; - is_negative = result == 1; - } -#endif - if (is_unsigned && unlikely(is_negative)) { - goto raise_neg_overflow; - } else if (is_negative) { - stepval = PyNumber_Invert(v); - if (unlikely(!stepval)) - return (size_t) -1; - } else { - stepval = __Pyx_NewRef(v); - } - val = (size_t) 0; - mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done; - shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done; - for (bits = 0; bits < (int) sizeof(size_t) * 8 - chunk_size; bits += chunk_size) { - PyObject *tmp, *digit; - digit = PyNumber_And(stepval, mask); - if (unlikely(!digit)) goto done; - idigit = PyLong_AsLong(digit); - Py_DECREF(digit); - if (unlikely(idigit < 0)) goto done; - tmp = PyNumber_Rshift(stepval, shift); - if (unlikely(!tmp)) goto done; - Py_DECREF(stepval); stepval = tmp; - val |= ((size_t) idigit) << bits; - #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - if (Py_SIZE(stepval) == 0) - goto unpacking_done; - #endif - } - idigit = PyLong_AsLong(stepval); - if (unlikely(idigit < 0)) goto done; - remaining_bits = ((int) sizeof(size_t) * 8) - bits - (is_unsigned ? 0 : 1); - if (unlikely(idigit >= (1L << remaining_bits))) - goto raise_overflow; - val |= ((size_t) idigit) << bits; - #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - unpacking_done: - #endif - if (!is_unsigned) { - if (unlikely(val & (((size_t) 1) << (sizeof(size_t) * 8 - 1)))) - goto raise_overflow; - if (is_negative) - val = ~val; - } - ret = 0; - done: - Py_XDECREF(shift); - Py_XDECREF(mask); - Py_XDECREF(stepval); -#endif + PyObject *v; + PyObject *stepval = NULL, *mask = NULL, *shift = NULL; + int bits, remaining_bits, is_negative = 0; + int chunk_size = (sizeof(long) < 8) ? 30 : 62; + if (likely(PyLong_CheckExact(x))) { + v = __Pyx_NewRef(x); + } else { + v = PyNumber_Long(x); + if (unlikely(!v)) return (size_t) -1; + assert(PyLong_CheckExact(v)); + } + { + int result = PyObject_RichCompareBool(v, Py_False, Py_LT); + if (unlikely(result < 0)) { Py_DECREF(v); - if (likely(!ret)) - return val; + return (size_t) -1; } - return (size_t) -1; + is_negative = result == 1; } - } else { - size_t val; - PyObject *tmp = __Pyx_PyNumber_IntOrLong(x); - if (!tmp) return (size_t) -1; - val = __Pyx_PyInt_As_size_t(tmp); - Py_DECREF(tmp); + if (is_unsigned && unlikely(is_negative)) { + Py_DECREF(v); + goto raise_neg_overflow; + } else if (is_negative) { + stepval = PyNumber_Invert(v); + Py_DECREF(v); + if (unlikely(!stepval)) + return (size_t) -1; + } else { + stepval = v; + } + v = NULL; + val = (size_t) 0; + mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done; + shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done; + for (bits = 0; bits < (int) sizeof(size_t) * 8 - chunk_size; bits += chunk_size) { + PyObject *tmp, *digit; + long idigit; + digit = PyNumber_And(stepval, mask); + if (unlikely(!digit)) goto done; + idigit = PyLong_AsLong(digit); + Py_DECREF(digit); + if (unlikely(idigit < 0)) goto done; + val |= ((size_t) idigit) << bits; + tmp = PyNumber_Rshift(stepval, shift); + if (unlikely(!tmp)) goto done; + Py_DECREF(stepval); stepval = tmp; + } + Py_DECREF(shift); shift = NULL; + Py_DECREF(mask); mask = NULL; + { + long idigit = PyLong_AsLong(stepval); + if (unlikely(idigit < 0)) goto done; + remaining_bits = ((int) sizeof(size_t) * 8) - bits - (is_unsigned ? 0 : 1); + if (unlikely(idigit >= (1L << remaining_bits))) + goto raise_overflow; + val |= ((size_t) idigit) << bits; + } + if (!is_unsigned) { + if (unlikely(val & (((size_t) 1) << (sizeof(size_t) * 8 - 1)))) + goto raise_overflow; + if (is_negative) + val = ~val; + } + ret = 0; + done: + Py_XDECREF(shift); + Py_XDECREF(mask); + Py_XDECREF(stepval); +#endif + if (unlikely(ret)) + return (size_t) -1; return val; } raise_overflow: @@ -27291,245 +27332,239 @@ static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) { } return (long) val; } - } else + } #endif - if (likely(PyLong_Check(x))) { - if (is_unsigned) { + if (unlikely(!PyLong_Check(x))) { + long val; + PyObject *tmp = __Pyx_PyNumber_IntOrLong(x); + if (!tmp) return (long) -1; + val = __Pyx_PyInt_As_long(tmp); + Py_DECREF(tmp); + return val; + } + if (is_unsigned) { #if CYTHON_USE_PYLONG_INTERNALS - if (unlikely(__Pyx_PyLong_IsNeg(x))) { - goto raise_neg_overflow; - } else if (__Pyx_PyLong_IsCompact(x)) { - __PYX_VERIFY_RETURN_INT(long, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x)) - } else { - const digit* digits = __Pyx_PyLong_Digits(x); - assert(__Pyx_PyLong_DigitCount(x) > 1); - switch (__Pyx_PyLong_DigitCount(x)) { - case 2: - if ((8 * sizeof(long) > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(long) >= 2 * PyLong_SHIFT)) { - return (long) (((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0])); - } + if (unlikely(__Pyx_PyLong_IsNeg(x))) { + goto raise_neg_overflow; + } else if (__Pyx_PyLong_IsCompact(x)) { + __PYX_VERIFY_RETURN_INT(long, __Pyx_compact_upylong, __Pyx_PyLong_CompactValueUnsigned(x)) + } else { + const digit* digits = __Pyx_PyLong_Digits(x); + assert(__Pyx_PyLong_DigitCount(x) > 1); + switch (__Pyx_PyLong_DigitCount(x)) { + case 2: + if ((8 * sizeof(long) > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(long) >= 2 * PyLong_SHIFT)) { + return (long) (((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0])); } - break; - case 3: - if ((8 * sizeof(long) > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(long) >= 3 * PyLong_SHIFT)) { - return (long) (((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])); - } + } + break; + case 3: + if ((8 * sizeof(long) > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(long) >= 3 * PyLong_SHIFT)) { + return (long) (((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])); } - break; - case 4: - if ((8 * sizeof(long) > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(long) >= 4 * PyLong_SHIFT)) { - return (long) (((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])); - } + } + break; + case 4: + if ((8 * sizeof(long) > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(long) >= 4 * PyLong_SHIFT)) { + return (long) (((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])); } - break; - } + } + break; } + } #endif #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030C00A7 - if (unlikely(Py_SIZE(x) < 0)) { - goto raise_neg_overflow; - } + if (unlikely(Py_SIZE(x) < 0)) { + goto raise_neg_overflow; + } #else - { - int result = PyObject_RichCompareBool(x, Py_False, Py_LT); - if (unlikely(result < 0)) - return (long) -1; - if (unlikely(result == 1)) - goto raise_neg_overflow; - } + { + int result = PyObject_RichCompareBool(x, Py_False, Py_LT); + if (unlikely(result < 0)) + return (long) -1; + if (unlikely(result == 1)) + goto raise_neg_overflow; + } #endif - if ((sizeof(long) <= sizeof(unsigned long))) { - __PYX_VERIFY_RETURN_INT_EXC(long, unsigned long, PyLong_AsUnsignedLong(x)) + if ((sizeof(long) <= sizeof(unsigned long))) { + __PYX_VERIFY_RETURN_INT_EXC(long, unsigned long, PyLong_AsUnsignedLong(x)) #ifdef HAVE_LONG_LONG - } else if ((sizeof(long) <= sizeof(unsigned PY_LONG_LONG))) { - __PYX_VERIFY_RETURN_INT_EXC(long, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x)) + } else if ((sizeof(long) <= sizeof(unsigned PY_LONG_LONG))) { + __PYX_VERIFY_RETURN_INT_EXC(long, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x)) #endif - } - } else { + } + } else { #if CYTHON_USE_PYLONG_INTERNALS - if (__Pyx_PyLong_IsCompact(x)) { - __PYX_VERIFY_RETURN_INT(long, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x)) - } else { - const digit* digits = __Pyx_PyLong_Digits(x); - assert(__Pyx_PyLong_DigitCount(x) > 1); - switch (__Pyx_PyLong_SignedDigitCount(x)) { - case -2: - if ((8 * sizeof(long) - 1 > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) { - return (long) (((long)-1)*(((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); - } + if (__Pyx_PyLong_IsCompact(x)) { + __PYX_VERIFY_RETURN_INT(long, __Pyx_compact_pylong, __Pyx_PyLong_CompactValue(x)) + } else { + const digit* digits = __Pyx_PyLong_Digits(x); + assert(__Pyx_PyLong_DigitCount(x) > 1); + switch (__Pyx_PyLong_SignedDigitCount(x)) { + case -2: + if ((8 * sizeof(long) - 1 > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) { + return (long) (((long)-1)*(((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); } - break; - case 2: - if ((8 * sizeof(long) > 1 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) { - return (long) ((((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); - } + } + break; + case 2: + if ((8 * sizeof(long) > 1 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 2 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) { + return (long) ((((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); } - break; - case -3: - if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) { - return (long) (((long)-1)*(((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); - } + } + break; + case -3: + if ((8 * sizeof(long) - 1 > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) { + return (long) (((long)-1)*(((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); } - break; - case 3: - if ((8 * sizeof(long) > 2 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) { - return (long) ((((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); - } + } + break; + case 3: + if ((8 * sizeof(long) > 2 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 3 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) { + return (long) ((((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); } - break; - case -4: - if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(long) - 1 > 4 * PyLong_SHIFT)) { - return (long) (((long)-1)*(((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); - } + } + break; + case -4: + if ((8 * sizeof(long) - 1 > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(long) - 1 > 4 * PyLong_SHIFT)) { + return (long) (((long)-1)*(((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); } - break; - case 4: - if ((8 * sizeof(long) > 3 * PyLong_SHIFT)) { - if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { - __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) - } else if ((8 * sizeof(long) - 1 > 4 * PyLong_SHIFT)) { - return (long) ((((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); - } + } + break; + case 4: + if ((8 * sizeof(long) > 3 * PyLong_SHIFT)) { + if ((8 * sizeof(unsigned long) > 4 * PyLong_SHIFT)) { + __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]))) + } else if ((8 * sizeof(long) - 1 > 4 * PyLong_SHIFT)) { + return (long) ((((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]))); } - break; - } + } + break; } + } #endif - if ((sizeof(long) <= sizeof(long))) { - __PYX_VERIFY_RETURN_INT_EXC(long, long, PyLong_AsLong(x)) + if ((sizeof(long) <= sizeof(long))) { + __PYX_VERIFY_RETURN_INT_EXC(long, long, PyLong_AsLong(x)) #ifdef HAVE_LONG_LONG - } else if ((sizeof(long) <= sizeof(PY_LONG_LONG))) { - __PYX_VERIFY_RETURN_INT_EXC(long, PY_LONG_LONG, PyLong_AsLongLong(x)) + } else if ((sizeof(long) <= sizeof(PY_LONG_LONG))) { + __PYX_VERIFY_RETURN_INT_EXC(long, PY_LONG_LONG, PyLong_AsLongLong(x)) #endif - } } - { - long val; - PyObject *v = __Pyx_PyNumber_IntOrLong(x); -#if PY_MAJOR_VERSION < 3 - if (likely(v) && !PyLong_Check(v)) { - PyObject *tmp = v; - v = PyNumber_Long(tmp); - Py_DECREF(tmp); - } -#endif - if (likely(v)) { - int ret = -1; -#if PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray) - int one = 1; int is_little = (int)*(unsigned char *)&one; - unsigned char *bytes = (unsigned char *)&val; - ret = _PyLong_AsByteArray((PyLongObject *)v, - bytes, sizeof(val), - is_little, !is_unsigned); -#else - PyObject *stepval = NULL, *mask = NULL, *shift = NULL; - int bits, remaining_bits, is_negative = 0; - long idigit; - int chunk_size = (sizeof(long) < 8) ? 30 : 62; - if (unlikely(!PyLong_CheckExact(v))) { - PyObject *tmp = v; - v = PyNumber_Long(v); - assert(PyLong_CheckExact(v)); - Py_DECREF(tmp); - if (unlikely(!v)) return (long) -1; - } -#if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - if (Py_SIZE(x) == 0) - return (long) 0; - is_negative = Py_SIZE(x) < 0; + } + { + long val; + int ret = -1; +#if PY_VERSION_HEX >= 0x030d00A6 && !CYTHON_COMPILING_IN_LIMITED_API + Py_ssize_t bytes_copied = PyLong_AsNativeBytes( + x, &val, sizeof(val), Py_ASNATIVEBYTES_NATIVE_ENDIAN | (is_unsigned ? Py_ASNATIVEBYTES_UNSIGNED_BUFFER | Py_ASNATIVEBYTES_REJECT_NEGATIVE : 0)); + if (unlikely(bytes_copied == -1)) { + } else if (unlikely(bytes_copied > (Py_ssize_t) sizeof(val))) { + goto raise_overflow; + } else { + ret = 0; + } +#elif PY_VERSION_HEX < 0x030d0000 && !(CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_LIMITED_API) || defined(_PyLong_AsByteArray) + int one = 1; int is_little = (int)*(unsigned char *)&one; + unsigned char *bytes = (unsigned char *)&val; + ret = _PyLong_AsByteArray((PyLongObject *)x, + bytes, sizeof(val), + is_little, !is_unsigned); #else - { - int result = PyObject_RichCompareBool(x, Py_False, Py_LT); - if (unlikely(result < 0)) - return (long) -1; - is_negative = result == 1; - } -#endif - if (is_unsigned && unlikely(is_negative)) { - goto raise_neg_overflow; - } else if (is_negative) { - stepval = PyNumber_Invert(v); - if (unlikely(!stepval)) - return (long) -1; - } else { - stepval = __Pyx_NewRef(v); - } - val = (long) 0; - mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done; - shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done; - for (bits = 0; bits < (int) sizeof(long) * 8 - chunk_size; bits += chunk_size) { - PyObject *tmp, *digit; - digit = PyNumber_And(stepval, mask); - if (unlikely(!digit)) goto done; - idigit = PyLong_AsLong(digit); - Py_DECREF(digit); - if (unlikely(idigit < 0)) goto done; - tmp = PyNumber_Rshift(stepval, shift); - if (unlikely(!tmp)) goto done; - Py_DECREF(stepval); stepval = tmp; - val |= ((long) idigit) << bits; - #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - if (Py_SIZE(stepval) == 0) - goto unpacking_done; - #endif - } - idigit = PyLong_AsLong(stepval); - if (unlikely(idigit < 0)) goto done; - remaining_bits = ((int) sizeof(long) * 8) - bits - (is_unsigned ? 0 : 1); - if (unlikely(idigit >= (1L << remaining_bits))) - goto raise_overflow; - val |= ((long) idigit) << bits; - #if CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX < 0x030B0000 - unpacking_done: - #endif - if (!is_unsigned) { - if (unlikely(val & (((long) 1) << (sizeof(long) * 8 - 1)))) - goto raise_overflow; - if (is_negative) - val = ~val; - } - ret = 0; - done: - Py_XDECREF(shift); - Py_XDECREF(mask); - Py_XDECREF(stepval); -#endif + PyObject *v; + PyObject *stepval = NULL, *mask = NULL, *shift = NULL; + int bits, remaining_bits, is_negative = 0; + int chunk_size = (sizeof(long) < 8) ? 30 : 62; + if (likely(PyLong_CheckExact(x))) { + v = __Pyx_NewRef(x); + } else { + v = PyNumber_Long(x); + if (unlikely(!v)) return (long) -1; + assert(PyLong_CheckExact(v)); + } + { + int result = PyObject_RichCompareBool(v, Py_False, Py_LT); + if (unlikely(result < 0)) { Py_DECREF(v); - if (likely(!ret)) - return val; + return (long) -1; } - return (long) -1; + is_negative = result == 1; } - } else { - long val; - PyObject *tmp = __Pyx_PyNumber_IntOrLong(x); - if (!tmp) return (long) -1; - val = __Pyx_PyInt_As_long(tmp); - Py_DECREF(tmp); + if (is_unsigned && unlikely(is_negative)) { + Py_DECREF(v); + goto raise_neg_overflow; + } else if (is_negative) { + stepval = PyNumber_Invert(v); + Py_DECREF(v); + if (unlikely(!stepval)) + return (long) -1; + } else { + stepval = v; + } + v = NULL; + val = (long) 0; + mask = PyLong_FromLong((1L << chunk_size) - 1); if (unlikely(!mask)) goto done; + shift = PyLong_FromLong(chunk_size); if (unlikely(!shift)) goto done; + for (bits = 0; bits < (int) sizeof(long) * 8 - chunk_size; bits += chunk_size) { + PyObject *tmp, *digit; + long idigit; + digit = PyNumber_And(stepval, mask); + if (unlikely(!digit)) goto done; + idigit = PyLong_AsLong(digit); + Py_DECREF(digit); + if (unlikely(idigit < 0)) goto done; + val |= ((long) idigit) << bits; + tmp = PyNumber_Rshift(stepval, shift); + if (unlikely(!tmp)) goto done; + Py_DECREF(stepval); stepval = tmp; + } + Py_DECREF(shift); shift = NULL; + Py_DECREF(mask); mask = NULL; + { + long idigit = PyLong_AsLong(stepval); + if (unlikely(idigit < 0)) goto done; + remaining_bits = ((int) sizeof(long) * 8) - bits - (is_unsigned ? 0 : 1); + if (unlikely(idigit >= (1L << remaining_bits))) + goto raise_overflow; + val |= ((long) idigit) << bits; + } + if (!is_unsigned) { + if (unlikely(val & (((long) 1) << (sizeof(long) * 8 - 1)))) + goto raise_overflow; + if (is_negative) + val = ~val; + } + ret = 0; + done: + Py_XDECREF(shift); + Py_XDECREF(mask); + Py_XDECREF(stepval); +#endif + if (unlikely(ret)) + return (long) -1; return val; } raise_overflow: diff --git a/larch/pickle/pickle.hpp b/larch/pickle/pickle.hpp index e47b014..9c9bdcd 100644 --- a/larch/pickle/pickle.hpp +++ b/larch/pickle/pickle.hpp @@ -1,13 +1,14 @@ #ifndef __PICKLE_HPP__ #define __PICKLE_HPP__ -#include -#include +#include +#include + #include #include +#include #include -#include -#include +#include using namespace boost; using namespace boost::endian; @@ -21,32 +22,50 @@ using namespace boost::container; #define MIN_STRING_SIZE_FOR_REF 3 enum EXT_TYPES { - VERSION=0, LONG, LIST, OBJECT, OBJECT_NEW, GLOBAL, SINGLETON, - OLD_STYLE, INIT_ARGS, END_OBJECT_ITEMS, BYTES, UNISTR, OBJECT_NEW_CUSTOM, - GLOBAL_OBJECT, FAST_NEW, COUNT_EXT_TYPES + VERSION = 0, + LONG, + LIST, + OBJECT, + OBJECT_NEW, + GLOBAL, + SINGLETON, + OLD_STYLE, + INIT_ARGS, + END_OBJECT_ITEMS, + BYTES, + UNISTR, + OBJECT_NEW_CUSTOM, + GLOBAL_OBJECT, + FAST_NEW, + COUNT_EXT_TYPES }; - #ifndef PyUnicode_GET_LENGTH #define PyUnicode_GET_LENGTH PyUnicode_GET_SIZE #endif - typedef int (*write_t)(PyObject* p, void* data, size_t size); typedef int (*read_t)(PyObject* p, void* data, size_t size); - // typedef void (*debug_t)(const char* msg, PyObject *o, long v); // static debug_t debug; +class PythonError : std::exception {}; -class PythonError: std::exception { -}; - -inline void throw_python_error() { - throw PythonError(); -} +inline void throw_python_error() { throw PythonError(); } #define GET_NEW(obj) (((PyTypeObject*)(obj))->tp_new) +#if PY_MINOR_VERSION < 13 +inline int CPyLong_AsByteArray(PyLongObject* v, unsigned char* bytes, size_t n, + int little_endian, int is_signed) { + return _PyLong_AsByteArray(v, bytes, n, little_endian, is_signed); +} +#else +inline int CPyLong_AsByteArray(PyLongObject* v, unsigned char* bytes, size_t n, + int little_endian, int is_signed) { + return _PyLong_AsByteArray(v, bytes, n, little_endian, is_signed, 1); +} +#endif + #endif diff --git a/larch/pickle/pickle.pyx b/larch/pickle/pickle.pyx index 9c53105..1351d5d 100644 --- a/larch/pickle/pickle.pyx +++ b/larch/pickle/pickle.pyx @@ -111,6 +111,8 @@ cdef extern from "pickle.hpp": #cdef debug_t debug void throw_python_error() + int CPyLong_AsByteArray(PyLongObject* v, uchar_t* bytes, size_t n, + int little_endian, int is_signed) ctypedef object (*tp_new_t)(PyTypeObject*, object, PyObject*) cdef tp_new_t GET_NEW(object) @@ -416,7 +418,7 @@ cdef void save_long(Packer* p, object o) noexcept: tmp = PyBytes_FromStringAndSize(NULL, nbytes) data = Bytes_AS_STRING(tmp) - if _PyLong_AsByteArray(o, data, nbytes, 1, 1) < 0: + if CPyLong_AsByteArray(o, data, nbytes, 1, 1) < 0: throw_python_error() if (sign < 0 and nbytes > 1 diff --git a/setup.py b/setup.py index d3a9f0f..ef70b3f 100644 --- a/setup.py +++ b/setup.py @@ -130,7 +130,7 @@ def make(self): setup( name="larch-pickle", - version="1.4.4", + version="1.4.5", packages=find_namespace_packages(where=".", include=["larch.pickle"]), exclude=["pickle.pyx"], # don't generate auto extension diff --git a/tests/benchmark.py b/tests/benchmark.py index a449d48..e43a0f1 100644 --- a/tests/benchmark.py +++ b/tests/benchmark.py @@ -3,7 +3,7 @@ # # Simple serialization banchmark # - +import sys from timeit import timeit from tabulate import tabulate try: @@ -39,7 +39,8 @@ def mdump(x, f): serializers = ( - ('Pickle-3.12.2', pdumps, pickle.loads), + (f'Pickle-{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}', + pdumps, pickle.loads), ('json', json.dumps, json.loads), # ('cjson', cjson.encode, cjson.decode), ('ujson', ujson.dumps, ujson.loads),