X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/27cbcf9d360a7b25e54c4e268db5889246015440..9a3b63399d3c983685b6d8a201691b36393dae19:/mp.c diff --git a/mp.c b/mp.c index b4e65cb..6ce2792 100644 --- a/mp.c +++ b/mp.c @@ -33,6 +33,17 @@ PyTypeObject *mp_pytype = 0; PyTypeObject *gf_pytype = 0; +#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) { unsigned long bits; @@ -45,16 +56,21 @@ mp *mp_frompylong(PyObject *obj) mp *x; mpw *p; - sz = l->ob_size; +#ifdef PY3 + int ov; + long j = PyLong_AsLongAndOverflow(obj, &ov); + if (!ov) return mp_fromlong(MP_NEW, j); +#endif + + sz = Py_SIZE(l); if (sz < 0) sz = -sz; - assert(MPW_BITS >= SHIFT); - bits = (unsigned long)sz * SHIFT; + bits = (unsigned long)sz * PyLong_SHIFT; w = (bits + MPW_BITS - 1)/MPW_BITS; - x = mp_new(w, l->ob_size < 0 ? MP_NEG : 0); + 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; @@ -73,28 +89,27 @@ 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; mpw *p = x->v; int i = 0; - assert(MPW_BITS >= SHIFT); 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; } - l->ob_size = (x->f & MP_NEG) ? -sz : sz; + Py_SIZE(l) = (x->f & MP_NEG) ? -sz : sz; return ((PyObject *)l); } @@ -102,11 +117,17 @@ mp *mp_frompyobject(PyObject *o, int radix) { mp *x; - if (PyString_Check(o)) { + if (TEXT_CHECK(o)) { mptext_stringctx sc; mp *x; - sc.buf = PyString_AS_STRING(o); - sc.lim = sc.buf + PyString_GET_SIZE(o); + 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); } @@ -128,8 +149,7 @@ PyObject *mp_topystring(mp *x, int radix, const char *xpre, size_t postlen = post ? strlen(post) : 0; char *p; MP_COPY(x); - o = PyString_FromStringAndSize(0, len + 1 + xprelen + prelen + postlen); - p = PyString_AS_STRING(o); + TEXT_PREPAREWRITE(o, p, len + 1 + xprelen + prelen + postlen); sc.buf = p; if (xpre) { memcpy(sc.buf, xpre, xprelen); sc.buf += xprelen; } if (MP_NEGP(x)) { *sc.buf++ = '-'; x = mp_neg(x, x); } @@ -138,7 +158,7 @@ PyObject *mp_topystring(mp *x, int radix, const char *xpre, mp_write(x, radix, &mptext_stringops, &sc); if (post) { memcpy(sc.buf, post, postlen); sc.buf += postlen; } MP_DROP(x); - _PyString_Resize(&o, sc.buf - p); + TEXT_DONEWRITE(o, sc.buf - p); return (o); } @@ -182,7 +202,7 @@ end: return (rc); } -/*----- Python interface --------------------------------------------------*/ +/*----- Arbitrary-precision integers --------------------------------------*/ static void mp_pydealloc(PyObject *o) { @@ -191,7 +211,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 +221,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))); @@ -220,8 +240,11 @@ mp *tomp(PyObject *o) if ((x = G_TOINT(GE_G(o), MP_NEW, GE_X(o))) == 0) return (0); return (x); - } else if (PyInt_Check(o)) + } +#ifdef PY2 + else if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o))); +#endif else if ((l = PyNumber_Long(o)) != 0) { x = mp_frompylong(l); Py_DECREF(l); @@ -238,7 +261,7 @@ mp *getmp(PyObject *o) if (!o) return (0); if ((x = tomp(o)) == 0) { PyErr_Format(PyExc_TypeError, "can't convert %.100s to mp", - o->ob_type->tp_name); + Py_TYPE(o)->tp_name); } return (x); } @@ -257,7 +280,7 @@ mp *getgf(PyObject *o) if (!o) return (0); if ((x = tomp(o)) == 0) { PyErr_Format(PyExc_TypeError, "can't convert %.100s to gf", - o->ob_type->tp_name); + Py_TYPE(o)->tp_name); } return (x); } @@ -270,26 +293,29 @@ int convgf(PyObject *o, void *p) return (1); } -static mp *implicitmp(PyObject *o) +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); } -static mp *implicitgf(PyObject *o) +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) @@ -314,6 +340,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 +371,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) @@ -359,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) \ @@ -431,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; } @@ -477,7 +519,9 @@ static mp *gf_modinv_checked(mp *d, mp *x, mp *p) #define BASEOP(name, radix, pre) \ static PyObject *mp_py##name(PyObject *x) \ { return mp_topystring(MP_X(x), radix, 0, pre, 0); } +#ifdef PY2 BASEOP(oct, 8, "0"); +#endif BASEOP(hex, 16, "0x"); #undef BASEOP @@ -489,8 +533,10 @@ static PyObject *mp_pyint(PyObject *x) if (!mp_tolong_checked(MP_X(x), &l, 0)) return (PyInt_FromLong(l)); else return mp_topylong(MP_X(x)); } +#ifdef PY2 static PyObject *mp_pylong(PyObject *x) { return (mp_topylong(MP_X(x))); } +#endif static PyObject *mp_pyfloat(PyObject *x) { PyObject *l = mp_topylong(MP_X(x)); @@ -499,6 +545,7 @@ static PyObject *mp_pyfloat(PyObject *x) return (PyFloat_FromDouble(f)); } +#ifdef PY2 #define COERCE(pre, PRE) \ static int pre##_pycoerce(PyObject **x, PyObject **y) \ { \ @@ -508,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); \ @@ -518,9 +565,26 @@ static PyObject *mp_pyfloat(PyObject *x) COERCE(mp, MP) COERCE(gf, GF) #undef COERCE +#endif + +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); +} +#ifdef PY2 static int mp_pycompare(PyObject *x, PyObject *y) { return mp_cmp(MP_X(x), MP_X(y)); } +#endif static PyObject *mp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { @@ -536,7 +600,7 @@ static PyObject *mp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) if (!good_radix_p(radix, 1)) VALERR("bad radix"); if ((z = mp_frompyobject(x, radix)) == 0) { PyErr_Format(PyExc_TypeError, "can't convert %.100s to mp", - x->ob_type->tp_name); + Py_TYPE(x)->tp_name); goto end; } zz = (mp_pyobj *)ty->tp_alloc(ty, 0); @@ -545,14 +609,30 @@ end: return ((PyObject *)zz); } -long mphash(mp *x) +#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); - long h = PyObject_Hash(l); + Py_hash_t h = PyObject_Hash(l); Py_DECREF(l); return (h); } -static long mp_pyhash(PyObject *me) { return (mphash(MP_X(me))); } +static Py_hash_t mp_pyhash(PyObject *me) { return (mphash(MP_X(me))); } static PyObject *mpmeth_jacobi(PyObject *me, PyObject *arg) { @@ -593,25 +673,20 @@ static PyObject *gfmeth_testbit(PyObject *me, PyObject *arg) return (getbool(mp_testbit(MP_X(me), i))); } -static PyObject *mpmeth_odd(PyObject *me, PyObject *arg) +static PyObject *mpmeth_odd(PyObject *me) { mp *t; size_t s; - if (!PyArg_ParseTuple(arg, ":odd")) return (0); t = mp_odd(MP_NEW, MP_X(me), &s); return (Py_BuildValue("(lN)", (long)s, mp_pywrap(t))); } -static PyObject *mpmeth_sqr(PyObject *me, PyObject *arg) -{ - if (!PyArg_ParseTuple(arg, ":sqr")) return (0); - return (mp_pywrap(mp_sqr(MP_NEW, MP_X(me)))); -} +static PyObject *mpmeth_sqr(PyObject *me) + { return (mp_pywrap(mp_sqr(MP_NEW, MP_X(me)))); } -static PyObject *mpmeth_sqrt(PyObject *me, PyObject *arg) +static PyObject *mpmeth_sqrt(PyObject *me) { - if (!PyArg_ParseTuple(arg, ":sqrt")) return (0); if (MP_NEGP(MP_X(me))) VALERR("negative root"); return (mp_pywrap(mp_sqrt(MP_NEW, MP_X(me)))); end: @@ -703,7 +778,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, \ @@ -714,7 +789,7 @@ end: if (!len) len = 1; \ } \ rc = bytestring_pywrap(0, len); \ - mp_##name(MP_X(me), PyString_AS_STRING(rc), len); \ + mp_##name(MP_X(me), BIN_PTR(rc), len); \ end: \ return (rc); \ } @@ -724,42 +799,40 @@ STOREOP(storel2c, 2c) STOREOP(storeb2c, 2c) #undef STOREOP -#define BUFOP(ty, pyty) \ - static PyObject *meth__##pyty##_frombuf(PyObject *me, PyObject *arg) \ +#define BUFOP(ty) \ + static PyObject *ty##meth_frombuf(PyObject *me, PyObject *arg) \ { \ buf b; \ - char *p; \ - Py_ssize_t sz; \ + struct bin in; \ PyObject *rc = 0; \ mp *x; \ \ - if (!PyArg_ParseTuple(arg, "Os#:frombuf", &me, &p, &sz)) goto end; \ - buf_init(&b, p, sz); \ + if (!PyArg_ParseTuple(arg, "O&:frombuf", convbin, &in)) goto end; \ + buf_init(&b, (/*unconst*/ void *)in.p, in.sz); \ if ((x = buf_getmp(&b)) == 0) VALERR("malformed data"); \ rc = Py_BuildValue("(NN)", ty##_pywrap(x), \ bytestring_pywrapbuf(&b)); \ end: \ return (rc); \ } -BUFOP(mp, MP) -BUFOP(gf, GF) +BUFOP(mp) +BUFOP(gf) #undef BUFOP -static PyObject *mpmeth_tobuf(PyObject *me, PyObject *arg) +static PyObject *mpmeth_tobuf(PyObject *me) { buf b; PyObject *rc; mp *x; size_t n; - if (!PyArg_ParseTuple(arg, ":tobuf")) return (0); x = MP_X(me); n = mp_octets(x) + 3; rc = bytestring_pywrap(0, n); - buf_init(&b, PyString_AS_STRING(rc), n); + buf_init(&b, BIN_PTR(rc), n); buf_putmp(&b, x); assert(BOK(&b)); - _PyString_Resize(&rc, BLEN(&b)); + BIN_SETLEN(rc, BLEN(&b)); return (rc); } @@ -776,8 +849,8 @@ end: return (rc); } -static PyObject *meth__MP_fromstring(PyObject *me, - PyObject *arg, PyObject *kw) +static PyObject *mpmeth_fromstring(PyObject *me, + PyObject *arg, PyObject *kw) { int r = 0; char *p; @@ -785,10 +858,10 @@ static PyObject *meth__MP_fromstring(PyObject *me, PyObject *z = 0; mp *zz; mptext_stringctx sc; - static const char *const kwlist[] = { "class", "x", "radix", 0 }; + static const char *const kwlist[] = { "x", "radix", 0 }; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|i:fromstring", - KWLIST, &me, &p, &len, &r)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|i:fromstring", KWLIST, + &p, &len, &r)) goto end; if (!good_radix_p(r, 1)) VALERR("bad radix"); sc.buf = p; sc.lim = p + len; @@ -800,38 +873,37 @@ end: return (z); } -static PyObject *meth__MP_factorial(PyObject *me, PyObject *arg) +static PyObject *mpmeth_factorial(PyObject *me, PyObject *arg) { unsigned long i; mp *x; - if (!PyArg_ParseTuple(arg, "OO&:factorial", &me, convulong, &i)) return (0); + if (!PyArg_ParseTuple(arg, "O&:factorial", convulong, &i)) return (0); x = mp_factorial(i); return mp_pywrap(x); } -static PyObject *meth__MP_fibonacci(PyObject *me, PyObject *arg) +static PyObject *mpmeth_fibonacci(PyObject *me, PyObject *arg) { long i; mp *x; - if (!PyArg_ParseTuple(arg, "Ol:fibonacci", &me, &i)) return (0); + if (!PyArg_ParseTuple(arg, "l:fibonacci", &i)) return (0); x = mp_fibonacci(i); return mp_pywrap(x); } -#define LOADOP(pre, py, name) \ - static PyObject *meth__##py##_##name(PyObject *me, PyObject *arg) \ +#define LOADOP(pre, name) \ + static PyObject *pre##meth_##name(PyObject *me, PyObject *arg) \ { \ - char *p; \ - Py_ssize_t len; \ - if (!PyArg_ParseTuple(arg, "Os#:" #name, &me, &p, &len)) return (0); \ - return (pre##_pywrap(mp_##name(MP_NEW, p, len))); \ + struct bin in; \ + if (!PyArg_ParseTuple(arg, "O&:" #name, convbin, &in)) return (0); \ + return (pre##_pywrap(mp_##name(MP_NEW, in.p, in.sz))); \ } -LOADOP(mp, MP, loadl) -LOADOP(mp, MP, loadb) -LOADOP(mp, MP, loadl2c) -LOADOP(mp, MP, loadb2c) -LOADOP(gf, GF, loadl) -LOADOP(gf, GF, loadb) +LOADOP(mp, loadl) +LOADOP(mp, loadb) +LOADOP(mp, loadl2c) +LOADOP(mp, loadb2c) +LOADOP(gf, loadl) +LOADOP(gf, loadb) #undef LOADOP static PyObject *mpget_nbits(PyObject *me, void *hunoz) @@ -858,9 +930,9 @@ static const PyMethodDef mp_pymethods[] = { METH (setbit, "X.setbit(N) -> X with bit N set") METH (clearbit, "X.clearbit(N) -> X with bit N clear") METH (testbit, "X.testbit(N) -> true/false if bit N set/clear in X") - METH (odd, "X.odd() -> S, T where X = 2^S T with T odd") - METH (sqr, "X.sqr() -> X^2") - METH (sqrt, "X.sqrt() -> largest integer <= sqrt(X)") + NAMETH(odd, "X.odd() -> S, T where X = 2^S T with T odd") + NAMETH(sqr, "X.sqr() -> X^2") + NAMETH(sqrt, "X.sqrt() -> largest integer <= sqrt(X)") METH (gcd, "X.gcd(Y) -> gcd(X, Y)") METH (gcdx, "X.gcdx(Y) -> (gcd(X, Y), U, V) " "with X U + Y V = gcd(X, Y)") @@ -876,7 +948,21 @@ static const PyMethodDef mp_pymethods[] = { "little-endian bytes, two's complement") KWMETH(storeb2c, "X.storeb2c([len = -1]) -> " "big-endian bytes, two's complement") - METH (tobuf, "X.tobuf() -> buffer format") + NAMETH(tobuf, "X.tobuf() -> buffer format") + KWSMTH(fromstring, "fromstring(STR, [radix = 0]) -> (X, REST)\n" + " 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") + SMTH (loadb, "loadb(STR) -> X: read big-endian bytes") + SMTH (loadl2c, "loadl2c(STR) -> X: " + "read little-endian bytes, two's complement") + SMTH (loadb2c, "loadb2c(STR) -> X: " + "read big-endian bytes, two's complement") + SMTH (frombuf, "frombuf(STR) -> (X, REST): read buffer format") #undef METHNAME { 0 } }; @@ -885,7 +971,9 @@ static const PyNumberMethods mp_pynumber = { mp_pyadd, /* @nb_add@ */ mp_pysub, /* @nb_subtract@ */ mp_pymul, /* @nb_multiply@ */ +#ifdef PY2 0, /* @nb_divide@ */ +#endif mp_pymod, /* @nb_remainder@ */ mp_pydivmod, /* @nb_divmod@ */ mp_pyexp, /* @nb_power@ */ @@ -899,17 +987,23 @@ static const PyNumberMethods mp_pynumber = { mp_pyand2c, /* @nb_and@ */ mp_pyxor2c, /* @nb_xor@ */ mp_pyor2c, /* @nb_or@ */ +#ifdef PY2 mp_pycoerce, /* @nb_coerce@ */ +#endif mp_pyint, /* @nb_int@ */ - mp_pylong, /* @nb_long@ */ + PY23(mp_pylong, 0), /* @nb_long@ */ mp_pyfloat, /* @nb_float@ */ +#ifdef PY2 mp_pyoct, /* @nb_oct@ */ mp_pyhex, /* @nb_hex@ */ +#endif 0, /* @nb_inplace_add@ */ 0, /* @nb_inplace_subtract@ */ 0, /* @nb_inplace_multiply@ */ +#ifdef PY2 0, /* @nb_inplace_divide@ */ +#endif 0, /* @nb_inplace_remainder@ */ 0, /* @nb_inplace_power@ */ 0, /* @nb_inplace_lshift@ */ @@ -922,10 +1016,12 @@ static const PyNumberMethods mp_pynumber = { 0, /* @nb_true_divide@ */ 0, /* @nb_inplace_floor_divide@ */ 0, /* @nb_inplace_true_divide@ */ + + mp_pyint, /* @nb_index@ */ }; -static PyTypeObject mp_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject mp_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "MP", /* @tp_name@ */ sizeof(mp_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -934,7 +1030,7 @@ static PyTypeObject mp_pytype_skel = { 0, /* @tp_print@ */ 0, /* @tp_getattr@ */ 0, /* @tp_setattr@ */ - mp_pycompare, /* @tp_compare@ */ + PY23(mp_pycompare, 0), /* @tp_compare@/@tp_as_async@ */ mp_pyrepr, /* @tp_repr@ */ PYNUMBER(mp), /* @tp_as_number@ */ 0, /* @tp_as_sequence@ */ @@ -953,13 +1049,16 @@ static PyTypeObject mp_pytype_skel = { "Multiprecision integers, similar to `long' but more efficient and\n" "versatile. Support all the standard arithmetic operations, with\n" "implicit conversions from `PrimeFilter', and other objects which\n" - "convert to `long'.\n" + "convert to `" PY23("long", "int") "'.\n" "\n" "Constructor MP(X, [radix = R]) attempts to convert X to an `MP'. If\n" "X is a string, it's read in radix-R form, or we look for a prefix\n" "if R = 0. Other acceptable things are field elements, elliptic curve\n" + PY23( "points, group elements, Python `int' and `long' objects, and anything\n" - "with an integer conversion.\n" + "with an integer conversion.\n", + "points, group elements, Python `int' objects, and anything with an\n" + "integer conversion.\n") "\n" "Notes:\n" "\n" @@ -967,7 +1066,7 @@ static 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@ */ @@ -988,6 +1087,8 @@ static PyTypeObject mp_pytype_skel = { /*----- Products of small integers ----------------------------------------*/ +static PyTypeObject *mpmul_pytype; + typedef struct mpmul_pyobj { PyObject_HEAD int livep; @@ -1034,11 +1135,10 @@ end: return (0); } -static PyObject *mmmeth_done(PyObject *me, PyObject *arg) +static PyObject *mmmeth_done(PyObject *me) { mp *x; - if (!PyArg_ParseTuple(arg, ":done")) goto end; if (!MPMUL_LIVEP(me)) VALERR("MPMul object invalid"); x = mpmul_done(MPMUL_PY(me)); MPMUL_LIVEP(me) = 0; @@ -1077,13 +1177,13 @@ static const PyGetSetDef mpmul_pygetset[] = { static const PyMethodDef mpmul_pymethods[] = { #define METHNAME(name) mmmeth_##name METH (factor, "MM.factor(ITERABLE) or MM.factor(I, ...)") - METH (done, "MM.done() -> PRODUCT") + NAMETH(done, "MM.done() -> PRODUCT") #undef METHNAME { 0 } }; -static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject mpmul_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "MPMul", /* @tp_name@ */ sizeof(mpmul_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1132,6 +1232,8 @@ static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = { /*----- Montgomery reduction ----------------------------------------------*/ +static PyTypeObject *mpmont_pytype; + typedef struct mpmont_pyobj { PyObject_HEAD mpmont mm; @@ -1349,8 +1451,8 @@ static const PyMethodDef mpmont_pymethods[] = { { 0 } }; -static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject mpmont_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "MPMont", /* @tp_name@ */ sizeof(mpmont_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1399,6 +1501,8 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = { /*----- Barrett reduction -------------------------------------------------*/ +static PyTypeObject *mpbarrett_pytype; + typedef struct mpbarrett_pyobj { PyObject_HEAD mpbarrett mb; @@ -1488,8 +1592,8 @@ static const PyMethodDef mpbarrett_pymethods[] = { { 0 } }; -static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject mpbarrett_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "MPBarrett", /* @tp_name@ */ sizeof(mpbarrett_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1538,6 +1642,8 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = { /*----- Nice prime reduction ----------------------------------------------*/ +static PyTypeObject *mpreduce_pytype; + typedef struct mpreduce_pyobj { PyObject_HEAD mpreduce mr; @@ -1616,8 +1722,8 @@ static const const PyMethodDef mpreduce_pymethods[] = { { 0 } }; -static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject mpreduce_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "MPReduce", /* @tp_name@ */ sizeof(mpreduce_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1666,6 +1772,8 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = { /*----- Chinese Remainder Theorem solution --------------------------------*/ +static PyTypeObject *mpcrt_pytype; + typedef struct mpcrt_pyobj { PyObject_HEAD mpcrt c; @@ -1681,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"); @@ -1704,8 +1810,6 @@ end: MP_DROP(v[i]); xfree(v); } - Py_DECREF(me); - Py_XDECREF(q); return (z); } @@ -1730,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"); @@ -1752,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); @@ -1763,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); } @@ -1798,8 +1899,8 @@ static const PyMethodDef mpcrt_pymethods[] = { { 0 } }; -static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject mpcrt_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "MPCRT", /* @tp_name@ */ sizeof(mpcrt_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1849,7 +1950,7 @@ static PyTypeObject *mpcrt_pytype, 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) { @@ -1891,7 +1992,7 @@ static PyObject *gf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) if (!good_radix_p(radix, 1)) VALERR("radix out of range"); if ((z = mp_frompyobject(x, radix)) == 0) { PyErr_Format(PyExc_TypeError, "can't convert %.100s to gf", - x->ob_type->tp_name); + Py_TYPE(x)->tp_name); goto end; } if (MP_NEGP(z)) { @@ -1910,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; } @@ -1935,11 +2036,8 @@ end: return (rc); } -static PyObject *gfmeth_sqr(PyObject *me, PyObject *arg) -{ - if (!PyArg_ParseTuple(arg, ":sqr")) return (0); - return (gf_pywrap(gf_sqr(MP_NEW, MP_X(me)))); -} +static PyObject *gfmeth_sqr(PyObject *me) + { return (gf_pywrap(gf_sqr(MP_NEW, MP_X(me)))); } static PyObject *gfmeth_gcd(PyObject *me, PyObject *arg) { @@ -1983,8 +2081,8 @@ end: return (z); } -static PyObject *meth__GF_fromstring(PyObject *me, - PyObject *arg, PyObject *kw) +static PyObject *gfmeth_fromstring(PyObject *me, + PyObject *arg, PyObject *kw) { int r = 0; char *p; @@ -1992,10 +2090,10 @@ static PyObject *meth__GF_fromstring(PyObject *me, PyObject *z = 0; mp *zz; mptext_stringctx sc; - static const char *const kwlist[] = { "class", "x", "radix", 0 }; + static const char *const kwlist[] = { "x", "radix", 0 }; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|i:fromstring", - KWLIST, &me, &p, &len, &r)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|i:fromstring", KWLIST, + &p, &len, &r)) goto end; if (!good_radix_p(r, 1)) VALERR("bad radix"); sc.buf = p; sc.lim = p + len; @@ -2010,11 +2108,8 @@ end: return (z); } -static PyObject *gfmeth_irreduciblep(PyObject *me, PyObject *arg) -{ - if (!PyArg_ParseTuple(arg, ":irreduciblep")) return (0); - return getbool(gf_irreduciblep(MP_X(me))); -} +static PyObject *gfmeth_irreduciblep(PyObject *me) + { return getbool(gf_irreduciblep(MP_X(me))); } static PyObject *gfget_degree(PyObject *me, void *hunoz) { return (PyInt_FromLong(mp_bits(MP_X(me)) - 1)); } @@ -2035,11 +2130,19 @@ static const PyMethodDef gf_pymethods[] = { METH (setbit, "X.setbit(N) -> X with bit N set") METH (clearbit, "X.clearbit(N) -> X with bit N clear") METH (testbit, "X.testbit(N) -> true/false if bit N set/clear in X") - METH (sqr, "X.sqr() -> X^2") + NAMETH(sqr, "X.sqr() -> X^2") METH (gcd, "X.gcd(Y) -> gcd(X, Y)") METH (gcdx, "X.gcdx(Y) -> (gcd(X, Y), U, V) with X U + Y V = gcd(X, Y)") METH (modinv, "X.modinv(Y) -> multiplicative inverse of Y mod X") - METH (irreduciblep, "X.irreduciblep() -> true/false") + NAMETH(irreduciblep, "X.irreduciblep() -> true/false") + KWSMTH(fromstring, "fromstring(STR, [radix = 0]) -> (X, REST)\n" + " 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") #undef METHNAME #define METHNAME(func) mpmeth_##func KWMETH(tostring, "X.tostring([radix = 10]) -> STR") @@ -2049,7 +2152,7 @@ static const PyMethodDef gf_pymethods[] = { "little-endian bytes, two's complement") KWMETH(storeb2c, "X.storeb2c([len = -1]) -> " "big-endian bytes, two's complement") - METH (tobuf, "X.tobuf() -> buffer format") + NAMETH(tobuf, "X.tobuf() -> buffer format") #undef METHNAME { 0 } }; @@ -2058,7 +2161,9 @@ static const PyNumberMethods gf_pynumber = { gf_pyadd, /* @nb_add@ */ gf_pysub, /* @nb_subtract@ */ gf_pymul, /* @nb_multiply@ */ +#ifdef PY2 0, /* @nb_divide@ */ +#endif gf_pymod, /* @nb_remainder@ */ gf_pydivmod, /* @nb_divmod@ */ gf_pyexp, /* @nb_power@ */ @@ -2072,17 +2177,23 @@ static const PyNumberMethods gf_pynumber = { gf_pyand, /* @nb_and@ */ gf_pyxor, /* @nb_xor@ */ gf_pyor, /* @nb_or@ */ +#ifdef PY2 gf_pycoerce, /* @nb_coerce@ */ +#endif mp_pyint, /* @nb_int@ */ - mp_pylong, /* @nb_long@ */ + PY23(mp_pylong, 0), /* @nb_long@ */ 0 /* doesn't make any sense */, /* @nb_float@ */ +#ifdef PY2 mp_pyoct, /* @nb_oct@ */ mp_pyhex, /* @nb_hex@ */ +#endif 0, /* @nb_inplace_add@ */ 0, /* @nb_inplace_subtract@ */ 0, /* @nb_inplace_multiply@ */ +#ifdef PY2 0, /* @nb_inplace_divide@ */ +#endif 0, /* @nb_inplace_remainder@ */ 0, /* @nb_inplace_power@ */ 0, /* @nb_inplace_lshift@ */ @@ -2095,10 +2206,12 @@ static const PyNumberMethods gf_pynumber = { 0, /* @nb_true_divide@ */ 0, /* @nb_inplace_floor_divide@ */ 0, /* @nb_inplace_true_divide@ */ + + mp_pyint, /* @nb_index@ */ }; -static PyTypeObject gf_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gf_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GF", /* @tp_name@ */ sizeof(mp_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2129,8 +2242,11 @@ static PyTypeObject gf_pytype_skel = { "Constructor GF(X, [radix = R]) attempts to convert X to a `GF'. If\n" "X is a string, it's read in radix-R form, or we look for a prefix\n" "if R = 0. Other acceptable things are field elements, elliptic curve\n" + PY23( "points, group elements, Python `int' and `long' objects, and anything\n" - "with an integer conversion.\n" + "with an integer conversion.\n", + "points, group elements, Python `int' objects, and anything with an\n" + "integer conversion.\n") "\n" "The name is hopelessly wrong from a technical point of view, but\n" "but it's much easier to type than `p2' or `c2' or whatever.\n" @@ -2162,6 +2278,8 @@ static PyTypeObject gf_pytype_skel = { /*----- Sparse poly reduction ---------------------------------------------*/ +static PyTypeObject *gfreduce_pytype; + typedef struct gfreduce_pyobj { PyObject_HEAD gfreduce mr; @@ -2296,8 +2414,8 @@ static const PyMethodDef gfreduce_pymethods[] = { { 0 } }; -static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gfreduce_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GFReduce", /* @tp_name@ */ sizeof(gfreduce_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2346,14 +2464,14 @@ static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = { /*----- Normal/poly transformation ----------------------------------------*/ +static PyTypeObject *gfn_pytype; + typedef struct gfn_pyobj { PyObject_HEAD mp *p; gfn ntop, pton; } gfn_pyobj; -static PyTypeObject *gfn_pytype, gfn_pytype_skel; - #define GFN_P(o) (((gfn_pyobj *)(o))->p) #define GFN_PTON(o) (&((gfn_pyobj *)(o))->pton) #define GFN_NTOP(o) (&((gfn_pyobj *)(o))->ntop) @@ -2434,8 +2552,8 @@ static const PyMethodDef gfn_pymethods[] = { { 0 } }; -static PyTypeObject gfn_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gfn_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GFN", /* @tp_name@ */ sizeof(gfn_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2485,29 +2603,8 @@ static PyTypeObject gfn_pytype_skel = { /*----- Glue --------------------------------------------------------------*/ -static const PyMethodDef methods[] = { -#define METHNAME(func) meth_##func - KWMETH(_MP_fromstring, "fromstring(STR, [radix = 0]) -> (X, REST)\n" - " 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.") - KWMETH(_GF_fromstring, "fromstring(STR, [radix = 0]) -> (X, REST)\n" - " 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.") - METH (_MP_factorial, "factorial(I) -> I!: compute factorial") - METH (_MP_fibonacci, "fibonacci(I) -> F(I): compute Fibonacci number") - METH (_MP_loadl, "loadl(STR) -> X: read little-endian bytes") - METH (_MP_loadb, "loadb(STR) -> X: read big-endian bytes") - METH (_MP_loadl2c, "loadl2c(STR) -> X: " - "read little-endian bytes, two's complement") - METH (_MP_loadb2c, "loadb2c(STR) -> X: " - "read big-endian bytes, two's complement") - METH (_MP_frombuf, "frombuf(STR) -> (X, REST): read buffer format") - METH (_GF_loadl, "loadl(STR) -> X: read little-endian bytes") - METH (_GF_loadb, "loadb(STR) -> X: read big-endian bytes") - METH (_GF_frombuf, "frombuf(STR) -> (X, REST): read buffer format") -#undef METHNAME +static const struct nameval consts[] = { + CONST(MPW_MAX), { 0 } }; @@ -2522,7 +2619,6 @@ void mp_pyinit(void) INITTYPE(mpcrt, root); INITTYPE(gfreduce, root); INITTYPE(gfn, root); - addmethods(methods); } void mp_pyinsert(PyObject *mod) @@ -2536,6 +2632,7 @@ void mp_pyinsert(PyObject *mod) INSERT("GF", gf_pytype); INSERT("GFReduce", gfreduce_pytype); INSERT("GFN", gfn_pytype); + setconstants(mod, consts); } /*----- That's all, folks -------------------------------------------------*/