X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=indirect.xs;h=8e6c789b1b0098315650bf8b05193aac0eb0c77e;hp=9347467ea034cad3ae3aa75631cd5a2982ae74e9;hb=4cb0e2cc26fbe39a7a040b090b1a1e6c2380af0f;hpb=9e8840b03b5cfb27dc88d7e1e85533fc6bbef6b5

diff --git a/indirect.xs b/indirect.xs
index 9347467..8e6c789 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -35,6 +35,10 @@
 # define SvPVX_const SvPVX
 #endif
 
+#ifndef SvREFCNT_inc_simple_NN
+# define SvREFCNT_inc_simple_NN SvREFCNT_inc
+#endif
+
 #ifndef sv_catpvn_nomg
 # define sv_catpvn_nomg sv_catpvn
 #endif
@@ -164,6 +168,7 @@ typedef struct {
  const char *pos;
  char       *buf;
  STRLEN      len, size;
+ line_t      line;
 } indirect_op_info_t;
 
 #define PTABLE_NAME        ptable
@@ -259,12 +264,21 @@ STATIC void indirect_thread_cleanup(pTHX_ void *ud) {
 STATIC SV *indirect_tag(pTHX_ SV *value) {
 #define indirect_tag(V) indirect_tag(aTHX_ (V))
  indirect_hint_t *h;
+ SV *code = NULL;
  dMY_CXT;
 
- value = SvOK(value) && SvROK(value) ? SvRV(value) : NULL;
+ if (SvOK(value) && SvROK(value)) {
+  value = SvRV(value);
+  if (SvTYPE(value) >= SVt_PVCV) {
+   code = value;
+   if (CvANON(code) && !CvCLONED(code))
+    CvCLONE_on(code);
+   SvREFCNT_inc_simple_NN(code);
+  }
+ }
 
  h = PerlMemShared_malloc(sizeof *h);
- h->code = SvREFCNT_inc(value);
+ h->code = code;
 
 #if I_WORKAROUND_REQUIRE_PROPAGATION
  {
@@ -350,6 +364,10 @@ STATIC U32 indirect_hash = 0;
 STATIC SV *indirect_hint(pTHX) {
 #define indirect_hint() indirect_hint(aTHX)
  SV *hint;
+
+ if (IN_PERL_RUNTIME)
+  return NULL;
+
 #if I_HAS_PERL(5, 9, 5)
  hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
                                        NULL,
@@ -357,19 +375,21 @@ STATIC SV *indirect_hint(pTHX) {
                                        0,
                                        indirect_hash);
 #else
- SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__,
+ {
+  SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__,
                                                                  indirect_hash);
- if (!val)
-  return 0;
- hint = *val;
+  if (!val)
+   return 0;
+  hint = *val;
+ }
 #endif
  return indirect_detag(hint);
 }
 
 /* ... op -> source position ............................................... */
 
-STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) {
-#define indirect_map_store(O, S, N) indirect_map_store(aTHX_ (O), (S), (N))
+STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv, line_t line) {
+#define indirect_map_store(O, S, N, L) indirect_map_store(aTHX_ (O), (S), (N), (L))
  indirect_op_info_t *oi;
  const char *s;
  STRLEN len;
@@ -394,15 +414,23 @@ STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) {
   oi->size = 0;
  }
 
- s = SvPV_const(sv, len);
+ if (sv) {
+  s = SvPV_const(sv, len);
+ } else {
+  s   = "{";
+  len = 1;
+ }
+
  if (len > oi->size) {
   Safefree(oi->buf);
   Newx(oi->buf, len, char);
   oi->size = len;
  }
  Copy(s, oi->buf, len, char);
- oi->len = len;
- oi->pos = src;
+
+ oi->len  = len;
+ oi->pos  = src;
+ oi->line = line;
 }
 
 STATIC const indirect_op_info_t *indirect_map_fetch(pTHX_ const OP *o) {
@@ -459,7 +487,8 @@ STATIC OP *indirect_ck_const(pTHX_ OP *o) {
  if (indirect_hint()) {
   SV *sv = cSVOPo_sv;
   if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV)) {
-   indirect_map_store(o, indirect_find(sv, PL_oldbufptr), sv);
+   const char *s = indirect_find(sv, PL_oldbufptr);
+   indirect_map_store(o, s, sv, CopLINE(&PL_compiling));
    return o;
   }
  }
@@ -524,7 +553,7 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
   }
 
   o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
-  indirect_map_store(o, s, sv);
+  indirect_map_store(o, s, sv, CopLINE(&PL_compiling));
   return o;
  }
 
@@ -552,7 +581,7 @@ STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
    while (s < t && isSPACE(*t)) --t;
    sv = sv_2mortal(newSVpvn("$", 1));
    sv_catpvn_nomg(sv, s, t - s + 1);
-   indirect_map_store(o, s, sv);
+   indirect_map_store(o, s, sv, CopLINE(&PL_compiling));
    return o;
   }
  }
@@ -561,6 +590,32 @@ STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
  return o;
 }
 
+/* ... ck_scope ............................................................ */
+
+STATIC OP *(*indirect_old_ck_scope)  (pTHX_ OP *) = 0;
+STATIC OP *(*indirect_old_ck_lineseq)(pTHX_ OP *) = 0;
+
+STATIC OP *indirect_ck_scope(pTHX_ OP *o) {
+ OP *(*old_ck)(pTHX_ OP *) = 0;
+
+ switch (o->op_type) {
+  case OP_SCOPE:   old_ck = indirect_old_ck_scope;   break;
+  case OP_LINESEQ: old_ck = indirect_old_ck_lineseq; break;
+ }
+ o = CALL_FPTR(old_ck)(aTHX_ o);
+
+ if (indirect_hint()) {
+  indirect_map_store(o, PL_oldbufptr, NULL, CopLINE(&PL_compiling));
+  return o;
+ }
+
+ indirect_map_delete(o);
+ return o;
+}
+
+/* We don't need to clean the map entries for leave ops because they can only
+ * be created by mutating from a lineseq. */
+
 /* ... ck_method ........................................................... */
 
 STATIC OP *(*indirect_old_ck_method)(pTHX_ OP *) = 0;
@@ -570,22 +625,25 @@ STATIC OP *indirect_ck_method(pTHX_ OP *o) {
   OP *op = cUNOPo->op_first;
   const indirect_op_info_t *oi = indirect_map_fetch(op);
   const char *s = NULL;
+  line_t line;
   SV *sv;
 
   if (oi && (s = oi->pos)) {
-   sv = sv_2mortal(newSVpvn(oi->buf, oi->len));
+   sv   = sv_2mortal(newSVpvn(oi->buf, oi->len));
+   line = oi->line; /* Keep the old line so that we really point to the first */
   } else {
    sv = cSVOPx_sv(op);
    if (!SvPOK(sv) || (SvTYPE(sv) < SVt_PV))
     goto done;
-   sv = sv_mortalcopy(sv);
-   s  = indirect_find(sv, PL_oldbufptr);
+   sv   = sv_mortalcopy(sv);
+   s    = indirect_find(sv, PL_oldbufptr);
+   line = CopLINE(&PL_compiling);
   }
 
   o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
   /* o may now be a method_named */
 
-  indirect_map_store(o, s, sv);
+  indirect_map_store(o, s, sv, line);
   return o;
  }
 
@@ -598,6 +656,16 @@ done:
 
 /* ... ck_entersub ......................................................... */
 
+STATIC int indirect_is_indirect(const indirect_op_info_t *moi, const indirect_op_info_t *ooi) {
+ if (moi->pos > ooi->pos)
+  return 0;
+
+ if (moi->pos == ooi->pos)
+  return moi->len == ooi->len && !memcmp(moi->buf, ooi->buf, moi->len);
+
+ return 1;
+}
+
 STATIC OP *(*indirect_old_ck_entersub)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
@@ -627,6 +695,8 @@ STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
    case OP_CONST:
    case OP_RV2SV:
    case OP_PADSV:
+   case OP_SCOPE:
+   case OP_LEAVE:
     break;
    default:
     goto done;
@@ -645,9 +715,8 @@ STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
   if (!(ooi && ooi->pos))
    goto done;
 
-  if (moi->pos < ooi->pos) {
-   SV     *file;
-   line_t  line;
+  if (indirect_is_indirect(moi, ooi)) {
+   SV *file;
    dSP;
 
    ENTER;
@@ -658,14 +727,13 @@ STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
 #else
    file = sv_mortalcopy(CopFILESV(&PL_compiling));
 #endif
-   line = CopLINE(&PL_compiling);
 
    PUSHMARK(SP);
    EXTEND(SP, 4);
    mPUSHp(ooi->buf, ooi->len);
    mPUSHp(moi->buf, moi->len);
    PUSHs(file);
-   mPUSHu(line);
+   mPUSHu(moi->line);
    PUTBACK;
 
    call_sv(code, G_VOID);
@@ -712,6 +780,11 @@ BOOT:
   PL_check[OP_RV2SV]       = MEMBER_TO_FPTR(indirect_ck_rv2sv);
   indirect_old_ck_padany   = PL_check[OP_PADANY];
   PL_check[OP_PADANY]      = MEMBER_TO_FPTR(indirect_ck_padany);
+  indirect_old_ck_scope    = PL_check[OP_SCOPE];
+  PL_check[OP_SCOPE]       = MEMBER_TO_FPTR(indirect_ck_scope);
+  indirect_old_ck_lineseq  = PL_check[OP_LINESEQ];
+  PL_check[OP_LINESEQ]     = MEMBER_TO_FPTR(indirect_ck_scope);
+
   indirect_old_ck_method   = PL_check[OP_METHOD];
   PL_check[OP_METHOD]      = MEMBER_TO_FPTR(indirect_ck_method);
   indirect_old_ck_entersub = PL_check[OP_ENTERSUB];