X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/ff1993c7f2a6f9bee63e6ebc83eed5668304a1b5..e8cd4ca5039114e52f7b659a2d5fec1f72541a87:/mp.c

diff --git a/mp.c b/mp.c
index b646846..e14b720 100644
--- a/mp.c
+++ b/mp.c
@@ -33,7 +33,15 @@
 PyTypeObject *mp_pytype = 0;
 PyTypeObject *gf_pytype = 0;
 
-STATIC_ASSERT(MPW_BITS >= SHIFT,
+#ifndef PyLong_SHIFT
+#  define PyLong_SHIFT SHIFT
+#endif
+
+#ifndef PyLong_MASK
+#  define PyLong_MASK MASK
+#endif
+
+STATIC_ASSERT(MPW_BITS >= PyLong_SHIFT,
 	      "Catacomb's limbs are now narrower than than Python's!");
 
 mp *mp_frompylong(PyObject *obj)
@@ -50,13 +58,13 @@ mp *mp_frompylong(PyObject *obj)
 
   sz = Py_SIZE(l);
   if (sz < 0) sz = -sz;
-  bits = (unsigned long)sz * SHIFT;
+  bits = (unsigned long)sz * PyLong_SHIFT;
   w = (bits + MPW_BITS - 1)/MPW_BITS;
   x = mp_new(w, Py_SIZE(l) < 0 ? MP_NEG : 0);
   p = x->v;
   for (i = 0; i < sz; i++) {
     r |= (mpd)l->ob_digit[i] << b;
-    b += SHIFT;
+    b += PyLong_SHIFT;
     while (b >= MPW_BITS) {
       *p++ = MPW(r);
       r >>= MPW_BITS;
@@ -75,7 +83,7 @@ mp *mp_frompylong(PyObject *obj)
 PyObject *mp_topylong(mp *x)
 {
   unsigned long bits = mp_bits(x);
-  int sz = (bits + SHIFT - 1)/SHIFT;
+  int sz = (bits + PyLong_SHIFT - 1)/PyLong_SHIFT;
   PyLongObject *l = _PyLong_New(sz);
   mpd r = 0;
   int b = 0;
@@ -85,15 +93,15 @@ PyObject *mp_topylong(mp *x)
   while (i < sz && p < x->vl) {
     r |= (mpd)*p++ << b;
     b += MPW_BITS;
-    while (i < sz && b >= SHIFT) {
-      l->ob_digit[i++] = r & MASK;
-      r >>= SHIFT;
-      b -= SHIFT;
+    while (i < sz && b >= PyLong_SHIFT) {
+      l->ob_digit[i++] = r & PyLong_MASK;
+      r >>= PyLong_SHIFT;
+      b -= PyLong_SHIFT;
     }
   }
   while (i < sz && r) {
-    l->ob_digit[i++] = r & MASK;
-    r >>= SHIFT;
+    l->ob_digit[i++] = r & PyLong_MASK;
+    r >>= PyLong_SHIFT;
   }
   Py_SIZE(l) = (x->f & MP_NEG) ? -sz : sz;
   return ((PyObject *)l);
@@ -191,7 +199,7 @@ static void mp_pydealloc(PyObject *o)
 }
 
 static PyObject *mp_pyrepr(PyObject *o)
-  { return mp_topystring(MP_X(o), 10, "MP(", 0, "L)"); }
+  { return mp_topystring(MP_X(o), 10, "MP(", 0, ")"); }
 
 static PyObject *mp_pystr(PyObject *o)
   { return mp_topystring(MP_X(o), 10, 0, 0, 0); }
@@ -201,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)));
@@ -314,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
@@ -325,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)
@@ -519,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)); }
 
@@ -698,7 +737,7 @@ end:
 				 PyObject *arg, PyObject *kw)		\
   {									\
     long len = -1;							\
-    static const char *const kwlist[] = { "len", 0 };					\
+    static const char *const kwlist[] = { "len", 0 };			\
     PyObject *rc = 0;							\
 									\
     if (!PyArg_ParseTupleAndKeywords(arg, kw, "|l:" #name,		\
@@ -972,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@ */
@@ -1863,7 +1902,7 @@ static const PyTypeObject mpcrt_pytype_skel = {
 /*----- Binary polynomials ------------------------------------------------*/
 
 static PyObject *gf_pyrepr(PyObject *o)
-  { return mp_topystring(MP_X(o), 16, "GF(", "0x", "L)"); }
+  { return mp_topystring(MP_X(o), 16, "GF(", "0x", ")"); }
 
 static PyObject *gf_pyrichcompare(PyObject *x, PyObject *y, int op)
 {