X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-perl/blobdiff_plain/660b443cc58d4dd4e92730104429fb64d78c7075..fcd15e0b7a3d0f0ca2f30953573f8d1f6b8e8bd2:/pgproc.c diff --git a/pgproc.c b/pgproc.c index 0701530..ef2b272 100644 --- a/pgproc.c +++ b/pgproc.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: pgproc.c,v 1.1 2004/04/02 18:04:01 mdw Exp $ + * $Id$ * * Prime generation procedures * @@ -26,14 +26,6 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/*----- Revision history --------------------------------------------------* - * - * $Log: pgproc.c,v $ - * Revision 1.1 2004/04/02 18:04:01 mdw - * Initial checkin. - * - */ - /*----- Header files ------------------------------------------------------*/ #include "catacomb-perl.h" @@ -49,12 +41,12 @@ static int perlevent(int rq, pgen_event *e, void *p) dSP; switch (rq) { - case PGEN_BEGIN: meth = "pgen_begin"; break; - case PGEN_TRY: meth = "pgen_try"; break; - case PGEN_FAIL: meth = "pgen_fail"; break; - case PGEN_PASS: meth = "pgen_pass"; break; - case PGEN_DONE: meth = "pgen_done"; break; - case PGEN_ABORT: meth = "pgen_abort"; break; + case PGEN_BEGIN: meth = "PG_BEGIN"; break; + case PGEN_TRY: meth = "PG_TRY"; break; + case PGEN_FAIL: meth = "PG_FAIL"; break; + case PGEN_PASS: meth = "PG_PASS"; break; + case PGEN_DONE: meth = "PG_DONE"; break; + case PGEN_ABORT: meth = "PG_ABORT"; break; default: abort(); } @@ -63,8 +55,7 @@ static int perlevent(int rq, pgen_event *e, void *p) SAVETMPS; PUSHMARK(SP); XPUSHs(sv); - XPUSHs(sv_setref_pv(sv_newmortal(), "Catacomb::MP::Prime::Gen::Event", - (void *)e)); + XPUSHs(RET(e, "Catacomb::MP::Prime::Gen::Event")); PUTBACK; n = perl_call_method(meth, G_SCALAR); assert(n == 1);