omextra 0.0.0.dev508__py3-none-any.whl → 0.0.0.dev509__py3-none-any.whl

omextra/collections/hamt/_hamt.c

@@ -36,7 +36,9 @@
 // 8. By copying, installing or otherwise using Python, Licensee agrees to be bound by the terms and conditions of this
 // License Agreement.
 //
-// https://github.com/python/cpython/commit/aa18fd55d575a04e3aa782fedcd08dced26676e0
+// https://github.com/python/cpython/blob/main/Python/hamt.c
+//
+// original: https://github.com/python/cpython/commit/aa18fd55d575a04e3aa782fedcd08dced26676e0
 //
 #define PY_SSIZE_T_CLEAN
 
@@ -611,6 +613,8 @@ typedef struct {
     Py_ssize_t a_count;
 } HamtNode_Array;
 
+#define _HamtNode_Array_CAST(op)      ((HamtNode_Array *)(op))
+
 
 typedef struct {
     PyObject_VAR_HEAD
@@ -618,6 +622,8 @@ typedef struct {
     PyObject *c_array[1];
 } HamtNode_Collision;
 
+#define _HamtNode_Collision_CAST(op)  ((HamtNode_Collision *)(op))
+
 
 static HamtObject *
 hamt_alloc(hamt_module_state *state);
@@ -794,6 +800,8 @@ _hamt_dump_format(_PyUnicodeWriter *writer, const char *format, ...)
 #endif  /* Py_DEBUG */
 /////////////////////////////////// Bitmap Node
 
+#define _HamtNode_Bitmap_CAST(op)     ((HamtNode_Bitmap *)(op))
+
 
 static HamtNode *
 hamt_node_bitmap_new(hamt_module_state *state, Py_ssize_t size)
@@ -1406,13 +1414,12 @@ hamt_node_bitmap_find(HamtNode_Bitmap *self,
 }
 
 static int
-hamt_node_bitmap_traverse(HamtNode_Bitmap *self, visitproc visit, void *arg)
+hamt_node_bitmap_traverse(PyObject *op, visitproc visit, void *arg)
 {
     /* Bitmap's tp_traverse */
 
-    Py_ssize_t i;
-
-    for (i = Py_SIZE(self); --i >= 0; ) {
+    HamtNode_Bitmap *self = _HamtNode_Bitmap_CAST(op);
+    for (Py_ssize_t i = Py_SIZE(self); --i >= 0;) {
         Py_VISIT(self->b_array[i]);
     }
 
@@ -1420,17 +1427,16 @@ hamt_node_bitmap_traverse(HamtNode_Bitmap *self, visitproc visit, void *arg)
 }
 
 static void
-hamt_node_bitmap_dealloc(HamtNode_Bitmap *self)
+hamt_node_bitmap_dealloc(PyObject *self)
 {
     /* Bitmap's tp_dealloc */
 
-    Py_ssize_t len = Py_SIZE(self);
-    Py_ssize_t i;
+    HamtNode_Bitmap *node = _HamtNode_Bitmap_CAST(self);
+    Py_ssize_t i, len = Py_SIZE(self);
 
-    if (Py_SIZE(self) == 0) {
+    if (len == 0) {
         /* The empty node is managed by the module state. */
-        hamt_module_state *state = get_hamt_state_from_obj((PyObject*)self);
-        assert(self == state->empty_bitmap_node);
+        assert(node == get_hamt_state_from_obj(self)->empty_bitmap_node);
 #ifdef Py_DEBUG
         _Py_FatalRefcountError("deallocating the empty hamt node bitmap singleton");
 #else
@@ -1444,11 +1450,11 @@ hamt_node_bitmap_dealloc(HamtNode_Bitmap *self)
     if (len > 0) {
         i = len;
         while (--i >= 0) {
-            Py_XDECREF(self->b_array[i]);
+            Py_XDECREF(node->b_array[i]);
         }
     }
 
-    Py_TYPE(self)->tp_free((PyObject *)self);
+    Py_TYPE(self)->tp_free(self);
     Py_TRASHCAN_END
 }
 
@@ -1824,14 +1830,12 @@ hamt_node_collision_find(HamtNode_Collision *self,
 
 
 static int
-hamt_node_collision_traverse(HamtNode_Collision *self,
-                             visitproc visit, void *arg)
+hamt_node_collision_traverse(PyObject *op, visitproc visit, void *arg)
 {
     /* Collision's tp_traverse */
 
-    Py_ssize_t i;
-
-    for (i = Py_SIZE(self); --i >= 0; ) {
+    HamtNode_Collision *self = _HamtNode_Collision_CAST(op);
+    for (Py_ssize_t i = Py_SIZE(self); --i >= 0; ) {
         Py_VISIT(self->c_array[i]);
     }
 
@@ -1839,7 +1843,7 @@ hamt_node_collision_traverse(HamtNode_Collision *self,
 }
 
 static void
-hamt_node_collision_dealloc(HamtNode_Collision *self)
+hamt_node_collision_dealloc(PyObject *self)
 {
     /* Collision's tp_dealloc */
 
@@ -1849,13 +1853,13 @@ hamt_node_collision_dealloc(HamtNode_Collision *self)
     Py_TRASHCAN_BEGIN(self, hamt_node_collision_dealloc)
 
     if (len > 0) {
-
+        HamtNode_Collision *node = _HamtNode_Collision_CAST(self);
         while (--len >= 0) {
-            Py_XDECREF(self->c_array[len]);
+            Py_XDECREF(node->c_array[len]);
         }
     }
 
-    Py_TYPE(self)->tp_free((PyObject *)self);
+    Py_TYPE(self)->tp_free(self);
     Py_TRASHCAN_END
 }
 
@@ -2207,14 +2211,12 @@ hamt_node_array_find(HamtNode_Array *self,
 }
 
 static int
-hamt_node_array_traverse(HamtNode_Array *self,
-                         visitproc visit, void *arg)
+hamt_node_array_traverse(PyObject *op, visitproc visit, void *arg)
 {
     /* Array's tp_traverse */
 
-    Py_ssize_t i;
-
-    for (i = 0; i < HAMT_ARRAY_NODE_SIZE; i++) {
+    HamtNode_Array *self = _HamtNode_Array_CAST(op);
+    for (Py_ssize_t i = 0; i < HAMT_ARRAY_NODE_SIZE; i++) {
         Py_VISIT(self->a_array[i]);
     }
 
@@ -2222,20 +2224,19 @@ hamt_node_array_traverse(HamtNode_Array *self,
 }
 
 static void
-hamt_node_array_dealloc(HamtNode_Array *self)
+hamt_node_array_dealloc(PyObject *self)
 {
     /* Array's tp_dealloc */
 
-    Py_ssize_t i;
-
     PyObject_GC_UnTrack(self);
     Py_TRASHCAN_BEGIN(self, hamt_node_array_dealloc)
 
-    for (i = 0; i < HAMT_ARRAY_NODE_SIZE; i++) {
-        Py_XDECREF(self->a_array[i]);
+    HamtNode_Array *obj = _HamtNode_Array_CAST(self);
+    for (Py_ssize_t i = 0; i < HAMT_ARRAY_NODE_SIZE; i++) {
+        Py_XDECREF(obj->a_array[i]);
     }
 
-    Py_TYPE(self)->tp_free((PyObject *)self);
+    Py_TYPE(self)->tp_free(self);
     Py_TRASHCAN_END
 }
 
@@ -2661,7 +2662,6 @@ hamt_find(HamtObject *o, PyObject *key, PyObject **val)
     return hamt_node_find(o->h_root, 0, key_hash, key, val);
 }
 
-
 int
 _Hamt_Find(HamtObject *o, PyObject *key, PyObject **val)
 {
@@ -2678,7 +2678,6 @@ _Hamt_Find(HamtObject *o, PyObject *key, PyObject **val)
     }
 }
 
-
 int
 _Hamt_Eq(HamtObject *v, HamtObject *w)
 {
@@ -2690,6 +2689,10 @@ _Hamt_Eq(HamtObject *v, HamtObject *w)
         return 0;
     }
 
+    Py_INCREF(v);
+    Py_INCREF(w);
+
+    int res = 1;
     HamtIteratorState iter;
     hamt_iter_t iter_res;
     hamt_find_t find_res;
@@ -2705,25 +2708,38 @@ _Hamt_Eq(HamtObject *v, HamtObject *w)
             find_res = hamt_find(w, v_key, &w_val);
             switch (find_res) {
                 case F_ERROR:
-                    return -1;
+                    res = -1;
+                    goto done;
 
                 case F_NOT_FOUND:
-                    return 0;
+                    res = 0;
+                    goto done;
 
                 case F_FOUND: {
+                    Py_INCREF(v_key);
+                    Py_INCREF(v_val);
+                    Py_INCREF(w_val);
                     int cmp = PyObject_RichCompareBool(v_val, w_val, Py_EQ);
+                    Py_DECREF(v_key);
+                    Py_DECREF(v_val);
+                    Py_DECREF(w_val);
                     if (cmp < 0) {
-                        return -1;
+                        res = -1;
+                        goto done;
                     }
                     if (cmp == 0) {
-                        return 0;
+                        res = 0;
+                        goto done;
                     }
                 }
             }
         }
     } while (iter_res != I_END);
 
-    return 1;
+    done:
+        Py_DECREF(v);
+    Py_DECREF(w);
+    return res;
 }
 
 Py_ssize_t
@@ -2784,14 +2800,15 @@ error:
 
 
 static int
-hamt_baseiter_tp_clear(HamtIterator *it)
+hamt_baseiter_tp_clear(PyObject *op)
 {
+    HamtIterator *it = (HamtIterator*)op;
     Py_CLEAR(it->hi_obj);
     return 0;
 }
 
 static void
-hamt_baseiter_tp_dealloc(HamtIterator *it)
+hamt_baseiter_tp_dealloc(PyObject *it)
 {
     PyObject_GC_UnTrack(it);
     (void)hamt_baseiter_tp_clear(it);
@@ -2799,15 +2816,17 @@ hamt_baseiter_tp_dealloc(HamtIterator *it)
 }
 
 static int
-hamt_baseiter_tp_traverse(HamtIterator *it, visitproc visit, void *arg)
+hamt_baseiter_tp_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    HamtIterator *it = (HamtIterator*)op;
     Py_VISIT(it->hi_obj);
     return 0;
 }
 
 static PyObject *
-hamt_baseiter_tp_iternext(HamtIterator *it)
+hamt_baseiter_tp_iternext(PyObject *op)
 {
+    HamtIterator *it = (HamtIterator*)op;
     PyObject *key;
     PyObject *val;
     hamt_iter_t res = hamt_iterator_next(&it->hi_iter, &key, &val);
@@ -2849,17 +2868,17 @@ hamt_baseiter_new(PyTypeObject *type, binaryfunc yield, HamtObject *o)
     return (PyObject*)it;
 }
 
-#define ITERATOR_TYPE_SHARED_SLOTS                              \
-    .tp_basicsize = sizeof(HamtIterator),                     \
-    .tp_itemsize = 0,                                           \
-    .tp_as_mapping = &HamtIterator_as_mapping,                \
-    .tp_dealloc = (destructor)hamt_baseiter_tp_dealloc,         \
-    .tp_getattro = PyObject_GenericGetAttr,                     \
-    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,        \
-    .tp_traverse = (traverseproc)hamt_baseiter_tp_traverse,     \
-    .tp_clear = (inquiry)hamt_baseiter_tp_clear,                \
-    .tp_iter = PyObject_SelfIter,                               \
-    .tp_iternext = (iternextfunc)hamt_baseiter_tp_iternext,
+#define ITERATOR_TYPE_SHARED_SLOTS                       \
+    .tp_basicsize = sizeof(HamtIterator),                \
+    .tp_itemsize = 0,                                    \
+    .tp_as_mapping = &HamtIterator_as_mapping,           \
+    .tp_dealloc = hamt_baseiter_tp_dealloc,              \
+    .tp_getattro = PyObject_GenericGetAttr,              \
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, \
+    .tp_traverse = hamt_baseiter_tp_traverse,            \
+    .tp_clear = hamt_baseiter_tp_clear,                  \
+    .tp_iter = PyObject_SelfIter,                        \
+    .tp_iternext = hamt_baseiter_tp_iternext,
 
 
 /////////////////////////////////// _HamtItems_Type
@@ -2981,6 +3000,8 @@ static PyObject *
 hamt_dump(HamtObject *self);
 #endif
 
+#define _HamtObject_CAST(op)      ((HamtObject *)(op))
+
 
 static PyObject *
 hamt_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
@@ -2990,25 +3011,28 @@ hamt_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 }
 
 static int
-hamt_tp_clear(HamtObject *self)
+hamt_tp_clear(PyObject *op)
 {
+    HamtObject *self = _HamtObject_CAST(op);
     Py_CLEAR(self->h_root);
     return 0;
 }
 
 
 static int
-hamt_tp_traverse(HamtObject *self, visitproc visit, void *arg)
+hamt_tp_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    HamtObject *self = _HamtObject_CAST(op);
     Py_VISIT(self->h_root);
     return 0;
 }
 
 static void
-hamt_tp_dealloc(HamtObject *self)
+hamt_tp_dealloc(PyObject *self)
 {
-    hamt_module_state *state = get_hamt_state_from_obj((PyObject*)self);
-    if (self == state->empty_hamt) {
+    hamt_module_state *state = get_hamt_state_from_obj(self);
+    HamtObject *obj = _HamtObject_CAST(self);
+    if (obj == state->empty_hamt) {
         /* The empty one is managed by the module state. */
 #ifdef Py_DEBUG
         _Py_FatalRefcountError("deallocating the empty hamt singleton");
@@ -3018,8 +3042,8 @@ hamt_tp_dealloc(HamtObject *self)
     }
 
     PyObject_GC_UnTrack(self);
-    if (self->h_weakreflist != NULL) {
-        PyObject_ClearWeakRefs((PyObject*)self);
+    if (obj->h_weakreflist != NULL) {
+        PyObject_ClearWeakRefs(self);
     }
     (void)hamt_tp_clear(self);
     Py_TYPE(self)->tp_free(self);
@@ -3051,16 +3075,18 @@ hamt_tp_richcompare(PyObject *v, PyObject *w, int op)
 }
 
 static int
-hamt_tp_contains(HamtObject *self, PyObject *key)
+hamt_tp_contains(PyObject *op, PyObject *key)
 {
     PyObject *val;
+    HamtObject *self = _HamtObject_CAST(op);
     return _Hamt_Find(self, key, &val);
 }
 
 static PyObject *
-hamt_tp_subscript(HamtObject *self, PyObject *key)
+hamt_tp_subscript(PyObject *op, PyObject *key)
 {
     PyObject *val;
+    HamtObject *self = _HamtObject_CAST(op);
     hamt_find_t res = hamt_find(self, key, &val);
     switch (res) {
         case F_ERROR:
@@ -3076,19 +3102,21 @@ hamt_tp_subscript(HamtObject *self, PyObject *key)
 }
 
 static Py_ssize_t
-hamt_tp_len(HamtObject *self)
+hamt_tp_len(PyObject *op)
 {
+    HamtObject *self = _HamtObject_CAST(op);
     return _Hamt_Len(self);
 }
 
 static PyObject *
-hamt_tp_iter(HamtObject *self)
+hamt_tp_iter(PyObject *op)
 {
+    HamtObject *self = _HamtObject_CAST(op);
     return _Hamt_NewIterKeys(self);
 }
 
 static PyObject *
-hamt_py_set(HamtObject *self, PyObject *args)
+hamt_py_set(PyObject *op, PyObject *args)
 {
     PyObject *key;
     PyObject *val;
@@ -3097,11 +3125,12 @@ hamt_py_set(HamtObject *self, PyObject *args)
         return NULL;
     }
 
+    HamtObject *self = _HamtObject_CAST(op);
     return (PyObject *)_Hamt_Assoc(self, key, val);
 }
 
 static PyObject *
-hamt_py_get(HamtObject *self, PyObject *args)
+hamt_py_get(PyObject *op, PyObject *args)
 {
     PyObject *key;
     PyObject *def = NULL;
@@ -3111,6 +3140,7 @@ hamt_py_get(HamtObject *self, PyObject *args)
     }
 
     PyObject *val = NULL;
+    HamtObject *self = _HamtObject_CAST(op);
     hamt_find_t res = hamt_find(self, key, &val);
     switch (res) {
         case F_ERROR:
@@ -3128,47 +3158,52 @@ hamt_py_get(HamtObject *self, PyObject *args)
 }
 
 static PyObject *
-hamt_py_delete(HamtObject *self, PyObject *key)
+hamt_py_delete(PyObject *op, PyObject *key)
 {
+    HamtObject *self = _HamtObject_CAST(op);
     return (PyObject *)_Hamt_Without(self, key);
 }
 
 static PyObject *
-hamt_py_items(HamtObject *self, PyObject *args)
+hamt_py_items(PyObject *op, PyObject *args)
 {
+    HamtObject *self = _HamtObject_CAST(op);
     return _Hamt_NewIterItems(self);
 }
 
 static PyObject *
-hamt_py_values(HamtObject *self, PyObject *args)
+hamt_py_values(PyObject *op, PyObject *args)
 {
+    HamtObject *self = _HamtObject_CAST(op);
     return _Hamt_NewIterValues(self);
 }
 
 static PyObject *
-hamt_py_keys(HamtObject *self, PyObject *Py_UNUSED(args))
+hamt_py_keys(PyObject *op, PyObject *Py_UNUSED(args))
 {
+    HamtObject *self = _HamtObject_CAST(op);
     return _Hamt_NewIterKeys(self);
 }
 
 #ifdef Py_DEBUG
 static PyObject *
-hamt_py_dump(HamtObject *self, PyObject *Py_UNUSED(args))
+hamt_py_dump(PyObject *op, PyObject *Py_UNUSED(args))
 {
+    HamtObject *self = _HamtObject_CAST(op);
     return hamt_dump(self);
 }
 #endif
 
 
 static PyMethodDef Hamt_methods[] = {
-    {"set", _PyCFunction_CAST(hamt_py_set), METH_VARARGS, NULL},
-    {"get", _PyCFunction_CAST(hamt_py_get), METH_VARARGS, NULL},
-    {"delete", _PyCFunction_CAST(hamt_py_delete), METH_O, NULL},
-    {"items", _PyCFunction_CAST(hamt_py_items), METH_NOARGS, NULL},
-    {"keys", _PyCFunction_CAST(hamt_py_keys), METH_NOARGS, NULL},
-    {"values", _PyCFunction_CAST(hamt_py_values), METH_NOARGS, NULL},
+    {"set", hamt_py_set, METH_VARARGS, NULL},
+    {"get", hamt_py_get, METH_VARARGS, NULL},
+    {"delete", hamt_py_delete, METH_O, NULL},
+    {"items", hamt_py_items, METH_NOARGS, NULL},
+    {"keys", hamt_py_keys, METH_NOARGS, NULL},
+    {"values", hamt_py_values, METH_NOARGS, NULL},
 #ifdef Py_DEBUG
-    {"__dump__", _PyCFunction_CAST(hamt_py_dump), METH_NOARGS, NULL},
+    {"__dump__", hamt_py_dump, METH_NOARGS, NULL},
 #endif
     {NULL, NULL}
 };

{omextra-0.0.0.dev508.dist-info → omextra-0.0.0.dev509.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omextra
-Version: 0.0.0.dev508
+Version: 0.0.0.dev509
 Summary: omextra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev508
+Requires-Dist: omlish==0.0.0.dev509
 Dynamic: license-file
 
 # Overview

{omextra-0.0.0.dev508.dist-info → omextra-0.0.0.dev509.dist-info}/RECORD

@@ -18,7 +18,7 @@ omextra/asyncs/bluelet/sockets.py,sha256=nTVPdLbsmmjI0e6G9Di2DA-JoTTnvu8xc_Yv8N_
 omextra/collections/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omextra/collections/hamt/LICENSE,sha256=82rcXdtBwd6vGLddjx9Jk09kkwPL6yqqv1NzGjPUCoM,2460
 omextra/collections/hamt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omextra/collections/hamt/_hamt.c,sha256=LDYWBuAl4685DbAZICrzO--EfIN8PjHZq0MUJYBAD74,100898
+omextra/collections/hamt/_hamt.c,sha256=yMdFSaIeHhg_8PmAqeKtz3G3UYp4eGyPa_jd2MSsTYA,102227
 omextra/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omextra/formats/goyaml/LICENSE,sha256=qkavv9cjd59BFIFOMVMJMrC3FCEIELrBTA-GPhAFkoY,1071
 omextra/formats/goyaml/__init__.py,sha256=_C1vxy34macvq1DIA2DSpJeO73qTTUrglMozbqRmRpI,1824
@@ -167,9 +167,9 @@ omextra/text/antlr/cli/__main__.py,sha256=ckYkj0drxabBVwWYewH2SS36TTeAxllZtS4xEl
 omextra/text/antlr/cli/cli.py,sha256=LW8pJNmySBOV3g8QxquPjUgxFv7YblzEyi555hHH3_M,1234
 omextra/text/antlr/cli/consts.py,sha256=HUYJP9j4RfeuuQv6HFd2oFMS0piWJ9Sq1tbeAs4OlBc,290
 omextra/text/antlr/cli/gen.py,sha256=HYleVptrpynwcl6GspX6O9_oMRSxwdYAQGuUFfDYse8,5236
-omextra-0.0.0.dev508.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omextra-0.0.0.dev508.dist-info/METADATA,sha256=BLTS3N99hhTA7diAhLLRcm9rh66NRgfGimprLI1y2SA,1409
-omextra-0.0.0.dev508.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omextra-0.0.0.dev508.dist-info/entry_points.txt,sha256=-MFAMks5HgZ60Ore0Wl5lKVKk8z4kf1Ls3WY9E_OlCU,37
-omextra-0.0.0.dev508.dist-info/top_level.txt,sha256=o1nCNRejLMcayDngLuWMWwaeOucz33BXbpuoVvvzjPc,8
-omextra-0.0.0.dev508.dist-info/RECORD,,
+omextra-0.0.0.dev509.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omextra-0.0.0.dev509.dist-info/METADATA,sha256=_BSD2nfUS339TTrOs7m03-RWhBS70awB_0KdLB_SCQY,1409
+omextra-0.0.0.dev509.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omextra-0.0.0.dev509.dist-info/entry_points.txt,sha256=-MFAMks5HgZ60Ore0Wl5lKVKk8z4kf1Ls3WY9E_OlCU,37
+omextra-0.0.0.dev509.dist-info/top_level.txt,sha256=o1nCNRejLMcayDngLuWMWwaeOucz33BXbpuoVvvzjPc,8
+omextra-0.0.0.dev509.dist-info/RECORD,,