X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/b16009b07a50a62a03e7a7c781e9d777ba4450ad..2aa7d3a9238bfb3d117ca23191ea402c5c5d6f40:/pgen.c

diff --git a/pgen.c b/pgen.c
index 6e9584c..777ec32 100644
--- a/pgen.c
+++ b/pgen.c
@@ -195,8 +195,8 @@ static const PyNumberMethods pfilt_pynumber = {
   0,					/* @nb_inplace_true_divide@ */
 };
 
-static PyTypeObject pfilt_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject pfilt_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeFilter",			/* @tp_name@ */
   sizeof(pfilt_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -329,8 +329,8 @@ static const PyMethodDef rabin_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject rabin_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject rabin_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "RabinMiller",			/* @tp_name@ */
   sizeof(rabin_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -419,7 +419,7 @@ static void pgevent_pydealloc(PyObject *me)
 } while (0)
 
 static PyObject *peget_name(PyObject *me, void *hunoz)
-  { PGEVENT_CHECK(me); return (PyString_FromString(PGEVENT_EV(me)->name)); }
+  { PGEVENT_CHECK(me); return (TEXT_FROMSTR(PGEVENT_EV(me)->name)); }
 
 static PyObject *peget_x(PyObject *me, void *hunoz)
   { PGEVENT_CHECK(me); return (mp_pywrap(MP_COPY(PGEVENT_EV(me)->m))); }
@@ -466,8 +466,8 @@ static const PyGetSetDef pgevent_pygetset[] = {
   { 0 }
 };
 
-static PyTypeObject pgevent_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject pgevent_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeGenEvent",			/* @tp_name@ */
   sizeof(pgevent_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -645,8 +645,8 @@ static const PyMethodDef pgev_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject pgev_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject pgev_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeGenBuiltinHandler",		/* @tp_name@ */
   sizeof(pgev_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -719,8 +719,8 @@ static const PyGetSetDef pgstep_pygetset[] = {
   { 0 }
 };
 
-static PyTypeObject pgstep_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject pgstep_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeGenStepper",			/* @tp_name@ */
   sizeof(pgstep_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -801,8 +801,8 @@ static const PyGetSetDef pgjump_pygetset[] = {
   { 0 }
 };
 
-static PyTypeObject pgjump_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject pgjump_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeGenJumper",			/* @tp_name@ */
   sizeof(pgjump_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -863,8 +863,8 @@ end:
   return ((PyObject *)rc);
 }
 
-static PyTypeObject pgtest_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject pgtest_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeGenTester",			/* @tp_name@ */
   sizeof(pgtest_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1051,6 +1051,12 @@ end:
 
 /*----- Global stuff ------------------------------------------------------*/
 
+static const struct nameval consts[] = {
+  CONST(PGEN_PASS), CONST(PGEN_FAIL), CONST(PGEN_BEGIN), CONST(PGEN_TRY),
+  CONST(PGEN_DONE), CONST(PGEN_ABORT),
+  { 0 }
+};
+
 static const PyMethodDef methods[] = {
 #define METHNAME(name) meth_##name
   KWMETH(pgen,
@@ -1098,6 +1104,7 @@ void pgen_pyinsert(PyObject *mod)
   INSERT("pgen_stdev", pgev_stdev(pgen_ev));
   INSERT("pgen_spinev", pgev_stdev(pgen_evspin));
   INSERT("pgen_subev", pgev_stdev(pgen_subev));
+  setconstants(mod, consts);
 }
 
 /*----- That's all, folks -------------------------------------------------*/