X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=indirect.xs;h=dbcaad15c77d6250114a613c3151a3318375d2ba;hp=8a4a1920d9d89fa876ca4fcf01f24730d6d62814;hb=85db13117ff9f1611f5f0364093799351673840f;hpb=109b4f5ea15c640ab7a2eec463cc354754cc5d91

diff --git a/indirect.xs b/indirect.xs
index 8a4a192..dbcaad1 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -62,6 +62,9 @@
 #define I_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
 
 #if I_HAS_PERL(5, 10, 0) || defined(PL_parser)
+# ifndef PL_linestr
+#  define PL_linestr PL_parser->linestr
+# endif
 # ifndef PL_bufptr
 #  define PL_bufptr PL_parser->bufptr
 # endif
@@ -69,6 +72,9 @@
 #  define PL_oldbufptr PL_parser->oldbufptr
 # endif
 #else
+# ifndef PL_linestr
+#  define PL_linestr PL_Ilinestr
+# endif
 # ifndef PL_bufptr
 #  define PL_bufptr PL_Ibufptr
 # endif
@@ -176,10 +182,11 @@ typedef SV indirect_hint_t;
  * thread cleanup. */
 
 typedef struct {
- const char *pos;
- char       *buf;
- STRLEN      len, size;
- line_t      line;
+ STRLEN  pos;
+ STRLEN  size;
+ STRLEN  len;
+ char   *buf;
+ line_t  line;
 } indirect_op_info_t;
 
 #define PTABLE_NAME        ptable
@@ -193,6 +200,7 @@ typedef struct {
 #include "ptable.h"
 
 #define ptable_store(T, K, V) ptable_store(aTHX_ (T), (K), (V))
+#define ptable_delete(T, K)   ptable_delete(aTHX_ (T), (K))
 #define ptable_clear(T)       ptable_clear(aTHX_ (T))
 #define ptable_free(T)        ptable_free(aTHX_ (T))
 
@@ -322,7 +330,6 @@ STATIC SV *indirect_tag(pTHX_ SV *value) {
 #define indirect_tag(V) indirect_tag(aTHX_ (V))
  indirect_hint_t *h;
  SV *code = NULL;
- dMY_CXT;
 
  if (SvROK(value)) {
   value = SvRV(value);
@@ -343,10 +350,13 @@ STATIC SV *indirect_tag(pTHX_ SV *value) {
 #endif /* !I_HINT_STRUCT */
 
 #if I_THREADSAFE
- /* We only need for the key to be an unique tag for looking up the value later.
-  * Allocated memory provides convenient unique identifiers, so that's why we
-  * use the hint as the key itself. */
- ptable_hints_store(MY_CXT.tbl, h, h);
+ {
+  dMY_CXT;
+  /* We only need for the key to be an unique tag for looking up the value later
+   * Allocated memory provides convenient unique identifiers, so that's why we
+   * use the hint as the key itself. */
+  ptable_hints_store(MY_CXT.tbl, h, h);
+ }
 #endif /* I_THREADSAFE */
 
  return newSViv(PTR2IV(h));
@@ -355,14 +365,16 @@ STATIC SV *indirect_tag(pTHX_ SV *value) {
 STATIC SV *indirect_detag(pTHX_ const SV *hint) {
 #define indirect_detag(H) indirect_detag(aTHX_ (H))
  indirect_hint_t *h;
- dMY_CXT;
 
  if (!(hint && SvIOK(hint)))
   return NULL;
 
  h = INT2PTR(indirect_hint_t *, SvIVX(hint));
 #if I_THREADSAFE
- h = ptable_fetch(MY_CXT.tbl, h);
+ {
+  dMY_CXT;
+  h = ptable_fetch(MY_CXT.tbl, h);
+ }
 #endif /* I_THREADSAFE */
 
 #if I_WORKAROUND_REQUIRE_PROPAGATION
@@ -382,7 +394,10 @@ STATIC SV *indirect_hint(pTHX) {
  if (IN_PERL_RUNTIME)
   return NULL;
 
-#if I_HAS_PERL(5, 9, 5)
+#ifdef cop_hints_fetch_pvn
+ hint = cop_hints_fetch_pvn(PL_curcop, __PACKAGE__, __PACKAGE_LEN__,
+                                                              indirect_hash, 0);
+#elif I_HAS_PERL(5, 9, 5)
  hint = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
                                        NULL,
                                        __PACKAGE__, __PACKAGE_LEN__,
@@ -390,20 +405,20 @@ STATIC SV *indirect_hint(pTHX) {
                                        indirect_hash);
 #else
  {
-  SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__,
-                                                                 indirect_hash);
+  SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, 0);
   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, line_t line) {
-#define indirect_map_store(O, S, N, L) indirect_map_store(aTHX_ (O), (S), (N), (L))
+STATIC void indirect_map_store(pTHX_ const OP *o, STRLEN pos, SV *sv, line_t line) {
+#define indirect_map_store(O, P, N, L) indirect_map_store(aTHX_ (O), (P), (N), (L))
  indirect_op_info_t *oi;
  const char *s;
  STRLEN len;
@@ -431,7 +446,7 @@ STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv, line_
  Copy(s, oi->buf, len, char);
 
  oi->len  = len;
- oi->pos  = src;
+ oi->pos  = pos;
  oi->line = line;
 }
 
@@ -446,33 +461,40 @@ STATIC void indirect_map_delete(pTHX_ const OP *o) {
 #define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
  dMY_CXT;
 
- ptable_store(MY_CXT.map, o, NULL);
+ ptable_delete(MY_CXT.map, o);
 }
 
 /* --- Check functions ----------------------------------------------------- */
 
-STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
-#define indirect_find(N, S) indirect_find(aTHX_ (N), (S))
+STATIC int indirect_find(pTHX_ SV *sv, const char *s, STRLEN *pos) {
+#define indirect_find(N, S, P) indirect_find(aTHX_ (N), (S), (P))
  STRLEN len;
- const char *p = NULL, *r = SvPV_const(sv, len);
+ const char *p, *r = SvPV_const(sv, len);
 
  if (len >= 1 && *r == '$') {
   ++r;
   --len;
   s = strchr(s, '$');
   if (!s)
-   return NULL;
+   return 0;
  }
 
- p = strstr(s, r);
- while (p) {
-  p += len;
-  if (!isALNUM(*p))
+ p = s;
+ while (1) {
+  p = strstr(p, r);
+  if (!p)
+   return 0;
+  if (!isALNUM(p[len]))
    break;
-  p = strstr(p + 1, r);
+  /* p points to a word that has r as prefix, skip the rest of the word */
+  p += len + 1;
+  while (isALNUM(*p))
+   ++p;
  }
 
- return p;
+ *pos = p - SvPVX_const(PL_linestr);
+
+ return 1;
 }
 
 /* ... ck_const ............................................................ */
@@ -480,14 +502,18 @@ STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
 STATIC OP *(*indirect_old_ck_const)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_const(pTHX_ OP *o) {
- o = CALL_FPTR(indirect_old_ck_const)(aTHX_ o);
+ o = indirect_old_ck_const(aTHX_ o);
 
  if (indirect_hint()) {
   SV *sv = cSVOPo_sv;
+
   if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV)) {
-   const char *s = indirect_find(sv, PL_oldbufptr);
-   indirect_map_store(o, s, sv, CopLINE(&PL_compiling));
-   return o;
+   STRLEN pos;
+
+   if (indirect_find(sv, PL_oldbufptr, &pos)) {
+    indirect_map_store(o, pos, sv, CopLINE(&PL_compiling));
+    return o;
+   }
   }
  }
 
@@ -503,8 +529,8 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
  if (indirect_hint()) {
   OP *op = cUNOPo->op_first;
   SV *sv;
-  const char *name = NULL, *s;
-  STRLEN len;
+  const char *name = NULL;
+  STRLEN pos, len;
   OPCODE type = (OPCODE) op->op_type;
 
   switch (type) {
@@ -527,8 +553,8 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
 
   sv = sv_2mortal(newSVpvn("$", 1));
   sv_catpvn_nomg(sv, name, len);
-  s = indirect_find(sv, PL_oldbufptr);
-  if (!s) { /* If it failed, retry without the current stash */
+  if (!indirect_find(sv, PL_oldbufptr, &pos)) {
+   /* If it failed, retry without the current stash */
    const char *stash = HvNAME_get(PL_curstash);
    STRLEN stashlen = HvNAMELEN_get(PL_curstash);
 
@@ -545,18 +571,18 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
    sv_setpvn(sv, "$", 1);
    stashlen += 2;
    sv_catpvn_nomg(sv, name + stashlen, len - stashlen);
-   s = indirect_find(sv, PL_oldbufptr);
-   if (!s)
+   if (!indirect_find(sv, PL_oldbufptr, &pos))
     goto done;
   }
 
-  o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
-  indirect_map_store(o, s, sv, CopLINE(&PL_compiling));
+  o = indirect_old_ck_rv2sv(aTHX_ o);
+
+  indirect_map_store(o, pos, sv, CopLINE(&PL_compiling));
   return o;
  }
 
 done:
- o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+ o = indirect_old_ck_rv2sv(aTHX_ o);
 
  indirect_map_delete(o);
  return o;
@@ -567,7 +593,7 @@ done:
 STATIC OP *(*indirect_old_ck_padany)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
- o = CALL_FPTR(indirect_old_ck_padany)(aTHX_ o);
+ o = indirect_old_ck_padany(aTHX_ o);
 
  if (indirect_hint()) {
   SV *sv;
@@ -579,7 +605,8 @@ 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, CopLINE(&PL_compiling));
+   indirect_map_store(o, s - SvPVX_const(PL_linestr),
+                         sv, CopLINE(&PL_compiling));
    return o;
   }
  }
@@ -600,10 +627,11 @@ STATIC OP *indirect_ck_scope(pTHX_ OP *o) {
   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);
+ o = old_ck(aTHX_ o);
 
  if (indirect_hint()) {
-  indirect_map_store(o, PL_oldbufptr, NULL, CopLINE(&PL_compiling));
+  indirect_map_store(o, PL_oldbufptr - SvPVX_const(PL_linestr),
+                        NULL, CopLINE(&PL_compiling));
   return o;
  }
 
@@ -626,34 +654,29 @@ STATIC OP *indirect_ck_method(pTHX_ OP *o) {
    * don't trip up on $obj->$meth. */
   if (op && op->op_type == OP_CONST) {
    const indirect_op_info_t *oi = indirect_map_fetch(op);
-   const char *s = NULL;
+   STRLEN pos;
    line_t line;
    SV *sv;
 
-   if (oi && (s = oi->pos)) {
-    sv   = sv_2mortal(newSVpvn(oi->buf, oi->len));
-    /* Keep the old line so that we really point to the first line of the
-     * expression. */
-    line = oi->line;
-   } else {
-    sv = cSVOPx_sv(op);
-    if (!SvPOK(sv) || (SvTYPE(sv) < SVt_PV))
-     goto done;
-    sv   = sv_mortalcopy(sv);
-    s    = indirect_find(sv, PL_oldbufptr);
-    line = CopLINE(&PL_compiling);
-   }
+   if (!oi)
+    goto done;
+
+   sv   = sv_2mortal(newSVpvn(oi->buf, oi->len));
+   pos  = oi->pos;
+   /* Keep the old line so that we really point to the first line of the
+    * expression. */
+   line = oi->line;
 
-   o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+   o = indirect_old_ck_method(aTHX_ o);
    /* o may now be a method_named */
 
-   indirect_map_store(o, s, sv, line);
+   indirect_map_store(o, pos, sv, line);
    return o;
   }
  }
 
 done:
- o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+ o = indirect_old_ck_method(aTHX_ o);
 
  indirect_map_delete(o);
  return o;
@@ -668,27 +691,27 @@ STATIC OP *(*indirect_old_ck_method_named)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_method_named(pTHX_ OP *o) {
  if (indirect_hint()) {
-  const char *s;
+  STRLEN pos;
   line_t line;
   SV *sv;
 
-  sv   = cSVOPo_sv;
+  sv = cSVOPo_sv;
   if (!SvPOK(sv) || (SvTYPE(sv) < SVt_PV))
    goto done;
-  sv   = sv_mortalcopy(sv);
-  s    = indirect_find(sv, PL_oldbufptr);
-  if (!s)
+  sv = sv_mortalcopy(sv);
+
+  if (!indirect_find(sv, PL_oldbufptr, &pos))
    goto done;
   line = CopLINE(&PL_compiling);
 
-  o = CALL_FPTR(indirect_old_ck_method_named)(aTHX_ o);
+  o = indirect_old_ck_method_named(aTHX_ o);
 
-  indirect_map_store(o, s, sv, line);
+  indirect_map_store(o, pos, sv, line);
   return o;
  }
 
 done:
- o = CALL_FPTR(indirect_old_ck_method_named)(aTHX_ o);
+ o = indirect_old_ck_method_named(aTHX_ o);
 
  indirect_map_delete(o);
  return o;
@@ -696,22 +719,12 @@ 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) {
  SV *code = indirect_hint();
 
- o = CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
+ o = indirect_old_ck_entersub(aTHX_ o);
 
  if (code) {
   const indirect_op_info_t *moi, *ooi;
@@ -748,14 +761,17 @@ STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
    goto done;
 
   moi = indirect_map_fetch(mop);
-  if (!(moi && moi->pos))
+  if (!moi)
    goto done;
 
   ooi = indirect_map_fetch(oop);
-  if (!(ooi && ooi->pos))
+  if (!ooi)
    goto done;
 
-  if (indirect_is_indirect(moi, ooi)) {
+  /* When positions are identical, the method and the object must have the
+   * same name. But it also means that it is an indirect call, as "foo->foo"
+   * results in different positions. */
+  if (moi->pos <= ooi->pos) {
    SV *file;
    dSP;
 
@@ -792,8 +808,6 @@ done:
 STATIC U32 indirect_initialized = 0;
 
 STATIC void indirect_teardown(pTHX_ void *root) {
- dMY_CXT;
-
  if (!indirect_initialized)
   return;
 
@@ -802,10 +816,13 @@ STATIC void indirect_teardown(pTHX_ void *root) {
   return;
 #endif
 
- ptable_free(MY_CXT.map);
+ {
+  dMY_CXT;
+  ptable_free(MY_CXT.map);
 #if I_THREADSAFE
- ptable_hints_free(MY_CXT.tbl);
+  ptable_hints_free(MY_CXT.tbl);
 #endif
+ }
 
  PL_check[OP_CONST]           = MEMBER_TO_FPTR(indirect_old_ck_const);
  indirect_old_ck_const        = 0;