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:
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)
+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);
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;
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;
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); \
+ if (!PyArg_ParseTuple(arg, "s#:" #name, &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)
+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)
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)")
"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 }
};
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;
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 }
};
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)
{
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;
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;
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)); }
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")
"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 }
};
/*----- 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
- { 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