Attempt to fix problems with new exception handling macros.

[perl5.git] / ext / XS / APItest / APItest.xs

diff --git a/ext/XS/APItest/APItest.xs b/ext/XS/APItest/APItest.xs
index df43b89..fcdcc9a 100644 (file)
--- a/ext/XS/APItest/APItest.xs
+++ b/ext/XS/APItest/APItest.xs
@@ -2,6 +2,8 @@
 #include "perl.h"
 #include "XSUB.h"
 
+/* from exception.c */
+int exception(int);
 
 MODULE = XS::APItest:Hash              PACKAGE = XS::APItest::Hash
 
@@ -198,18 +200,18 @@ void
 mpushi()
        PPCODE:
        EXTEND(SP, 3);
-       mPUSHn(-1);
-       mPUSHn(2);
-       mPUSHn(-3);
+       mPUSHi(-1);
+       mPUSHi(2);
+       mPUSHi(-3);
        XSRETURN(3);
 
 void
 mpushu()
        PPCODE:
        EXTEND(SP, 3);
-       mPUSHn(1);
-       mPUSHn(2);
-       mPUSHn(3);
+       mPUSHu(1);
+       mPUSHu(2);
+       mPUSHu(3);
        XSRETURN(3);
 
 void
@@ -231,15 +233,107 @@ mxpushn()
 void
 mxpushi()
        PPCODE:
-       mXPUSHn(-1);
-       mXPUSHn(2);
-       mXPUSHn(-3);
+       mXPUSHi(-1);
+       mXPUSHi(2);
+       mXPUSHi(-3);
        XSRETURN(3);
 
 void
 mxpushu()
        PPCODE:
-       mXPUSHn(1);
-       mXPUSHn(2);
-       mXPUSHn(3);
+       mXPUSHu(1);
+       mXPUSHu(2);
+       mXPUSHu(3);
        XSRETURN(3);
+
+
+void
+call_sv(sv, flags, ...)
+    SV* sv
+    I32 flags
+    PREINIT:
+       I32 i;
+    PPCODE:
+       for (i=0; i<items-2; i++)
+           ST(i) = ST(i+2); /* pop first two args */
+       PUSHMARK(SP);
+       SP += items - 2;
+       PUTBACK;
+       i = call_sv(sv, flags);
+       SPAGAIN;
+       EXTEND(SP, 1);
+       PUSHs(sv_2mortal(newSViv(i)));
+
+void
+call_pv(subname, flags, ...)
+    char* subname
+    I32 flags
+    PREINIT:
+       I32 i;
+    PPCODE:
+       for (i=0; i<items-2; i++)
+           ST(i) = ST(i+2); /* pop first two args */
+       PUSHMARK(SP);
+       SP += items - 2;
+       PUTBACK;
+       i = call_pv(subname, flags);
+       SPAGAIN;
+       EXTEND(SP, 1);
+       PUSHs(sv_2mortal(newSViv(i)));
+
+void
+call_method(methname, flags, ...)
+    char* methname
+    I32 flags
+    PREINIT:
+       I32 i;
+    PPCODE:
+       for (i=0; i<items-2; i++)
+           ST(i) = ST(i+2); /* pop first two args */
+       PUSHMARK(SP);
+       SP += items - 2;
+       PUTBACK;
+       i = call_method(methname, flags);
+       SPAGAIN;
+       EXTEND(SP, 1);
+       PUSHs(sv_2mortal(newSViv(i)));
+
+void
+eval_sv(sv, flags)
+    SV* sv
+    I32 flags
+    PREINIT:
+       I32 i;
+    PPCODE:
+       PUTBACK;
+       i = eval_sv(sv, flags);
+       SPAGAIN;
+       EXTEND(SP, 1);
+       PUSHs(sv_2mortal(newSViv(i)));
+
+SV*
+eval_pv(p, croak_on_error)
+    const char* p
+    I32 croak_on_error
+    PREINIT:
+       I32 i;
+    PPCODE:
+       PUTBACK;
+       EXTEND(SP, 1);
+       PUSHs(eval_pv(p, croak_on_error));
+
+void
+require_pv(pv)
+    const char* pv
+    PREINIT:
+       I32 i;
+    PPCODE:
+       PUTBACK;
+       require_pv(pv);
+
+int
+exception(throw_e)
+    int throw_e
+    OUTPUT:
+        RETVAL
+