typedef struct pgevent_pyobj {
PyObject_HEAD
+ PyObject *r;
pgen_event *ev;
} pgevent_pyobj;
static PyObject *pgevent_pywrap(pgen_event *ev)
{
pgevent_pyobj *o = PyObject_New(pgevent_pyobj, pgevent_pytype);
- o->ev = ev;
+ o->ev = ev; o->r = 0;
return ((PyObject *)o);
}
static CONVFUNC(pgevent, pgen_event *, PGEVENT_EV)
-static void pgevent_kill(PyObject *me) { PGEVENT_EV(me) = 0; }
-static void pgevent_pydealloc(PyObject *me) { FREEOBJ(me); }
+static void pgevent_kill(PyObject *me)
+{
+ pgevent_pyobj *ev = (pgevent_pyobj *)me;
+
+ ev->ev = 0;
+ if (ev->r) GRAND_R(ev->r) = 0;
+}
+
+static void pgevent_pydealloc(PyObject *me)
+{
+ pgevent_pyobj *ev = (pgevent_pyobj *)me;
+ if (ev->r) Py_DECREF(ev->r);
+ FREEOBJ(me);
+}
#define PGEVENT_CHECK(me) do { \
if (!PGEVENT_EV(me)) { \
- PyErr_SetString(PyExc_ValueError, "event object is dead"); \
+ PyErr_SetString(PyExc_ValueError, "event object is no longer valid"); \
return (0); \
} \
} while (0)
{ PGEVENT_CHECK(me); return (PyInt_FromLong(PGEVENT_EV(me)->tests)); }
static PyObject *peget_rng(PyObject *me, void *hunoz)
- { PGEVENT_CHECK(me); return (grand_pywrap(PGEVENT_EV(me)->r, 0)); }
+{
+ pgevent_pyobj *ev = (pgevent_pyobj *)me;
+
+ PGEVENT_CHECK(me);
+ if (!ev->r) ev->r = grand_pywrap(ev->ev->r, 0);
+ Py_INCREF(ev->r); return ((PyObject *)ev->r);
+}
static int peset_x(PyObject *me, PyObject *xobj, void *hunoz)
{