Merge pull request #258 from skirpichev/misc

Misc fixes

Author: skirpichev

gmp.c

@@ -783,45 +783,6 @@ to_bool(PyObject *self)
     return !zz_iszero(&((MPZ_Object *)self)->z);
 }
 
-#define BINOP_INT(suff)                                         \
-    static PyObject *                                           \
-    nb_##suff(PyObject *self, PyObject *other)                  \
-    {                                                           \
-        MPZ_Object *u = NULL, *v = NULL, *res = NULL;           \
-                                                                \
-        CHECK_OP(u, self);                                      \
-        CHECK_OP(v, other);                                     \
-                                                                \
-        res = MPZ_new(0);                                       \
-        zz_err ret = ZZ_OK;                                     \
-                                                                \
-        if (!res || (ret = zz_##suff(&u->z, &v->z, &res->z))) { \
-            /* LCOV_EXCL_START */                               \
-            Py_CLEAR(res);                                      \
-            if (ret == ZZ_VAL) {                                \
-                PyErr_SetString(PyExc_ValueError,               \
-                                "negative shift count");        \
-            }                                                   \
-            else if (ret == ZZ_BUF) {                           \
-                PyErr_SetString(PyExc_OverflowError,            \
-                                "too many digits in integer");  \
-            }                                                   \
-            else {                                              \
-                PyErr_NoMemory();                               \
-            }                                                   \
-            /* LCOV_EXCL_STOP */                                \
-        }                                                       \
-    end:                                                        \
-        Py_XDECREF(u);                                          \
-        Py_XDECREF(v);                                          \
-        return (PyObject *)res;                                 \
-    fallback:                                                   \
-    numbers:                                                    \
-        Py_XDECREF(u);                                          \
-        Py_XDECREF(v);                                          \
-        Py_RETURN_NOTIMPLEMENTED;                               \
-    }
-
 #define BINOP(suff, slot)                                \
     static PyObject *                                    \
     nb_##suff(PyObject *self, PyObject *other)           \
@@ -1038,6 +999,56 @@ nb_truediv(PyObject *self, PyObject *other)
     return res;
 }
 
+#define CHECK_OP_INT(u, a)      \
+    if (MPZ_Check(a)) {         \
+        u = (MPZ_Object *)a;    \
+        Py_INCREF(u);           \
+    }                           \
+    else {                      \
+        u = MPZ_from_int(a);    \
+        if (!u) {               \
+            goto end;           \
+        }                       \
+    }                           \
+
+#define BINOP_INT(suff)                                         \
+    static PyObject *                                           \
+    nb_##suff(PyObject *self, PyObject *other)                  \
+    {                                                           \
+        MPZ_Object *u = NULL, *v = NULL, *res = NULL;           \
+                                                                \
+        CHECK_OP_INT(u, self);                                  \
+        CHECK_OP_INT(v, other);                                 \
+                                                                \
+        res = MPZ_new(0);                                       \
+        zz_err ret = ZZ_OK;                                     \
+                                                                \
+        if (!res || (ret = zz_##suff(&u->z, &v->z, &res->z))) { \
+            /* LCOV_EXCL_START */                               \
+            Py_CLEAR(res);                                      \
+            if (ret == ZZ_VAL) {                                \
+                PyErr_SetString(PyExc_ValueError,               \
+                                "negative shift count");        \
+            }                                                   \
+            else if (ret == ZZ_BUF) {                           \
+                PyErr_SetString(PyExc_OverflowError,            \
+                                "too many digits in integer");  \
+            }                                                   \
+            else {                                              \
+                PyErr_NoMemory();                               \
+            }                                                   \
+            /* LCOV_EXCL_STOP */                                \
+        }                                                       \
+    end:                                                        \
+        Py_XDECREF(u);                                          \
+        Py_XDECREF(v);                                          \
+        return (PyObject *)res;                                 \
+    }
+
+BINOP_INT(and)
+BINOP_INT(or)
+BINOP_INT(xor)
+
 static zz_err
 zz_lshift(const zz_t *u, const zz_t *v, zz_t *w)
 {
@@ -1064,21 +1075,6 @@ zz_rshift(const zz_t *u, const zz_t *v, zz_t *w)
 
 BINOP_INT(lshift)
 BINOP_INT(rshift)
-BINOP_INT(and)
-BINOP_INT(or)
-BINOP_INT(xor)
-
-#define CHECK_OP_INT(u, a)      \
-    if (MPZ_Check(a)) {         \
-        u = (MPZ_Object *)a;    \
-        Py_INCREF(u);           \
-    }                           \
-    else {                      \
-        u = MPZ_from_int(a);    \
-        if (!u) {               \
-            goto end;           \
-        }                       \
-    }                           \
 
 static PyObject *
 power(PyObject *self, PyObject *other, PyObject *module)

scripts/dll-importexport.diff

@@ -1,3 +1,5 @@
+# https://gmplib.org/list-archives/gmp-devel/2025-August/006311.html
+#
 --- gmp-h.in.orig	2025-08-15 13:37:06.328877394 +0300
 +++ gmp-h.in	2025-08-15 13:40:01.036262673 +0300
 @@ -101,8 +101,13 @@