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