X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/d96c882ed6f1852a266fd1a2b61bbc906cc805bb..591bf41b5e4fa2d55e00d1e418b1b9ed53b4489c:/mp.c diff --git a/mp.c b/mp.c index ad68e03..93dd137 100644 --- a/mp.c +++ b/mp.c @@ -45,12 +45,12 @@ mp *mp_frompylong(PyObject *obj) mp *x; mpw *p; - sz = l->ob_size; + sz = Py_SIZE(l); if (sz < 0) sz = -sz; assert(MPW_BITS >= SHIFT); bits = (unsigned long)sz * 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; @@ -94,7 +94,7 @@ PyObject *mp_topylong(mp *x) l->ob_digit[i++] = r & MASK; r >>= SHIFT; } - l->ob_size = (x->f & MP_NEG) ? -sz : sz; + Py_SIZE(l) = (x->f & MP_NEG) ? -sz : sz; return ((PyObject *)l); } @@ -238,7 +238,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 +257,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); } @@ -536,7 +536,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); @@ -593,25 +593,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: @@ -724,8 +719,8 @@ 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; \ @@ -733,7 +728,7 @@ STOREOP(storeb2c, 2c) PyObject *rc = 0; \ mp *x; \ \ - if (!PyArg_ParseTuple(arg, "Os#:frombuf", &me, &p, &sz)) goto end; \ + if (!PyArg_ParseTuple(arg, "s#:frombuf", &p, &sz)) goto end; \ buf_init(&b, p, sz); \ if ((x = buf_getmp(&b)) == 0) VALERR("malformed data"); \ rc = Py_BuildValue("(NN)", ty##_pywrap(x), \ @@ -741,18 +736,17 @@ STOREOP(storeb2c, 2c) 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); @@ -776,6 +770,64 @@ end: return (rc); } +static PyObject *mpmeth_fromstring(PyObject *me, + PyObject *arg, PyObject *kw) +{ + int r = 0; + char *p; + Py_ssize_t len; + PyObject *z = 0; + mp *zz; + mptext_stringctx sc; + static const char *const kwlist[] = { "x", "radix", 0 }; + + 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; + if ((zz = mp_read(MP_NEW, r, &mptext_stringops, &sc)) == 0) + VALERR("bad integer"); + z = Py_BuildValue("(Ns#)", mp_pywrap(zz), + sc.buf, (Py_ssize_t)(sc.lim - sc.buf)); +end: + return (z); +} + +static PyObject *mpmeth_factorial(PyObject *me, PyObject *arg) +{ + unsigned long i; + mp *x; + if (!PyArg_ParseTuple(arg, "O&:factorial", convulong, &i)) return (0); + x = mp_factorial(i); + return mp_pywrap(x); +} + +static PyObject *mpmeth_fibonacci(PyObject *me, PyObject *arg) +{ + long i; + mp *x; + if (!PyArg_ParseTuple(arg, "l:fibonacci", &i)) return (0); + x = mp_fibonacci(i); + return mp_pywrap(x); +} + +#define LOADOP(pre, name) \ + static PyObject *pre##meth_##name(PyObject *me, PyObject *arg) \ + { \ + char *p; \ + Py_ssize_t len; \ + if (!PyArg_ParseTuple(arg, "s#:" #name, &p, &len)) return (0); \ + return (pre##_pywrap(mp_##name(MP_NEW, p, len))); \ + } +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) { return (PyInt_FromLong(mp_bits(MP_X(me)))); } @@ -785,7 +837,7 @@ static PyObject *mpget_noctets(PyObject *me, void *hunoz) static PyObject *mpget_noctets2c(PyObject *me, void *hunoz) { return (PyInt_FromLong(mp_octets2c(MP_X(me)))); } -static PyGetSetDef mp_pygetset[] = { +static const PyGetSetDef mp_pygetset[] = { #define GETSETNAME(op, func) mp##op##_##func GET (nbits, "X.nbits -> bit length of X") GET (noctets, "X.noctets -> octet length of X") @@ -794,15 +846,15 @@ static PyGetSetDef mp_pygetset[] = { { 0 } }; -static PyMethodDef mp_pymethods[] = { +static const PyMethodDef mp_pymethods[] = { #define METHNAME(func) mpmeth_##func METH (jacobi, "X.jacobi(Y) -> Jacobi symbol (Y|X) (NB inversion!)") 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)") @@ -818,12 +870,25 @@ static 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 (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 } }; -static PyNumberMethods mp_pynumber = { +static const PyNumberMethods mp_pynumber = { mp_pyadd, /* @nb_add@ */ mp_pysub, /* @nb_subtract@ */ mp_pymul, /* @nb_multiply@ */ @@ -866,8 +931,8 @@ static PyNumberMethods mp_pynumber = { 0, /* @nb_inplace_true_divide@ */ }; -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@ */ @@ -878,7 +943,7 @@ static PyTypeObject mp_pytype_skel = { 0, /* @tp_setattr@ */ mp_pycompare, /* @tp_compare@ */ mp_pyrepr, /* @tp_repr@ */ - &mp_pynumber, /* @tp_as_number@ */ + PYNUMBER(mp), /* @tp_as_number@ */ 0, /* @tp_as_sequence@ */ 0, /* @tp_as_mapping@ */ mp_pyhash, /* @tp_hash@ */ @@ -913,9 +978,9 @@ static PyTypeObject mp_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - mp_pymethods, /* @tp_methods@ */ + PYMETHODS(mp), /* @tp_methods@ */ 0, /* @tp_members@ */ - mp_pygetset, /* @tp_getset@ */ + PYGETSET(mp), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -928,67 +993,10 @@ static PyTypeObject mp_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyObject *meth__MP_fromstring(PyObject *me, - PyObject *arg, PyObject *kw) -{ - int r = 0; - char *p; - Py_ssize_t len; - PyObject *z = 0; - mp *zz; - mptext_stringctx sc; - static const char *const kwlist[] = { "class", "x", "radix", 0 }; - - if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|i:fromstring", - KWLIST, &me, &p, &len, &r)) - goto end; - if (!good_radix_p(r, 1)) VALERR("bad radix"); - sc.buf = p; sc.lim = p + len; - if ((zz = mp_read(MP_NEW, r, &mptext_stringops, &sc)) == 0) - VALERR("bad integer"); - z = Py_BuildValue("(Ns#)", mp_pywrap(zz), - sc.buf, (Py_ssize_t)(sc.lim - sc.buf)); -end: - return (z); -} - -static PyObject *meth__MP_factorial(PyObject *me, PyObject *arg) -{ - unsigned long i; - mp *x; - if (!PyArg_ParseTuple(arg, "OO&:factorial", &me, convulong, &i)) - return (0); - x = mp_factorial(i); - return mp_pywrap(x); -} - -static PyObject *meth__MP_fibonacci(PyObject *me, PyObject *arg) -{ - long i; - mp *x; - if (!PyArg_ParseTuple(arg, "Ol:fibonacci", &me, &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) \ - { \ - 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))); \ - } -LOADOP(mp, MP, loadl) -LOADOP(mp, MP, loadb) -LOADOP(mp, MP, loadl2c) -LOADOP(mp, MP, loadb2c) -LOADOP(gf, GF, loadl) -LOADOP(gf, GF, loadb) -#undef LOADOP - /*----- Products of small integers ----------------------------------------*/ +static PyTypeObject *mpmul_pytype; + typedef struct mpmul_pyobj { PyObject_HEAD int livep; @@ -1035,11 +1043,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; @@ -1068,23 +1075,23 @@ end: static PyObject *mmget_livep(PyObject *me, void *hunoz) { return (getbool(MPMUL_LIVEP(me))); } -static PyGetSetDef mpmul_pygetset[] = { +static const PyGetSetDef mpmul_pygetset[] = { #define GETSETNAME(op, name) mm##op##_##name GET (livep, "MM.livep -> flag: object still valid?") #undef GETSETNAME { 0 } }; -static PyMethodDef mpmul_pymethods[] = { +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@ */ @@ -1116,9 +1123,9 @@ static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - mpmul_pymethods, /* @tp_methods@ */ + PYMETHODS(mpmul), /* @tp_methods@ */ 0, /* @tp_members@ */ - mpmul_pygetset, /* @tp_getset@ */ + PYGETSET(mpmul), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -1133,6 +1140,8 @@ static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = { /*----- Montgomery reduction ----------------------------------------------*/ +static PyTypeObject *mpmont_pytype; + typedef struct mpmont_pyobj { PyObject_HEAD mpmont mm; @@ -1323,7 +1332,7 @@ static PyObject *mmget_r(PyObject *me, void *hunoz) static PyObject *mmget_r2(PyObject *me, void *hunoz) { return (mp_pywrap(MP_COPY(MPMONT_PY(me)->r2))); } -static PyGetSetDef mpmont_pygetset[] = { +static const PyGetSetDef mpmont_pygetset[] = { #define GETSETNAME(op, name) mm##op##_##name GET (m, "M.m -> modulus for reduction") GET (r, "M.r -> multiplicative identity") @@ -1332,7 +1341,7 @@ static PyGetSetDef mpmont_pygetset[] = { { 0 } }; -static PyMethodDef mpmont_pymethods[] = { +static const PyMethodDef mpmont_pymethods[] = { #define METHNAME(name) mmmeth_##name METH (int, "M.int(X) -> XR") METH (mul, "M.mul(XR, YR) -> ZR where Z = X Y") @@ -1350,8 +1359,8 @@ static 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@ */ @@ -1383,9 +1392,9 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - mpmont_pymethods, /* @tp_methods@ */ + PYMETHODS(mpmont), /* @tp_methods@ */ 0, /* @tp_members@ */ - mpmont_pygetset, /* @tp_getset@ */ + PYGETSET(mpmont), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -1400,6 +1409,8 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = { /*----- Barrett reduction -------------------------------------------------*/ +static PyTypeObject *mpbarrett_pytype; + typedef struct mpbarrett_pyobj { PyObject_HEAD mpbarrett mb; @@ -1471,14 +1482,14 @@ end: static PyObject *mbget_m(PyObject *me, void *hunoz) { return (mp_pywrap(MP_COPY(MPBARRETT_PY(me)->m))); } -static PyGetSetDef mpbarrett_pygetset[] = { +static const PyGetSetDef mpbarrett_pygetset[] = { #define GETSETNAME(op, name) mb##op##_##name GET (m, "B.m -> modulus for reduction") #undef GETSETNAME { 0 } }; -static PyMethodDef mpbarrett_pymethods[] = { +static const PyMethodDef mpbarrett_pymethods[] = { #define METHNAME(name) mbmeth_##name METH (reduce, "B.reduce(X) -> X mod B.m") METH (exp, "B.exp(X, N) -> X^N mod B.m") @@ -1489,8 +1500,8 @@ static 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@ */ @@ -1522,9 +1533,9 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - mpbarrett_pymethods, /* @tp_methods@ */ + PYMETHODS(mpbarrett), /* @tp_methods@ */ 0, /* @tp_members@ */ - mpbarrett_pygetset, /* @tp_getset@ */ + PYGETSET(mpbarrett), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -1539,6 +1550,8 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = { /*----- Nice prime reduction ----------------------------------------------*/ +static PyTypeObject *mpreduce_pytype; + typedef struct mpreduce_pyobj { PyObject_HEAD mpreduce mr; @@ -1602,14 +1615,14 @@ end: static PyObject *mrget_m(PyObject *me, void *hunoz) { return (mp_pywrap(MP_COPY(MPREDUCE_PY(me)->p))); } -static PyGetSetDef mpreduce_pygetset[] = { +static const PyGetSetDef mpreduce_pygetset[] = { #define GETSETNAME(op, name) mr##op##_##name GET (m, "R.m -> modulus for reduction") #undef GETSETNAME { 0 } }; -static PyMethodDef mpreduce_pymethods[] = { +static const const PyMethodDef mpreduce_pymethods[] = { #define METHNAME(name) mrmeth_##name METH (reduce, "R.reduce(X) -> X mod B.m") METH (exp, "R.exp(X, N) -> X^N mod B.m") @@ -1617,8 +1630,8 @@ static 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@ */ @@ -1650,9 +1663,9 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - mpreduce_pymethods, /* @tp_methods@ */ + PYMETHODS(mpreduce), /* @tp_methods@ */ 0, /* @tp_members@ */ - mpreduce_pygetset, /* @tp_getset@ */ + PYGETSET(mpreduce), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -1667,6 +1680,8 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = { /*----- Chinese Remainder Theorem solution --------------------------------*/ +static PyTypeObject *mpcrt_pytype; + typedef struct mpcrt_pyobj { PyObject_HEAD mpcrt c; @@ -1784,7 +1799,7 @@ static PyObject *mcget_moduli(PyObject *me, void *hunoz) return (q); } -static PyGetSetDef mpcrt_pygetset[] = { +static const PyGetSetDef mpcrt_pygetset[] = { #define GETSETNAME(op, name) mc##op##_##name GET (product, "C.product -> product of moduli") GET (moduli, "C.moduli -> list of individual moduli") @@ -1792,15 +1807,15 @@ static PyGetSetDef mpcrt_pygetset[] = { { 0 } }; -static PyMethodDef mpcrt_pymethods[] = { +static const PyMethodDef mpcrt_pymethods[] = { #define METHNAME(name) mcmeth_##name METH (solve, "C.solve([R0, R1]) -> X mod C.product") #undef METHNAME { 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@ */ @@ -1832,9 +1847,9 @@ static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - mpcrt_pymethods, /* @tp_methods@ */ + PYMETHODS(mpcrt), /* @tp_methods@ */ 0, /* @tp_members@ */ - mpcrt_pygetset, /* @tp_getset@ */ + PYGETSET(mpcrt), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -1892,7 +1907,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)) { @@ -1936,11 +1951,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) { @@ -1984,16 +1996,40 @@ end: return (z); } -static PyObject *gfmeth_irreduciblep(PyObject *me, PyObject *arg) +static PyObject *gfmeth_fromstring(PyObject *me, + PyObject *arg, PyObject *kw) { - if (!PyArg_ParseTuple(arg, ":irreduciblep")) return (0); - return getbool(gf_irreduciblep(MP_X(me))); + int r = 0; + char *p; + Py_ssize_t len; + PyObject *z = 0; + mp *zz; + mptext_stringctx sc; + static const char *const kwlist[] = { "x", "radix", 0 }; + + 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; + if ((zz = mp_read(MP_NEW, r, &mptext_stringops, &sc)) == 0 || + MP_NEGP(zz)) { + if (zz) MP_DROP(zz); + VALERR("bad binary polynomial"); + } + z = Py_BuildValue("(Ns#)", gf_pywrap(zz), + sc.buf, (Py_ssize_t)(sc.lim - sc.buf)); +end: + return (z); } +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)); } -static PyGetSetDef gf_pygetset[] = { +static const PyGetSetDef gf_pygetset[] = { #define GETSETNAME(op, name) gf##op##_##name GET (degree, "X.degree -> polynomial degree of X") #undef GETSETNAME @@ -2004,16 +2040,23 @@ static PyGetSetDef gf_pygetset[] = { { 0 } }; -static PyMethodDef gf_pymethods[] = { +static const PyMethodDef gf_pymethods[] = { #define METHNAME(func) gfmeth_##func 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 (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") @@ -2023,12 +2066,12 @@ static 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 } }; -static PyNumberMethods gf_pynumber = { +static const PyNumberMethods gf_pynumber = { gf_pyadd, /* @nb_add@ */ gf_pysub, /* @nb_subtract@ */ gf_pymul, /* @nb_multiply@ */ @@ -2071,8 +2114,8 @@ static PyNumberMethods gf_pynumber = { 0, /* @nb_inplace_true_divide@ */ }; -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@ */ @@ -2083,7 +2126,7 @@ static PyTypeObject gf_pytype_skel = { 0, /* @tp_setattr@ */ 0, /* @tp_compare@ */ gf_pyrepr, /* @tp_repr@ */ - &gf_pynumber, /* @tp_as_number@ */ + PYNUMBER(gf), /* @tp_as_number@ */ 0, /* @tp_as_sequence@ */ 0, /* @tp_as_mapping@ */ mp_pyhash, /* @tp_hash@ */ @@ -2119,9 +2162,9 @@ static PyTypeObject gf_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - gf_pymethods, /* @tp_methods@ */ + PYMETHODS(gf), /* @tp_methods@ */ 0, /* @tp_members@ */ - gf_pygetset, /* @tp_getset@ */ + PYGETSET(gf), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -2134,35 +2177,10 @@ static PyTypeObject gf_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyObject *meth__GF_fromstring(PyObject *me, - PyObject *arg, PyObject *kw) -{ - int r = 0; - char *p; - Py_ssize_t len; - PyObject *z = 0; - mp *zz; - mptext_stringctx sc; - static const char *const kwlist[] = { "class", "x", "radix", 0 }; - - if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|i:fromstring", - KWLIST, &me, &p, &len, &r)) - goto end; - if (!good_radix_p(r, 1)) VALERR("bad radix"); - sc.buf = p; sc.lim = p + len; - if ((zz = mp_read(MP_NEW, r, &mptext_stringops, &sc)) == 0 || - MP_NEGP(zz)) { - if (zz) MP_DROP(zz); - VALERR("bad binary polynomial"); - } - z = Py_BuildValue("(Ns#)", gf_pywrap(zz), - sc.buf, (Py_ssize_t)(sc.lim - sc.buf)); -end: - return (z); -} - /*----- Sparse poly reduction ---------------------------------------------*/ +static PyTypeObject *gfreduce_pytype; + typedef struct gfreduce_pyobj { PyObject_HEAD gfreduce mr; @@ -2278,14 +2296,14 @@ end: static PyObject *grget_m(PyObject *me, void *hunoz) { return (gf_pywrap(MP_COPY(GFREDUCE_PY(me)->p))); } -static PyGetSetDef gfreduce_pygetset[] = { +static const PyGetSetDef gfreduce_pygetset[] = { #define GETSETNAME(op, name) gr##op##_##name GET (m, "R.m -> reduction polynomial") #undef GETSETNAME { 0 } }; -static PyMethodDef gfreduce_pymethods[] = { +static const PyMethodDef gfreduce_pymethods[] = { #define METHNAME(name) grmeth_##name METH (reduce, "R.reduce(X) -> X mod B.m") METH (trace, "R.trace(X) -> Tr(X) = x + x^2 + ... + x^{2^{m - 1}}") @@ -2297,8 +2315,8 @@ static 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@ */ @@ -2330,9 +2348,9 @@ static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - gfreduce_pymethods, /* @tp_methods@ */ + PYMETHODS(gfreduce), /* @tp_methods@ */ 0, /* @tp_members@ */ - gfreduce_pygetset, /* @tp_getset@ */ + PYGETSET(gfreduce), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -2347,14 +2365,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) @@ -2419,7 +2437,7 @@ static void gfn_pydealloc(PyObject *me) FREEOBJ(me); } -static PyGetSetDef gfn_pygetset[] = { +static const PyGetSetDef gfn_pygetset[] = { #define GETSETNAME(op, name) gfn##op##_##name GET (p, "X.p -> polynomial basis, as polynomial") GET (beta, "X.beta -> normal basis element, in poly form") @@ -2427,7 +2445,7 @@ static PyGetSetDef gfn_pygetset[] = { { 0 } }; -static PyMethodDef gfn_pymethods[] = { +static const PyMethodDef gfn_pymethods[] = { #define METHNAME(name) gfnmeth_##name METH (pton, "X.pton(A) -> normal-basis representation of A") METH (ntop, "X.ntop(A) -> polynomial-basis representation of A") @@ -2435,8 +2453,8 @@ static 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@ */ @@ -2469,9 +2487,9 @@ static PyTypeObject gfn_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - gfn_pymethods, /* @tp_methods@ */ + PYMETHODS(gfn), /* @tp_methods@ */ 0, /* @tp_members@ */ - gfn_pygetset, /* @tp_getset@ */ + PYGETSET(gfn), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -2486,29 +2504,8 @@ static PyTypeObject gfn_pytype_skel = { /*----- Glue --------------------------------------------------------------*/ -static 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 } }; @@ -2523,7 +2520,6 @@ void mp_pyinit(void) INITTYPE(mpcrt, root); INITTYPE(gfreduce, root); INITTYPE(gfn, root); - addmethods(methods); } void mp_pyinsert(PyObject *mod) @@ -2537,6 +2533,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 -------------------------------------------------*/