X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/b76bb84135462baf905f6240946d3e6d51271a82..637b91402d2497db1318debd3cb3868a5abb8f01:/mp.c diff --git a/mp.c b/mp.c index e7cb557..7759e29 100644 --- a/mp.c +++ b/mp.c @@ -211,6 +211,7 @@ mp *tomp(PyObject *o) return (MP_COPY(PFILT_F(o)->m)); else if (ECPT_PYCHECK(o)) { ec p = EC_INIT; + if (EC_ATINF(ECPT_P(o))) return (0); getecptout(&p, o); x = MP_COPY(p.x); EC_DESTROY(&p); @@ -527,9 +528,9 @@ static PyObject *mp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) mp *z; mp_pyobj *zz = 0; int radix = 0; - char *kwlist[] = { "x", "radix", 0 }; + static const char *const kwlist[] = { "x", "radix", 0 }; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|i:new", kwlist, &x, &radix)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|i:new", KWLIST, &x, &radix)) goto end; if (MP_PYCHECK(x)) RETURN_OBJ(x); if (!good_radix_p(radix, 1)) VALERR("bad radix"); @@ -661,8 +662,8 @@ end: static PyObject *mpmeth_tostring(PyObject *me, PyObject *arg, PyObject *kw) { int radix = 10; - char *kwlist[] = { "radix", 0 }; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "|i:tostring", kwlist, &radix)) + static const char *const kwlist[] = { "radix", 0 }; + if (!PyArg_ParseTupleAndKeywords(arg, kw, "|i:tostring", KWLIST, &radix)) goto end; if (!good_radix_p(radix, 0)) VALERR("bad radix"); return (mp_topystring(MP_X(me), radix, 0, 0, 0)); @@ -702,11 +703,11 @@ end: PyObject *arg, PyObject *kw) \ { \ long len = -1; \ - char *kwlist[] = { "len", 0 }; \ + static const char *const kwlist[] = { "len", 0 }; \ PyObject *rc = 0; \ \ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|l:" #name, \ - kwlist, &len)) \ + KWLIST, &len)) \ goto end; \ if (len < 0) { \ len = mp_octets##c(MP_X(me)); \ @@ -765,10 +766,10 @@ static PyObject *mpmeth_tobuf(PyObject *me, PyObject *arg) static PyObject *mpmeth_primep(PyObject *me, PyObject *arg, PyObject *kw) { grand *r = &rand_global; - char *kwlist[] = { "rng", 0 }; + static const char *const kwlist[] = { "rng", 0 }; PyObject *rc = 0; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&", kwlist, convgrand, &r)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&", KWLIST, convgrand, &r)) goto end; rc = getbool(pgen_primep(MP_X(me), r)); end: @@ -784,7 +785,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") @@ -793,7 +794,7 @@ 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") @@ -803,26 +804,26 @@ static PyMethodDef mp_pymethods[] = { METH (sqr, "X.sqr() -> X^2") METH (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)") + 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 (modsqrt, "X.modsqrt(Y) -> square root of Y mod X, if X prime") - METH (leastcongruent, - "X.leastcongruent(B, M) -> smallest Z >= B with Z == X (mod M)") - KWMETH(primep, "X.primep([rng = rand]) -> true/false if X is prime") + METH (leastcongruent, "X.leastcongruent(B, M) -> " + "smallest Z >= B with Z == X (mod M)") + KWMETH(primep, "X.primep([rng = rand]) -> X is prime?") KWMETH(tostring, "X.tostring([radix = 10]) -> STR") KWMETH(storel, "X.storel([len = -1]) -> little-endian bytes") KWMETH(storeb, "X.storeb([len = -1]) -> big-endian bytes") - KWMETH(storel2c, - "X.storel2c([len = -1]) -> little-endian bytes, two's complement") - KWMETH(storeb2c, - "X.storeb2c([len = -1]) -> big-endian bytes, two's complement") + KWMETH(storel2c, "X.storel2c([len = -1]) -> " + "little-endian bytes, two's complement") + KWMETH(storeb2c, "X.storeb2c([len = -1]) -> " + "big-endian bytes, two's complement") METH (tobuf, "X.tobuf() -> 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@ */ @@ -877,7 +878,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@ */ @@ -891,20 +892,20 @@ static PyTypeObject mp_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"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\ -\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\ -points, group elements, Python `int' and `long' objects, and anything\n\ -with an integer conversion.\n\ -\n\ -Notes:\n\ -\n\ - * Use `//' for division. MPs don't have `/' division.", + "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" + "\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" + "points, group elements, Python `int' and `long' objects, and anything\n" + "with an integer conversion.\n" + "\n" + "Notes:\n" + "\n" + " * Use `//' for integer division: `/' gives exact rational division.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -912,9 +913,9 @@ Notes:\n\ 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@ */ @@ -936,10 +937,10 @@ static PyObject *meth__MP_fromstring(PyObject *me, PyObject *z = 0; mp *zz; mptext_stringctx sc; - char *kwlist[] = { "class", "x", "radix", 0 }; + static const char *const kwlist[] = { "class", "x", "radix", 0 }; if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|i:fromstring", - kwlist, &me, &p, &len, &r)) + KWLIST, &me, &p, &len, &r)) goto end; if (!good_radix_p(r, 1)) VALERR("bad radix"); sc.buf = p; sc.lim = p + len; @@ -1010,10 +1011,10 @@ static PyObject *mmmeth_factor(PyObject *me, PyObject *arg) mp *x; if (!MPMUL_LIVEP(me)) VALERR("MPMul object invalid"); - if (PyTuple_Size(arg) != 1) + if (PyTuple_GET_SIZE(arg) != 1) i = PyObject_GetIter(arg); else { - if ((q = PyTuple_GetItem(arg, 0)) == 0) goto end; + if ((q = PyTuple_GET_ITEM(arg, 0)) == 0) goto end; if ((i = PyObject_GetIter(q)) == 0) { PyErr_Clear(); /* that's ok */ i = PyObject_GetIter(arg); @@ -1067,17 +1068,17 @@ 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?") + 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") + METH (factor, "MM.factor(ITERABLE) or MM.factor(I, ...)") + METH (done, "MM.done() -> PRODUCT") #undef METHNAME { 0 } }; @@ -1107,7 +1108,7 @@ static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"An object for multiplying many small integers.", + "MPMul(N_0, N_1, ....): an object for multiplying many small integers.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1115,9 +1116,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@ */ @@ -1300,10 +1301,10 @@ static void mpmont_pydealloc(PyObject *me) static PyObject *mpmont_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { mpmont_pyobj *mm = 0; - char *kwlist[] = { "m", 0 }; + static const char *const kwlist[] = { "m", 0 }; mp *xx = 0; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", kwlist, convmp, &xx)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convmp, &xx)) goto end; if (!MP_POSP(xx) || !MP_ODDP(xx)) VALERR("m must be positive and odd"); mm = (mpmont_pyobj *)ty->tp_alloc(ty, 0); @@ -1322,7 +1323,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") @@ -1331,20 +1332,20 @@ 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") METH (expr, "M.expr(XR, N) -> ZR where Z = X^N mod M.m") - METH (mexpr, "\ -M.mexpr([(XR0, N0), (XR1, N1), ...]) = ZR where Z = X0^N0 X1^N1 ... mod M.m\n\ -\t(the list may be flattened if this more convenient.)") + METH (mexpr, "M.mexpr([(XR0, N0), (XR1, N1), ...]) = ZR " + "where Z = X0^N0 X1^N1 ... mod M.m\n" + "\t(the list may be flattened if this more convenient.)") METH (reduce, "M.reduce(XR) -> X") METH (ext, "M.ext(XR) -> X") METH (exp, "M.exp(X, N) -> X^N mod M.m") - METH (mexp, "\ -M.mexp([(X0, N0), (X1, N1), ...]) = X0^N0 X1^N1 ... mod M.m\n\ -\t(the list may be flattened if this more convenient.)") + METH (mexp, "M.mexp([(X0, N0), (X1, N1), ...]) = " + "X0^N0 X1^N1 ... mod M.m\n" + "\t(the list may be flattened if this more convenient.)") #undef METHNAME { 0 } }; @@ -1374,7 +1375,7 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"A Montgomery reduction context.", + "MPMont(N): a Montgomery reduction context.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1382,9 +1383,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@ */ @@ -1454,10 +1455,10 @@ static PyObject *mpbarrett_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { mpbarrett_pyobj *mb = 0; - char *kwlist[] = { "m", 0 }; + static const char *const kwlist[] = { "m", 0 }; mp *xx = 0; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", kwlist, convmp, &xx)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convmp, &xx)) goto end; if (!MP_POSP(xx)) VALERR("m must be positive"); mb = (mpbarrett_pyobj *)ty->tp_alloc(ty, 0); @@ -1470,20 +1471,20 @@ 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") - METH (mexp, "\ -B.mexp([(X0, N0), (X1, N1), ...]) = X0^N0 X1^N1 ... mod B.m\n\ -\t(the list may be flattened if this more convenient.)") + METH (mexp, "B.mexp([(X0, N0), (X1, N1), ...]) = " + "X0^N0 X1^N1 ... mod B.m\n" + "\t(the list may be flattened if this more convenient.)") #undef METHNAME { 0 } }; @@ -1513,7 +1514,7 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"A Barrett reduction context.", + "MPBarrett(N): a Barrett reduction context.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1521,9 +1522,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@ */ @@ -1584,10 +1585,10 @@ static PyObject *mpreduce_pynew(PyTypeObject *ty, { mpreduce_pyobj *mr = 0; mpreduce r; - char *kwlist[] = { "m", 0 }; + static const char *const kwlist[] = { "m", 0 }; mp *xx = 0; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", kwlist, convmp, &xx)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convmp, &xx)) goto end; if (!MP_POSP(xx)) VALERR("m must be positive"); if (mpreduce_create(&r, xx)) VALERR("bad modulus (must be 2^k - ...)"); @@ -1601,14 +1602,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") @@ -1641,7 +1642,7 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"A reduction context for reduction modulo primes of special form.", + "MPReduce(N): a reduction context for reduction modulo Solinas primes.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1649,9 +1650,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@ */ @@ -1679,16 +1680,17 @@ static PyObject *mcmeth_solve(PyObject *me, PyObject *arg) PyObject *q = 0, *x, *z = 0; mp *xx; mp **v = 0; - int i = 0, n = c->k; + Py_ssize_t i = 0, n = c->k; Py_INCREF(me); - if (PyTuple_Size(arg) == n) + 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"); - if (PySequence_Size(q) != n) VALERR("residue count mismatch"); + i = PySequence_Size(q); if (i < 0) goto end; + if (i != n) VALERR("residue count mismatch"); v = xmalloc(n * sizeof(*v)); for (i = 0; i < n; i++) { if ((x = PySequence_GetItem(q, i)) == 0) goto end; @@ -1718,21 +1720,20 @@ static void mpcrt_pydealloc(PyObject *me) static PyObject *mpcrt_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { mpcrt_mod *v = 0; - int n, i = 0, j; - char *kwlist[] = { "mv", 0 }; + Py_ssize_t n, i = 0, j; + static const char *const kwlist[] = { "mv", 0 }; PyObject *q = 0, *x; mp *xx = MP_NEW, *y = MP_NEW, *g = MP_NEW; mpmul mm; mpcrt_pyobj *c = 0; - if (PyTuple_Size(arg) > 1) + if (PyTuple_GET_SIZE(arg) > 1) q = arg; - else if (!PyArg_ParseTupleAndKeywords(arg, kw, "O:new", kwlist, &q)) + 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 (PyErr_Occurred()) goto end; + n = PySequence_Size(q); if (n < 0) goto end; if (!n) VALERR("want at least one modulus"); v = xmalloc(n * sizeof(*v)); for (i = 0; i < n; i++) { @@ -1779,11 +1780,11 @@ static PyObject *mcget_moduli(PyObject *me, void *hunoz) if ((q = PyList_New(c->k)) == 0) return (0); for (i = 0; i < c->k; i++) - PyList_SetItem(q, i, mp_pywrap(c->v[i].m)); + PyList_SET_ITEM(q, i, mp_pywrap(c->v[i].m)); 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") @@ -1791,7 +1792,7 @@ 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 @@ -1823,7 +1824,7 @@ static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"A context for the solution of Chinese Remainder Theorem problems.", + "MPCRT(SEQ): a context for solving Chinese Remainder Theorem problems.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1831,9 +1832,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@ */ @@ -1883,9 +1884,9 @@ static PyObject *gf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) mp *z; mp_pyobj *zz = 0; int radix = 0; - char *kwlist[] = { "x", "radix", 0 }; + static const char *const kwlist[] = { "x", "radix", 0 }; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|i:gf", kwlist, &x, &radix)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|i:gf", KWLIST, &x, &radix)) goto end; if (GF_PYCHECK(x)) RETURN_OBJ(x); if (!good_radix_p(radix, 1)) VALERR("radix out of range"); @@ -1992,7 +1993,7 @@ static PyObject *gfmeth_irreduciblep(PyObject *me, PyObject *arg) 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 @@ -2003,15 +2004,14 @@ 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") 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 (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") #undef METHNAME @@ -2019,16 +2019,16 @@ static PyMethodDef gf_pymethods[] = { KWMETH(tostring, "X.tostring([radix = 10]) -> STR") KWMETH(storel, "X.storel([len = -1]) -> little-endian bytes") KWMETH(storeb, "X.storeb([len = -1]) -> big-endian bytes") - KWMETH(storel2c, - "X.storel2c([len = -1]) -> little-endian bytes, two's complement") - KWMETH(storeb2c, - "X.storeb2c([len = -1]) -> big-endian bytes, two's complement") + KWMETH(storel2c, "X.storel2c([len = -1]) -> " + "little-endian bytes, two's complement") + KWMETH(storeb2c, "X.storeb2c([len = -1]) -> " + "big-endian bytes, two's complement") METH (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@ */ @@ -2083,7 +2083,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@ */ @@ -2097,21 +2097,21 @@ static PyTypeObject gf_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"Binary polynomials. Support almost all the standard arithmetic\n\ -operations.\n\ -\n\ -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\ -points, group elements, Python `int' and `long' objects, and anything\n\ -with an 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\ -\n\ -Notes:\n\ -\n\ - * Use `//' for division. GFs don't have `/' division.", + "Binary polynomials. Support almost all the standard arithmetic\n" + "operations.\n" + "\n" + "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" + "points, group elements, Python `int' and `long' objects, and anything\n" + "with an 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" + "\n" + "Notes:\n" + "\n" + " * Use `//' for Euclidean division: `/' gives exact rational division.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -2119,9 +2119,9 @@ Notes:\n\ 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@ */ @@ -2143,10 +2143,10 @@ static PyObject *meth__GF_fromstring(PyObject *me, PyObject *z = 0; mp *zz; mptext_stringctx sc; - char *kwlist[] = { "class", "x", "radix", 0 }; + static const char *const kwlist[] = { "class", "x", "radix", 0 }; if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|i:fromstring", - kwlist, &me, &p, &len, &r)) + KWLIST, &me, &p, &len, &r)) goto end; if (!good_radix_p(r, 1)) VALERR("bad radix"); sc.buf = p; sc.lim = p + len; @@ -2261,10 +2261,10 @@ static PyObject *gfreduce_pynew(PyTypeObject *ty, { gfreduce_pyobj *mr = 0; gfreduce r; - char *kwlist[] = { "m", 0 }; + static const char *const kwlist[] = { "m", 0 }; mp *xx = 0; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", kwlist, convgf, &xx)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convgf, &xx)) goto end; if (MP_ZEROP(xx)) ZDIVERR("modulus is zero!"); gfreduce_create(&r, xx); @@ -2278,18 +2278,18 @@ 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}}") - METH (halftrace, "R.halftrace(X) -> x + x^{2^2} + ... + x^{2^{m - 1}}") + METH (halftrace, "R.halftrace(X) -> x + x^{2^2} + ... + x^{2^{m - 1}}") METH (sqrt, "R.sqrt(X) -> Y where Y^2 = X mod R") METH (quadsolve, "R.quadsolve(X) -> Y where Y^2 + Y = X mod R") METH (exp, "R.exp(X, N) -> X^N mod B.m") @@ -2322,7 +2322,7 @@ static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"A reduction context for reduction modulo sparse irreducible polynomials.", + "GFReduce(N): a context for reduction modulo sparse polynomials.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -2330,9 +2330,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@ */ @@ -2363,9 +2363,9 @@ static PyObject *gfn_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { mp *p = 0, *beta = 0; gfn_pyobj *gg = 0; - char *kwlist[] = { "p", "beta", 0 }; + static const char *const kwlist[] = { "p", "beta", 0 }; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&:new", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&:new", KWLIST, convgf, &p, convgf, &beta)) goto end; gg = PyObject_New(gfn_pyobj, ty); @@ -2403,7 +2403,7 @@ static PyObject *gfnget_beta(PyObject *me, void *hunoz) end: \ mp_drop(xx); \ if (!z) return (0); \ - return (mp_pywrap(z)); \ + return (gf_pywrap(z)); \ } XFORMOP(pton, PTON) XFORMOP(ntop, NTOP) @@ -2419,7 +2419,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 +2427,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") @@ -2460,8 +2460,8 @@ static PyTypeObject gfn_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"An object for transforming elements of binary fields between polynomial\n\ -and normal basis representations.", + "GFN(P, BETA): an object for transforming elements of binary fields\n" + " between polynomial and normal basis representations.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -2469,9 +2469,9 @@ and normal basis representations.", 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,40 +2486,28 @@ and normal basis representations.", /*----- Glue --------------------------------------------------------------*/ -static PyMethodDef methods[] = { +static const PyMethodDef methods[] = { #define METHNAME(func) meth_##func - KWMETH(_MP_fromstring, "\ -fromstring(STR, [radix = 0]) -> (X, REST)\n\ -\n\ -Parse STR as a large integer, according to radix. If radix is zero,\n\ -read a prefix from STR to decide radix: allow `0' for octal, `0x' for hex\n\ -or `R_' for other radix R.") - KWMETH(_GF_fromstring, "\ -fromstring(STR, [radix = 0]) -> (X, REST)\n\ -\n\ -Parse STR as a binary polynomial, according to radix. If radix is zero,\n\ -read a prefix from STR to decide radix: allow `0' for octal, `0x' for hex\n\ -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") + 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 { 0 } };