#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 ...................................... */
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 ............................................... */
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;
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);
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 */
/* ... 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) {
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;