X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/ef6b951620d6e2f581bbe8d7eff42e3d8d6cf508..9a3b63399d3c983685b6d8a201691b36393dae19:/mp.c?ds=sidebyside

diff --git a/mp.c b/mp.c
index f45268b..6ce2792 100644
--- a/mp.c
+++ b/mp.c
@@ -122,6 +122,12 @@ mp *mp_frompyobject(PyObject *o, int radix)
     mp *x;
     size_t sz;
     TEXT_PTRLEN(o, sc.buf, sz); sc.lim = sc.buf + sz;
+    if (sc.buf + 2 < sc.lim && sc.buf[0] == '0' &&
+	(radix == 16 ? (sc.buf[1] == 'x' || sc.buf[1] == 'X') :
+	 radix ==  8 ? (sc.buf[1] == 'o' || sc.buf[1] == 'O') :
+	 radix ==  2 ? (sc.buf[1] == 'b' || sc.buf[1] == 'B') :
+	 0))
+      sc.buf += 2;
     x = mp_read(MP_NEW, radix, &mptext_stringops, &sc);
     if (!x) return (0);
     if (sc.buf < sc.lim) { MP_DROP(x); return (0); }
@@ -196,7 +202,7 @@ end:
   return (rc);
 }
 
-/*----- Python interface --------------------------------------------------*/
+/*----- Arbitrary-precision integers --------------------------------------*/
 
 static void mp_pydealloc(PyObject *o)
 {
@@ -289,24 +295,27 @@ int convgf(PyObject *o, void *p)
 
 mp *implicitmp(PyObject *o)
 {
-  if (!o ||
-      GF_PYCHECK(o) ||
-      ECPT_PYCHECK(o) ||
-      FE_PYCHECK(o) ||
-      GE_PYCHECK(o))
-    return (0);
-  return (tomp(o));
+  PyObject *l;
+
+  if (!o || GF_PYCHECK(o) || FE_PYCHECK(o)) return (0);
+  else if (MP_PYCHECK(o)) return (MP_COPY(MP_X(o)));
+  else if (PFILT_PYCHECK(o)) return (MP_COPY(PFILT_F(o)->m));
+#ifdef PY2
+  else if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o)));
+#endif
+  else if ((l = PyNumber_Index(o)) != 0) {
+#ifdef PY2
+    if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o)));
+#endif
+    if (PyLong_Check(o)) return (mp_frompylong(o));
+  }
+  PyErr_Clear(); return (0);
 }
 
 mp *implicitgf(PyObject *o)
 {
-  if (!o ||
-      MP_PYCHECK(o) ||
-      ECPT_PYCHECK(o) ||
-      FE_PYCHECK(o) ||
-      GE_PYCHECK(o))
-    return (0);
-  return (tomp(o));
+  if (GF_PYCHECK(o)) return (MP_COPY(MP_X(o)));
+  return (0);
 }
 
 static int mpbinop(PyObject *x, PyObject *y, mp **xx, mp **yy)
@@ -393,25 +402,24 @@ UNOP(mp, not2c)
 static PyObject *mp_pyid(PyObject *x) { RETURN_OBJ(x); }
 
 #define gf_lsr mp_lsr
-#define SHIFTOP(pre, name, rname)					\
+#define SHIFTOP(pre, PRE, name, rname)					\
   static PyObject *pre##_py##name(PyObject *x, PyObject *y) {		\
-    mp *xx, *yy;							\
+    PyObject *yix = 0;							\
     PyObject *z = 0;							\
     long n;								\
-    if (pre##binop(x, y, &xx, &yy)) RETURN_NOTIMPL;			\
-    if (mp_tolong_checked(yy, &n, 1)) goto end;				\
-    if (n < 0)								\
-      z = pre##_pywrap(mp_##rname(MP_NEW, xx, -n));			\
-    else								\
-      z = pre##_pywrap(mp_##name(MP_NEW, xx, n));			\
-  end:									\
-    MP_DROP(xx); MP_DROP(yy);						\
+    if (!PRE##_PYCHECK(x)) RETURN_NOTIMPL;				\
+    if (GF_PYCHECK(y) || FE_PYCHECK(y)) RETURN_NOTIMPL;			\
+    yix = PyNumber_Index(y); if (!yix) { PyErr_Clear(); RETURN_NOTIMPL; } \
+    n = PyInt_AsLong(yix); Py_DECREF(yix);				\
+    if (n == -1 && PyErr_Occurred())  { PyErr_Clear(); RETURN_NOTIMPL; } \
+    if (n < 0) z = pre##_pywrap(mp_##rname(MP_NEW, MP_X(x), -n));	\
+    else z = pre##_pywrap(mp_##name(MP_NEW, MP_X(x), n));		\
     return (z);								\
   }
-SHIFTOP(mp, lsl2c, lsr2c)
-SHIFTOP(mp, lsr2c, lsl2c)
-SHIFTOP(gf, lsl, lsr)
-SHIFTOP(gf, lsr, lsl)
+SHIFTOP(mp, MP, lsl2c, lsr2c)
+SHIFTOP(mp, MP, lsr2c, lsl2c)
+SHIFTOP(gf, GF, lsl, lsr)
+SHIFTOP(gf, GF, lsr, lsl)
 #undef SHIFTOP
 
 #define DIVOP(pre, name, qq, rr, gather)				\
@@ -465,7 +473,7 @@ static PyObject *mp_pyexp(PyObject *x, PyObject *y, PyObject *z)
   PyObject *rc = 0;
 
   if ((xx = implicitmp(x)) == 0 || (yy = implicitmp(y)) == 0 ||
-      (z && z != Py_None && (zz = tomp(z)) == 0)) {
+      (z && z != Py_None && (zz = implicitmp(z)) == 0)) {
     mp_drop(xx); mp_drop(yy); mp_drop(zz);
     RETURN_NOTIMPL;
   }
@@ -547,7 +555,7 @@ static PyObject *mp_pyfloat(PyObject *x)
       Py_INCREF(*x); Py_INCREF(*y);					\
       return (0);							\
     }									\
-    if ((z = tomp(*y)) != 0) {						\
+    if ((z = implicit##pre(*y)) != 0) {					\
       Py_INCREF(*x);							\
       *y = pre##_pywrap(z);						\
       return (0);							\
@@ -601,6 +609,22 @@ end:
   return ((PyObject *)zz);
 }
 
+#define IMPLICIT(pre)							\
+  static PyObject *pre##meth__implicit(PyObject *me, PyObject *arg)	\
+  {									\
+    PyObject *x, *rc = 0;						\
+    mp *y = MP_NEW;							\
+    if (!PyArg_ParseTuple(arg, "O:_implicit", &x)) goto end;		\
+    y = implicit##pre(x);						\
+    if (!y) TYERR("can't convert implicitly to " #pre);			\
+    rc = pre##_pywrap(y);						\
+  end:									\
+    return (rc);							\
+  }
+IMPLICIT(mp)
+IMPLICIT(gf)
+#undef IMPLICIT
+
 Py_hash_t mphash(mp *x)
 {
   PyObject *l = mp_topylong(x);
@@ -929,6 +953,7 @@ static const PyMethodDef mp_pymethods[] = {
     "  Parse STR as a large integer, according to RADIX.  If RADIX is\n"
     "  zero, read a prefix from STR to decide radix: allow `0b' for binary,\n"
     "  `0' or `0o' for octal, `0x' for hex, or `R_' for other radix R.")
+  SMTH	(_implicit,	0)
   SMTH	(factorial,	"factorial(I) -> I!: compute factorial")
   SMTH	(fibonacci,	"fibonacci(I) -> F(I): compute Fibonacci number")
   SMTH	(loadl,		"loadl(STR) -> X: read little-endian bytes")
@@ -1764,12 +1789,10 @@ static PyObject *mcmeth_solve(PyObject *me, PyObject *arg)
   mp **v = 0;
   Py_ssize_t i = 0, n = c->k;
 
-  Py_INCREF(me);
   if (PyTuple_GET_SIZE(arg) == n)
     q = arg;
   else if (!PyArg_ParseTuple(arg, "O:solve", &q))
     goto end;
-  Py_INCREF(q);
   if (!PySequence_Check(q)) TYERR("want a sequence of residues");
   i = PySequence_Size(q); if (i < 0) goto end;
   if (i != n) VALERR("residue count mismatch");
@@ -1787,8 +1810,6 @@ end:
       MP_DROP(v[i]);
     xfree(v);
   }
-  Py_DECREF(me);
-  Py_XDECREF(q);
   return (z);
 }
 
@@ -1813,7 +1834,6 @@ static PyObject *mpcrt_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
     q = arg;
   else if (!PyArg_ParseTupleAndKeywords(arg, kw, "O:new", KWLIST, &q))
     goto end;
-  Py_INCREF(q);
   if (!PySequence_Check(q)) TYERR("want a sequence of moduli");
   n = PySequence_Size(q); if (n < 0) goto end;
   if (!n) VALERR("want at least one modulus");
@@ -1835,7 +1855,6 @@ static PyObject *mpcrt_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 
   c = (mpcrt_pyobj *)ty->tp_alloc(ty, 0);
   mpcrt_create(&c->c, v, n, 0);
-  Py_DECREF(q);
   mp_drop(xx); mp_drop(y); mp_drop(g);
   return ((PyObject *)c);
 
@@ -1846,7 +1865,6 @@ end:
       MP_DROP(v[i].m);
     xfree(v);
   }
-  Py_XDECREF(q);
   mp_drop(xx); mp_drop(y); mp_drop(g);
   return (0);
 }
@@ -1993,8 +2011,8 @@ static PyObject *gf_pyexp(PyObject *x, PyObject *y, PyObject *z)
   mp *r = 0;
   PyObject *rc = 0;
 
-  if ((xx = tomp(x)) == 0 || (yy = tomp(y)) == 0 ||
-      (z && z != Py_None && (zz = tomp(z)) == 0)) {
+  if ((xx = implicitgf(x)) == 0 || (yy = implicitmp(y)) == 0 ||
+      (z && z != Py_None && (zz = implicitgf(z)) == 0)) {
     mp_drop(xx); mp_drop(yy); mp_drop(zz);
     RETURN_NOTIMPL;
   }
@@ -2121,6 +2139,7 @@ static const PyMethodDef gf_pymethods[] = {
     "  Parse STR as a binary polynomial, according to RADIX.  If RADIX is\n"
     "  zero, read a prefix from STR to decide radix: allow `0b' for binary,\n"
     "  `0' or `0o' for octal, `0x' for hex, or `R_' for other radix R.")
+  SMTH	(_implicit,	0)
   SMTH	(loadl,		"loadl(STR) -> X: read little-endian bytes")
   SMTH	(loadb,		"loadb(STR) -> X: read big-endian bytes")
   SMTH	(frombuf,	"frombuf(STR) -> (X, REST): read buffer format")