*.c: Rearrange and reformat the class methods.

[catacomb-python] / rand.c

diff --git a/rand.c b/rand.c
index 12ba834..a0d9969 100644 (file)
--- a/rand.c
+++ b/rand.c
@@ -259,7 +259,7 @@ static PyObject *grget_name(PyObject *me, void *hunoz)
 static PyObject *grget_cryptop(PyObject *me, void *hunoz)
   { return (grand_check(me) ? 0 : getbool(GRAND_R(me)->ops->f & GRAND_CRYPTO)); }
 
-static PyGetSetDef grand_pygetset[] = {
+static const PyGetSetDef grand_pygetset[] = {
 #define GETSETNAME(op, name) gr##op##_##name
   GET  (name,          "R.name -> name of this kind of generator")
   GET  (cryptop,       "R.cryptop -> flag: cryptographically strong?")
@@ -267,7 +267,7 @@ static PyGetSetDef grand_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef grand_pymethods[] = {
+static const PyMethodDef grand_pymethods[] = {
 #define METHNAME(name) grmeth_##name
   METH (byte,          "R.byte() -> BYTE")
   METH (word,          "R.word() -> WORD")
@@ -317,9 +317,9 @@ static PyTypeObject grand_pytype_skel = {
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
-  grand_pymethods,                     /* @tp_methods@ */
+  PYMETHODS(grand),                    /* @tp_methods@ */
   0,                                   /* @tp_members@ */
-  grand_pygetset,                      /* @tp_getset@ */
+  PYGETSET(grand),                     /* @tp_getset@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */
@@ -518,7 +518,7 @@ end:
   return (rc);
 }
 
-static PyMethodDef truerand_pymethods[] = {
+static const PyMethodDef truerand_pymethods[] = {
 #define METHNAME(name) trmeth_##name
   METH (gate,          "R.gate()")
   METH (stretch,       "R.stretch()")
@@ -536,7 +536,7 @@ static PyObject *trget_goodbits(PyObject *me, void *hunoz)
   return (PyInt_FromLong(r->ops->misc(r, RAND_GOODBITS)));
 }
 
-static PyGetSetDef truerand_pygetset[] = {
+static const PyGetSetDef truerand_pygetset[] = {
 #define GETSETNAME(op, name) tr##op##_##name
   GET  (goodbits,      "R.goodbits -> good bits of entropy remaining")
 #undef GETSETNAME
@@ -576,9 +576,9 @@ static PyTypeObject truerand_pytype_skel = {
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
-  truerand_pymethods,                  /* @tp_methods@ */
+  PYMETHODS(truerand),                 /* @tp_methods@ */
   0,                                   /* @tp_members@ */
-  truerand_pygetset,                   /* @tp_getset@ */
+  PYGETSET(truerand),                  /* @tp_getset@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */
@@ -776,7 +776,7 @@ static PyObject *gclrmeth_seek(PyObject *me, PyObject *arg)
   RETURN_ME;
 }
 
-static PyGetSetDef gccrand_pygetset[] = {
+static const PyGetSetDef gccrand_pygetset[] = {
 #define GETSETNAME(op, name) gccr##op##_##name
   GET  (keysz,         "CR.keysz -> acceptable key sizes")
   GET  (name,          "CR.name -> name of this kind of generator")
@@ -784,7 +784,7 @@ static PyGetSetDef gccrand_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef gclatinrand_pymethods[] = {
+static const PyMethodDef gclatinrand_pymethods[] = {
 #define METHNAME(name) gclrmeth_##name
   METH (tell,          "R.tell() -> OFF")
   METH (seek,          "R.seek(OFF)")
@@ -827,7 +827,7 @@ static PyTypeObject gccrand_pytype_skel = {
   0,                                   /* @tp_iternext@ */
   0,                                   /* @tp_methods@ */
   0,                                   /* @tp_members@ */
-  gccrand_pygetset,                    /* @tp_getset@ */
+  PYGETSET(gccrand),                   /* @tp_getset@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */
@@ -921,7 +921,7 @@ static PyTypeObject gclatinrand_pytype_skel = {
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
-  gclatinrand_pymethods,               /* @tp_methods@ */
+  PYMETHODS(gclatinrand),              /* @tp_methods@ */
   0,                                   /* @tp_members@ */
   0,                                   /* @tp_getset@ */
   0,                                   /* @tp_base@ */
@@ -1161,7 +1161,7 @@ static PyObject *drget_seed(PyObject *me, void *hunoz)
   return (rc);
 }
 
-static PyGetSetDef dsarand_pygetset[] = {
+static const PyGetSetDef dsarand_pygetset[] = {
 #define GETSETNAME(op, name) dr##op##_##name
   GET  (seed,          "R.seed -> current generator seed")
 #undef GETSETNAME
@@ -1203,7 +1203,7 @@ static PyTypeObject dsarand_pytype_skel = {
   0,                                   /* @tp_iternext@ */
   0,                                   /* @tp_methods@ */
   0,                                   /* @tp_members@ */
-  dsarand_pygetset,                    /* @tp_getset@ */
+  PYGETSET(dsarand),                   /* @tp_getset@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */
@@ -1282,7 +1282,7 @@ static PyObject *bbsget_stepsz(PyObject *me, void *hunoz)
   return (PyInt_FromLong(r->ops->misc(r, BBS_STEPSZ)));
 }
 
-static PyMethodDef bbs_pymethods[] = {
+static const PyMethodDef bbs_pymethods[] = {
 #define METHNAME(name) bbsmeth_##name
   METH (step,          "R.step(): steps the generator (not useful)")
   METH (bits,   "R.bits(N) -> W: returns N bits (<= 32) from the generator")
@@ -1291,7 +1291,7 @@ static PyMethodDef bbs_pymethods[] = {
   { 0 }
 };
 
-static PyGetSetDef bbs_pygetset[] = {
+static const PyGetSetDef bbs_pygetset[] = {
 #define GETSETNAME(op, name) bbs##op##_##name
   GET  (n,             "R.n -> Blum modulus")
   GETSET(x,            "R.x -> current seed value")
@@ -1333,9 +1333,9 @@ static PyTypeObject bbs_pytype_skel = {
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
-  bbs_pymethods,                       /* @tp_methods@ */
+  PYMETHODS(bbs),                      /* @tp_methods@ */
   0,                                   /* @tp_members@ */
-  bbs_pygetset,                                /* @tp_getset@ */
+  PYGETSET(bbs),                       /* @tp_getset@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */
@@ -1444,7 +1444,7 @@ static PyObject *bpget_p(PyObject *me, void *hunoz)
 static PyObject *bpget_q(PyObject *me, void *hunoz)
   { return (mp_pywrap(MP_COPY(BBSPRIV_BP(me)->q))); }
 
-static PyMethodDef bbspriv_pymethods[] = {
+static const PyMethodDef bbspriv_pymethods[] = {
 #define METHNAME(name) bpmeth_##name
   METH (ff,            "R.ff(N): fast-forward N places")
   METH (rew,           "R.rew(N): rewind N places")
@@ -1452,7 +1452,7 @@ static PyMethodDef bbspriv_pymethods[] = {
   { 0 }
 };
 
-static PyGetSetDef bbspriv_pygetset[] = {
+static const PyGetSetDef bbspriv_pygetset[] = {
 #define GETSETNAME(op, name) bp##op##_##name
   GET  (n,             "R.n -> Blum modulus")
   GET  (p,             "R.p -> one of the factors of the modulus")
@@ -1495,9 +1495,9 @@ static PyTypeObject bbspriv_pytype_skel = {
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
-  bbspriv_pymethods,                   /* @tp_methods@ */
+  PYMETHODS(bbspriv),                  /* @tp_methods@ */
   0,                                   /* @tp_members@ */
-  bbspriv_pygetset,                    /* @tp_getset@ */
+  PYGETSET(bbspriv),                   /* @tp_getset@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */
@@ -1512,7 +1512,7 @@ static PyTypeObject bbspriv_pytype_skel = {
 
 /*----- Global stuff ------------------------------------------------------*/
 
-static PyMethodDef methods[] = {
+static const PyMethodDef methods[] = {
 #define METHNAME(name) meth_##name
   KWMETH(_BBSPriv_generate, "generate(NBITS, [event = pgen_nullev], "
                              "[rng = rand], [nsteps = 0], [seed = 2]) -> R")