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; \
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), \
end: \
return (rc); \
}
-BUFOP(mp, MP)
-BUFOP(gf, GF)
+BUFOP(mp)
+BUFOP(gf)
#undef BUFOP
static PyObject *mpmeth_tobuf(PyObject *me, PyObject *arg)
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)))); }
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")
{ 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")
KWMETH(storeb2c, "X.storeb2c([len = -1]) -> "
"big-endian bytes, two's complement")
METH (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@ */
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@ */
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@ */
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 ----------------------------------------*/
typedef struct mpmul_pyobj {
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")
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@ */
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")
{ 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")
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@ */
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")
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@ */
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")
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@ */
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")
{ 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, /* @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@ */
return (z);
}
+static PyObject *gfmeth_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 ||
+ 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, PyObject *arg)
{
if (!PyArg_ParseTuple(arg, ":irreduciblep")) return (0);
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
{ 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 (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")
+ 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")
{ 0 }
};
-static PyNumberMethods gf_pynumber = {
+static const PyNumberMethods gf_pynumber = {
gf_pyadd, /* @nb_add@ */
gf_pysub, /* @nb_subtract@ */
gf_pymul, /* @nb_multiply@ */
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@ */
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@ */
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 ---------------------------------------------*/
typedef struct gfreduce_pyobj {
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}}")
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@ */
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")
{ 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")
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@ */
/*----- 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
- { 0 }
-};
-
void mp_pyinit(void)
{
INITTYPE(mp, root);
INITTYPE(mpcrt, root);
INITTYPE(gfreduce, root);
INITTYPE(gfn, root);
- addmethods(methods);
}
void mp_pyinsert(PyObject *mod)
~mdw / catacomb-python / blobdiff