X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/27cbcf9d360a7b25e54c4e268db5889246015440..1d460442e7cc36ea3ddebdd8746888afd7999307:/mp.c

diff --git a/mp.c b/mp.c
index b4e65cb..fe5e7dc 100644
--- a/mp.c
+++ b/mp.c
@@ -33,6 +33,17 @@
 PyTypeObject *mp_pytype = 0;
 PyTypeObject *gf_pytype = 0;
 
+#ifndef PyLong_SHIFT
+#  define PyLong_SHIFT SHIFT
+#endif
+
+#ifndef PyLong_MASK
+#  define PyLong_MASK MASK
+#endif
+
+STATIC_ASSERT(MPW_BITS >= PyLong_SHIFT,
+	      "Catacomb's limbs are now narrower than than Python's!");
+
 mp *mp_frompylong(PyObject *obj)
 {
   unsigned long bits;
@@ -45,16 +56,15 @@ mp *mp_frompylong(PyObject *obj)
   mp *x;
   mpw *p;
 
-  sz = l->ob_size;
+  sz = Py_SIZE(l);
   if (sz < 0) sz = -sz;
-  assert(MPW_BITS >= SHIFT);
-  bits = (unsigned long)sz * SHIFT;
+  bits = (unsigned long)sz * PyLong_SHIFT;
   w = (bits + MPW_BITS - 1)/MPW_BITS;
-  x = mp_new(w, l->ob_size < 0 ? MP_NEG : 0);
+  x = mp_new(w, Py_SIZE(l) < 0 ? MP_NEG : 0);
   p = x->v;
   for (i = 0; i < sz; i++) {
     r |= (mpd)l->ob_digit[i] << b;
-    b += SHIFT;
+    b += PyLong_SHIFT;
     while (b >= MPW_BITS) {
       *p++ = MPW(r);
       r >>= MPW_BITS;
@@ -73,28 +83,27 @@ mp *mp_frompylong(PyObject *obj)
 PyObject *mp_topylong(mp *x)
 {
   unsigned long bits = mp_bits(x);
-  int sz = (bits + SHIFT - 1)/SHIFT;
+  int sz = (bits + PyLong_SHIFT - 1)/PyLong_SHIFT;
   PyLongObject *l = _PyLong_New(sz);
   mpd r = 0;
   int b = 0;
   mpw *p = x->v;
   int i = 0;
 
-  assert(MPW_BITS >= SHIFT);
   while (i < sz && p < x->vl) {
     r |= (mpd)*p++ << b;
     b += MPW_BITS;
-    while (i < sz && b >= SHIFT) {
-      l->ob_digit[i++] = r & MASK;
-      r >>= SHIFT;
-      b -= SHIFT;
+    while (i < sz && b >= PyLong_SHIFT) {
+      l->ob_digit[i++] = r & PyLong_MASK;
+      r >>= PyLong_SHIFT;
+      b -= PyLong_SHIFT;
     }
   }
   while (i < sz && r) {
-    l->ob_digit[i++] = r & MASK;
-    r >>= SHIFT;
+    l->ob_digit[i++] = r & PyLong_MASK;
+    r >>= PyLong_SHIFT;
   }
-  l->ob_size = (x->f & MP_NEG) ? -sz : sz;
+  Py_SIZE(l) = (x->f & MP_NEG) ? -sz : sz;
   return ((PyObject *)l);
 }
 
@@ -102,11 +111,11 @@ mp *mp_frompyobject(PyObject *o, int radix)
 {
   mp *x;
 
-  if (PyString_Check(o)) {
+  if (TEXT_CHECK(o)) {
     mptext_stringctx sc;
     mp *x;
-    sc.buf = PyString_AS_STRING(o);
-    sc.lim = sc.buf + PyString_GET_SIZE(o);
+    size_t sz;
+    TEXT_PTRLEN(o, sc.buf, sz); sc.lim = sc.buf + sz;
     x = mp_read(MP_NEW, radix, &mptext_stringops, &sc);
     if (!x) return (0);
     if (sc.buf < sc.lim) { MP_DROP(x); return (0); }
@@ -128,8 +137,7 @@ PyObject *mp_topystring(mp *x, int radix, const char *xpre,
   size_t postlen = post ? strlen(post) : 0;
   char *p;
   MP_COPY(x);
-  o = PyString_FromStringAndSize(0, len + 1 + xprelen + prelen + postlen);
-  p = PyString_AS_STRING(o);
+  TEXT_PREPAREWRITE(o, p, len + 1 + xprelen + prelen + postlen);
   sc.buf = p;
   if (xpre) { memcpy(sc.buf, xpre, xprelen); sc.buf += xprelen; }
   if (MP_NEGP(x)) { *sc.buf++ = '-'; x = mp_neg(x, x); }
@@ -138,7 +146,7 @@ PyObject *mp_topystring(mp *x, int radix, const char *xpre,
   mp_write(x, radix, &mptext_stringops, &sc);
   if (post) { memcpy(sc.buf, post, postlen); sc.buf += postlen; }
   MP_DROP(x);
-  _PyString_Resize(&o, sc.buf - p);
+  TEXT_DONEWRITE(o, sc.buf - p);
   return (o);
 }
 
@@ -238,7 +246,7 @@ mp *getmp(PyObject *o)
   if (!o) return (0);
   if ((x = tomp(o)) == 0) {
     PyErr_Format(PyExc_TypeError, "can't convert %.100s to mp",
-		 o->ob_type->tp_name);
+		 Py_TYPE(o)->tp_name);
   }
   return (x);
 }
@@ -257,7 +265,7 @@ mp *getgf(PyObject *o)
   if (!o) return (0);
   if ((x = tomp(o)) == 0) {
     PyErr_Format(PyExc_TypeError, "can't convert %.100s to gf",
-		 o->ob_type->tp_name);
+		 Py_TYPE(o)->tp_name);
   }
   return (x);
 }
@@ -536,7 +544,7 @@ static PyObject *mp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   if (!good_radix_p(radix, 1)) VALERR("bad radix");
   if ((z = mp_frompyobject(x, radix)) == 0) {
     PyErr_Format(PyExc_TypeError, "can't convert %.100s to mp",
-		 x->ob_type->tp_name);
+		 Py_TYPE(x)->tp_name);
     goto end;
   }
   zz = (mp_pyobj *)ty->tp_alloc(ty, 0);
@@ -545,14 +553,14 @@ end:
   return ((PyObject *)zz);
 }
 
-long mphash(mp *x)
+Py_hash_t mphash(mp *x)
 {
   PyObject *l = mp_topylong(x);
-  long h = PyObject_Hash(l);
+  Py_hash_t h = PyObject_Hash(l);
   Py_DECREF(l); return (h);
 }
 
-static long mp_pyhash(PyObject *me) { return (mphash(MP_X(me))); }
+static Py_hash_t mp_pyhash(PyObject *me) { return (mphash(MP_X(me))); }
 
 static PyObject *mpmeth_jacobi(PyObject *me, PyObject *arg)
 {
@@ -593,25 +601,20 @@ static PyObject *gfmeth_testbit(PyObject *me, PyObject *arg)
   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:
@@ -703,7 +706,7 @@ end:
 				 PyObject *arg, PyObject *kw)		\
   {									\
     long len = -1;							\
-    static const char *const kwlist[] = { "len", 0 };					\
+    static const char *const kwlist[] = { "len", 0 };			\
     PyObject *rc = 0;							\
 									\
     if (!PyArg_ParseTupleAndKeywords(arg, kw, "|l:" #name,		\
@@ -714,7 +717,7 @@ end:
       if (!len) len = 1;						\
     }									\
     rc = bytestring_pywrap(0, len);					\
-    mp_##name(MP_X(me), PyString_AS_STRING(rc), len);			\
+    mp_##name(MP_X(me), BIN_PTR(rc), len);				\
   end:									\
     return (rc);							\
   }
@@ -724,42 +727,40 @@ STOREOP(storel2c, 2c)
 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;								\
-    Py_ssize_t sz;							\
+    struct bin in;							\
     PyObject *rc = 0;							\
     mp *x;								\
 									\
-    if (!PyArg_ParseTuple(arg, "Os#:frombuf", &me, &p, &sz)) goto end;	\
-    buf_init(&b, p, sz);						\
+    if (!PyArg_ParseTuple(arg, "O&:frombuf", convbin, &in)) goto end;	\
+    buf_init(&b, (/*unconst*/ void *)in.p, in.sz);			\
     if ((x = buf_getmp(&b)) == 0) VALERR("malformed data");		\
     rc = Py_BuildValue("(NN)", ty##_pywrap(x),				\
 		       bytestring_pywrapbuf(&b));			\
   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);
-  buf_init(&b, PyString_AS_STRING(rc), n);
+  buf_init(&b, BIN_PTR(rc), n);
   buf_putmp(&b, x);
   assert(BOK(&b));
-  _PyString_Resize(&rc, BLEN(&b));
+  BIN_SETLEN(rc, BLEN(&b));
   return (rc);
 }
 
@@ -776,8 +777,8 @@ end:
   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;
@@ -785,10 +786,10 @@ static PyObject *meth__MP_fromstring(PyObject *me,
   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;
@@ -800,38 +801,37 @@ end:
   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); \
-    return (pre##_pywrap(mp_##name(MP_NEW, p, len)));			\
+    struct bin in;							\
+    if (!PyArg_ParseTuple(arg, "O&:" #name, convbin, &in)) return (0);	\
+    return (pre##_pywrap(mp_##name(MP_NEW, in.p, in.sz)));		\
   }
-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)
@@ -858,9 +858,9 @@ static const PyMethodDef mp_pymethods[] = {
   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)")
@@ -876,7 +876,20 @@ static const PyMethodDef mp_pymethods[] = {
 				     "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 }
 };
@@ -924,8 +937,8 @@ static const PyNumberMethods mp_pynumber = {
   0,					/* @nb_inplace_true_divide@ */
 };
 
-static PyTypeObject mp_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mp_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MP",					/* @tp_name@ */
   sizeof(mp_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -988,6 +1001,8 @@ static PyTypeObject mp_pytype_skel = {
 
 /*----- Products of small integers ----------------------------------------*/
 
+static PyTypeObject *mpmul_pytype;
+
 typedef struct mpmul_pyobj {
   PyObject_HEAD
   int livep;
@@ -1034,11 +1049,10 @@ end:
   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;
@@ -1077,13 +1091,13 @@ static const PyGetSetDef mpmul_pygetset[] = {
 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 }
 };
 
-static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mpmul_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPMul",				/* @tp_name@ */
   sizeof(mpmul_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1132,6 +1146,8 @@ static PyTypeObject *mpmul_pytype, mpmul_pytype_skel = {
 
 /*----- Montgomery reduction ----------------------------------------------*/
 
+static PyTypeObject *mpmont_pytype;
+
 typedef struct mpmont_pyobj {
   PyObject_HEAD
   mpmont mm;
@@ -1349,8 +1365,8 @@ static const PyMethodDef mpmont_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mpmont_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPMont",				/* @tp_name@ */
   sizeof(mpmont_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1399,6 +1415,8 @@ static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = {
 
 /*----- Barrett reduction -------------------------------------------------*/
 
+static PyTypeObject *mpbarrett_pytype;
+
 typedef struct mpbarrett_pyobj {
   PyObject_HEAD
   mpbarrett mb;
@@ -1488,8 +1506,8 @@ static const PyMethodDef mpbarrett_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mpbarrett_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPBarrett",				/* @tp_name@ */
   sizeof(mpbarrett_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1538,6 +1556,8 @@ static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = {
 
 /*----- Nice prime reduction ----------------------------------------------*/
 
+static PyTypeObject *mpreduce_pytype;
+
 typedef struct mpreduce_pyobj {
   PyObject_HEAD
   mpreduce mr;
@@ -1616,8 +1636,8 @@ static const const PyMethodDef mpreduce_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mpreduce_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPReduce",				/* @tp_name@ */
   sizeof(mpreduce_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1666,6 +1686,8 @@ static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = {
 
 /*----- Chinese Remainder Theorem solution --------------------------------*/
 
+static PyTypeObject *mpcrt_pytype;
+
 typedef struct mpcrt_pyobj {
   PyObject_HEAD
   mpcrt c;
@@ -1798,8 +1820,8 @@ static const PyMethodDef mpcrt_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject mpcrt_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPCRT",				/* @tp_name@ */
   sizeof(mpcrt_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1891,7 +1913,7 @@ static PyObject *gf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   if (!good_radix_p(radix, 1)) VALERR("radix out of range");
   if ((z = mp_frompyobject(x, radix)) == 0) {
     PyErr_Format(PyExc_TypeError, "can't convert %.100s to gf",
-		 x->ob_type->tp_name);
+		 Py_TYPE(x)->tp_name);
     goto end;
   }
   if (MP_NEGP(z)) {
@@ -1935,11 +1957,8 @@ end:
   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)
 {
@@ -1983,8 +2002,8 @@ end:
   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;
@@ -1992,10 +2011,10 @@ static PyObject *meth__GF_fromstring(PyObject *me,
   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;
@@ -2010,11 +2029,8 @@ end:
   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)); }
@@ -2035,11 +2051,18 @@ static const PyMethodDef gf_pymethods[] = {
   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")
@@ -2049,7 +2072,7 @@ static const PyMethodDef gf_pymethods[] = {
 				     "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 }
 };
@@ -2097,8 +2120,8 @@ static const PyNumberMethods gf_pynumber = {
   0,					/* @nb_inplace_true_divide@ */
 };
 
-static PyTypeObject gf_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gf_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GF",					/* @tp_name@ */
   sizeof(mp_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2162,6 +2185,8 @@ static PyTypeObject gf_pytype_skel = {
 
 /*----- Sparse poly reduction ---------------------------------------------*/
 
+static PyTypeObject *gfreduce_pytype;
+
 typedef struct gfreduce_pyobj {
   PyObject_HEAD
   gfreduce mr;
@@ -2296,8 +2321,8 @@ static const PyMethodDef gfreduce_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gfreduce_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GFReduce",				/* @tp_name@ */
   sizeof(gfreduce_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2346,14 +2371,14 @@ static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = {
 
 /*----- Normal/poly transformation ----------------------------------------*/
 
+static PyTypeObject *gfn_pytype;
+
 typedef struct gfn_pyobj {
   PyObject_HEAD
   mp *p;
   gfn ntop, pton;
 } gfn_pyobj;
 
-static PyTypeObject *gfn_pytype, gfn_pytype_skel;
-
 #define GFN_P(o) (((gfn_pyobj *)(o))->p)
 #define GFN_PTON(o) (&((gfn_pyobj *)(o))->pton)
 #define GFN_NTOP(o) (&((gfn_pyobj *)(o))->ntop)
@@ -2434,8 +2459,8 @@ static const PyMethodDef gfn_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject gfn_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gfn_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GFN",				/* @tp_name@ */
   sizeof(gfn_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2485,29 +2510,8 @@ static PyTypeObject gfn_pytype_skel = {
 
 /*----- 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
+static const struct nameval consts[] = {
+  CONST(MPW_MAX),
   { 0 }
 };
 
@@ -2522,7 +2526,6 @@ void mp_pyinit(void)
   INITTYPE(mpcrt, root);
   INITTYPE(gfreduce, root);
   INITTYPE(gfn, root);
-  addmethods(methods);
 }
 
 void mp_pyinsert(PyObject *mod)
@@ -2536,6 +2539,7 @@ void mp_pyinsert(PyObject *mod)
   INSERT("GF", gf_pytype);
   INSERT("GFReduce", gfreduce_pytype);
   INSERT("GFN", gfn_pytype);
+  setconstants(mod, consts);
 }
 
 /*----- That's all, folks -------------------------------------------------*/