*.c: Use Python `METH_NOARGS' methods where applicable.

[catacomb-python] / field.c

diff --git a/field.c b/field.c
index 8091843..987b47d 100644 (file)
--- a/field.c
+++ b/field.c
@@ -280,10 +280,9 @@ static void fe_pydealloc(PyObject *me)
 }
 
 #define UNOP(name, check)                                              \
-  static PyObject *femeth_##name(PyObject *me, PyObject *arg) {                \
+  static PyObject *femeth_##name(PyObject *me) {                       \
     field *f = FE_F(me);                                               \
     mp *x = FE_X(me);                                                  \
-    if (!PyArg_ParseTuple(arg, ":" #name)) return (0);                 \
     if (!f->ops->name) TYERR(#name " not supported for this field");   \
     check                                                              \
     x = f->ops->name(f, MP_NEW, x);                                    \
@@ -335,14 +334,14 @@ static const PyGetSetDef fe_pygetset[] = {
 
 static const PyMethodDef fe_pymethods[] = {
 #define METHNAME(func) femeth_##func
-  METH (inv,           "X.inv() -> X^{-1}")
-  METH (sqr,           "X.sqr() -> X^2")
-  METH (sqrt,          "X.sqrt() -> sqrt(X)")
-  METH (quadsolve,     "X.quadsolve() -> Y where Y^2 + Y = X (binary only)")
-  METH (dbl,           "X.dbl() -> 2 * X (prime only)")
-  METH (tpl,           "X.tpl() -> 3 * X (prime only)")
-  METH (qdl,           "X.qdl() -> 4 * X (prime only)")
-  METH (hlv,           "X.hlv() -> X/2 (prime only)")
+  NAMETH(inv,          "X.inv() -> X^{-1}")
+  NAMETH(sqr,          "X.sqr() -> X^2")
+  NAMETH(sqrt,         "X.sqrt() -> sqrt(X)")
+  NAMETH(quadsolve,    "X.quadsolve() -> Y where Y^2 + Y = X (binary only)")
+  NAMETH(dbl,          "X.dbl() -> 2 * X (prime only)")
+  NAMETH(tpl,          "X.tpl() -> 3 * X (prime only)")
+  NAMETH(qdl,          "X.qdl() -> 4 * X (prime only)")
+  NAMETH(hlv,          "X.hlv() -> X/2 (prime only)")
 #undef METHNAME
   { 0 }
 };
@@ -472,6 +471,21 @@ static PyObject *fmeth__adopt(PyObject *me, PyObject *arg)
   return (fe_pywrap(me, xx));
 }
 
+static PyObject *fmeth_parse(PyObject *me, PyObject *arg)
+{
+  field *f;
+  char *p;
+  PyObject *rc = 0;
+  qd_parse qd;
+
+  if (!PyArg_ParseTuple(arg, "s:parse", &p)) goto end;
+  qd.p = p; qd.e = 0;
+  if ((f = field_parse(&qd)) == 0) VALERR(qd.e);
+  rc = Py_BuildValue("(Ns)", field_pywrap(f), qd.p);
+end:
+  return (rc);
+}
+
 static void field_pydealloc(PyObject *me)
 {
   F_DESTROY(FIELD_F(me));
@@ -516,6 +530,7 @@ static const PyMethodDef field_pymethods[] = {
 #define METHNAME(name) fmeth_##name
   METH (_adopt,        "F._adopt(X) -> FE")
   KWMETH(rand,         "F.rand([rng = rand]) -> FE, uniformly distributed")
+  SMTH (parse,         "parse(STR) -> F, REST")
 #undef METHNAME
   { 0 }
 };
@@ -924,31 +939,6 @@ static PyTypeObject binnormfield_pytype_skel = {
 
 /*----- Setup -------------------------------------------------------------*/
 
-static PyObject *meth__Field_parse(PyObject *me, PyObject *arg)
-{
-  field *f;
-  char *p;
-  PyObject *rc = 0;
-  qd_parse qd;
-
-  if (!PyArg_ParseTuple(arg, "Os:parse", &me, &p))
-    goto end;
-  qd.p = p;
-  qd.e = 0;
-  if ((f = field_parse(&qd)) == 0)
-    VALERR(qd.e);
-  rc = Py_BuildValue("(Ns)", field_pywrap(f), qd.p);
-end:
-  return (rc);
-}
-
-static const PyMethodDef methods[] = {
-#define METHNAME(func) meth_##func
-  METH (_Field_parse,  "parse(STR) -> F, REST")
-#undef METHNAME
-  { 0 }
-};
-
 void field_pyinit(void)
 {
   INITTYPE(fe, root);
@@ -958,7 +948,6 @@ void field_pyinit(void)
   INITTYPE(binfield, field);
   INITTYPE(binpolyfield, binfield);
   INITTYPE(binnormfield, binfield);
-  addmethods(methods);
 }
 
 void field_pyinsert(PyObject *mod)