# define SvPVX_const SvPVX
#endif
+#ifndef sv_catpvn_nomg
+# define sv_catpvn_nomg sv_catpvn
+#endif
+
/* ... Hints ............................................................... */
STATIC U32 indirect_hash = 0;
STATIC void indirect_map_delete(pTHX_ const OP *o) {
#define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
char buf[32];
- SV *val;
hv_delete(indirect_map, buf, OP2STR(o), G_DISCARD);
}
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);
+
if (indirect_hint()) {
SV *sv = cSVOPo_sv;
if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
indirect_map_store(o, indirect_find(sv, PL_parser->oldbufptr), sv);
}
- return CALL_FPTR(indirect_old_ck_const)(aTHX_ o);
+ return o;
}
/* ... ck_rv2sv ............................................................ */
STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
if (indirect_hint()) {
OP *op = cUNOPo->op_first;
- SV *name = cSVOPx_sv(op);
- if (SvPOK(name) && (SvTYPE(name) >= SVt_PV)) {
+ const char *name = NULL;
+ STRLEN len;
+ switch (op->op_type) {
+ case OP_GV:
+ case OP_GVSV: {
+ GV *gv = cGVOPx_gv(op);
+ name = GvNAME(gv);
+ len = GvNAMELEN(gv);
+ break;
+ }
+ default: {
+ SV *sv = cSVOPx_sv(op);
+ if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
+ name = SvPV_const(sv, len);
+ break;
+ }
+ }
+ if (name) {
SV *sv = sv_2mortal(newSVpvn("$", 1));
- sv_catsv(sv, name);
- indirect_map_store(o, indirect_find(sv, PL_parser->oldbufptr), sv);
+ sv_catpvn_nomg(sv, name, len);
+ const char *s;
+ s = indirect_find(sv, PL_parser->oldbufptr);
+ if (!s) { /* If it failed, retry without the current stash */
+ const char *stash = HvNAME_get(PL_curstash);
+ STRLEN stashlen = HvNAMELEN_get(PL_curstash);
+ if ((len < stashlen + 2) || name != strstr(name, stash)) {
+ /* Failed again ? Try to remove main */
+ stash = "main";
+ stashlen = 4;
+ if ((len < stashlen + 2) || name != strstr(name, stash))
+ goto done;
+ }
+ sv_setpvn(sv, "$", 1);
+ if (name[stashlen] != ':' || name[stashlen+1] != ':')
+ goto done;
+ stashlen += 2;
+ sv_catpvn_nomg(sv, name + stashlen, len - stashlen);
+ s = indirect_find(sv, PL_parser->oldbufptr);
+ if (!s)
+ goto done;
+ }
+ o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+ indirect_map_store(o, s, sv);
+ return o;
}
}
+done:
return CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
}
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);
+
if (indirect_hint()) {
SV *sv;
const char *s = PL_parser->oldbufptr, *t = PL_parser->bufptr - 1;
indirect_map_store(o, s, sv);
}
- return CALL_FPTR(indirect_old_ck_padany)(aTHX_ o);
+ return o;
}
/* ... ck_method ........................................................... */
OP *om, *oo;
IV hint = indirect_hint();
+ o = CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
+
if (hint) {
const char *pm, *po;
SV *svm, *svo;
indirect_map_clean(o);
}
- return CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
+ return o;
}
STATIC U32 indirect_initialized = 0;