X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=indirect.xs;h=dedc58bb453c9003a10980dc27dda2a774dde32a;hp=ba9c503958a997ab3b043683cbd0b48b9af213f4;hb=e3609d4f5df9ec09d582f3e60b92e6e8263cd6cd;hpb=b692a67bb2d094808f4ef331df53093a4019b34e

diff --git a/indirect.xs b/indirect.xs
index ba9c503..dedc58b 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -84,7 +84,7 @@
 #endif
 
 #ifndef I_WORKAROUND_REQUIRE_PROPAGATION
-# define I_WORKAROUND_REQUIRE_PROPAGATION !I_HAS_PERL(5, 10, 1)
+# define I_WORKAROUND_REQUIRE_PROPAGATION !I_HAS_PERL(5, 12, 0)
 #endif
 
 /* ... Thread safety and multiplicity ...................................... */
@@ -384,27 +384,16 @@ STATIC U32 indirect_hash = 0;
 
 STATIC SV *indirect_hint(pTHX) {
 #define indirect_hint() indirect_hint(aTHX)
- SV *hint;
+ SV **val;
 
  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,
-                                       __PACKAGE__, __PACKAGE_LEN__,
-                                       0,
-                                       indirect_hash);
-#else
- {
-  SV **val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__,
-                                                                 indirect_hash);
-  if (!val)
-   return 0;
-  hint = *val;
- }
-#endif
- return indirect_detag(hint);
+ val = hv_fetch(GvHV(PL_hintgv), __PACKAGE__, __PACKAGE_LEN__, indirect_hash);
+ if (!val)
+  return NULL;
+
+ return indirect_detag(*val);
 }
 
 /* ... op -> source position ............................................... */
@@ -461,7 +450,7 @@ STATIC void indirect_map_delete(pTHX_ const OP *o) {
 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;
@@ -471,15 +460,18 @@ STATIC int indirect_find(pTHX_ SV *sv, const char *s, STRLEN *pos) {
    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;
  }
- if (!p)
-  return 0;
 
  *pos = p - SvPVX_const(PL_linestr);
 
@@ -647,22 +639,14 @@ STATIC OP *indirect_ck_method(pTHX_ OP *o) {
    line_t line;
    SV *sv;
 
-   if (oi) {
-    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;
-   } else {
-    sv = cSVOPx_sv(op);
-    if (!SvPOK(sv) || (SvTYPE(sv) < SVt_PV))
-     goto done;
-    sv = sv_mortalcopy(sv);
+   if (!oi)
+    goto done;
 
-    if (!indirect_find(sv, PL_oldbufptr, &pos))
-     goto done;
-    line = CopLINE(&PL_compiling);
-   }
+   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 may now be a method_named */
@@ -716,16 +700,6 @@ 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) {
@@ -775,7 +749,10 @@ STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
   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;