X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FSub-Op.git;a=blobdiff_plain;f=t%2FSub-Op-LexicalSub%2FLexicalSub.xs;h=62e83f833b485b36adcf21c1ab2266bbe4517d1d;hp=285bc42b061997ad20f9c7adaa957aef737f0d18;hb=302bf09fbd4b673e199bdd22b330ebbdbec4e1fe;hpb=a0c0873977f66d8024a988b8dbd8e1c092927189

diff --git a/t/Sub-Op-LexicalSub/LexicalSub.xs b/t/Sub-Op-LexicalSub/LexicalSub.xs
index 285bc42..62e83f8 100644
--- a/t/Sub-Op-LexicalSub/LexicalSub.xs
+++ b/t/Sub-Op-LexicalSub/LexicalSub.xs
@@ -22,9 +22,14 @@ STATIC OP *sols_check(pTHX_ OP *o, void *ud_) {
  return o;
 }
 
+STATIC OP *sols_ref(pTHX_ OP *o, void *ud_) {
+ SV *cb = ud_;
+
+ return newSVOP(OP_ANONCODE, o->op_flags & ~OPf_KIDS, cb);
+}
+
 STATIC OP *sols_pp(pTHX) {
  dSP;
- dMARK;
  SV *cb;
  int i, items;
 
@@ -37,22 +42,10 @@ STATIC OP *sols_pp(pTHX) {
   cb = *svp;
  }
 
- ENTER;
- SAVETMPS;
-
- PUSHMARK(MARK);
-
- items = call_sv(cb, G_ARRAY);
-
- SPAGAIN;
- for (i = 0; i < items; ++i)
-  SvREFCNT_inc(SP[-i]);
+ XPUSHs(cb);
  PUTBACK;
 
- FREETMPS;
- LEAVE;
-
- return NORMAL;
+ return CALL_FPTR(PL_ppaddr[OP_ENTERSUB])(aTHX);
 }
 
 /* --- XS ------------------------------------------------------------------ */
@@ -75,11 +68,16 @@ PPCODE:
  if (SvROK(cb)) {
   cb = SvRV(cb);
   if (SvTYPE(cb) >= SVt_PVCV) {
-   c.name  = SvPV_const(name, c.namelen);
-   c.check = sols_check;
-   c.ud    = SvREFCNT_inc(cb);
-   c.pp    = sols_pp;
-   sub_op_register(aTHX_ &c);
+   sub_op_init(&c);
+   c.name   = SvPV_const(name, c.namelen);
+   if (SvPOK(cb)) { /* Sub is prototyped */
+    c.proto = SvPV_const(cb, c.protolen);
+   }
+   c.check  = sols_check;
+   c.ref    = sols_ref;
+   c.ud     = SvREFCNT_inc(cb);
+   c.pp     = sols_pp;
+   sub_op_register(aTHX_ &c, 0);
   }
  }
  XSRETURN(0);