mp.c, catacomb/__init__.py, pyke/: Fix mixed-mode arithmetic involving `float'.

[catacomb-python] / mp.c

diff --git a/mp.c b/mp.c
index fe5e7dc..8f66d17 100644 (file)
--- a/mp.c
+++ b/mp.c
@@ -209,7 +209,7 @@ mp *tomp(PyObject *o)
   PyObject *l;
   mp *x;
 
-  if (!o)
+  if (!o || PyFloat_Check(o))
     return (0);
   else if (MP_PYCHECK(o) || GF_PYCHECK(o))
     return (MP_COPY(MP_X(o)));
@@ -322,6 +322,26 @@ static int gfbinop(PyObject *x, PyObject *y, mp **xx, mp **yy)
   return (0);
 }
 
+#define FPBINOP(name, pyop)                                            \
+  static PyObject *mp_py##name(PyObject *x, PyObject *y) {             \
+    mp *xx, *yy, *zz;                                                  \
+    PyObject *l, *rc;                                                  \
+    if (PyFloat_Check(x)) {                                            \
+      l = mp_topylong(MP_X(y)); rc = PyNumber_##pyop(x, l);            \
+      Py_DECREF(l); return (rc);                                       \
+    } else if (PyFloat_Check(y)) {                                     \
+      l = mp_topylong(MP_X(x)); rc = PyNumber_##pyop(l, y);            \
+      Py_DECREF(l); return (rc);                                       \
+    }                                                                  \
+    if (mpbinop(x, y, &xx, &yy)) RETURN_NOTIMPL;                       \
+    zz = mp_##name(MP_NEW, xx, yy);                                    \
+    MP_DROP(xx); MP_DROP(yy);                                          \
+    return (mp_pywrap(zz));                                            \
+  }
+FPBINOP(add, Add)
+FPBINOP(sub, Subtract)
+FPBINOP(mul, Multiply)
+
 #define gf_and mp_and
 #define gf_or mp_or
 #define gf_xor mp_xor
@@ -333,9 +353,6 @@ static int gfbinop(PyObject *x, PyObject *y, mp **xx, mp **yy)
     MP_DROP(xx); MP_DROP(yy);                                          \
     return (pre##_pywrap(zz));                                         \
   }
-BINOP(mp, add)
-BINOP(mp, sub)
-BINOP(mp, mul)
 BINOP(mp, and2c)
 BINOP(mp, or2c)
 BINOP(mp, xor2c)
@@ -527,6 +544,20 @@ COERCE(mp, MP)
 COERCE(gf, GF)
 #undef COERCE
 
+static PyObject *mp_pyrichcompare(PyObject *x, PyObject *y, int op)
+{
+  mp *xx, *yy;
+  PyObject *l, *rc;
+  if (PyFloat_Check(y)) {
+    l = mp_topylong(MP_X(x)); rc = PyObject_RichCompare(l, y, op);
+    Py_DECREF(l); return (rc);
+  }
+  if (mpbinop(x, y, &xx, &yy)) RETURN_NOTIMPL;
+  rc = enrich_compare(op, mp_cmp(xx, yy));
+  MP_DROP(xx); MP_DROP(yy);
+  return (rc);
+}
+
 static int mp_pycompare(PyObject *x, PyObject *y)
   { return mp_cmp(MP_X(x), MP_X(y)); }
 
@@ -980,7 +1011,7 @@ static const PyTypeObject mp_pytype_skel = {
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
-  0,                                   /* @tp_richcompare@ */
+  mp_pyrichcompare,                    /* @tp_richcompare@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */