#include "perl.h"
#include "XSUB.h"
+#ifndef SvPV_const
+# define SvPV_const SvPV
+#endif
+
+#ifndef SvPV_nolen_const
+# define SvPV_nolen_const SvPV_nolen
+#endif
+
#ifndef SvPVX_const
# define SvPVX_const SvPVX
#endif
+#ifndef sv_catpvn_nomg
+# define sv_catpvn_nomg sv_catpvn
+#endif
+
/* ... Hints ............................................................... */
STATIC U32 indirect_hash = 0;
-STATIC UV indirect_hint(pTHX) {
+STATIC IV indirect_hint(pTHX) {
#define indirect_hint() indirect_hint(aTHX)
SV *id = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
NULL,
"indirect", 8,
0,
indirect_hash);
- return SvOK(id) ? SvUV(id) : 0;
+ return (id && SvOK(id) && SvIOK(id)) ? SvIV(id) : 0;
}
/* ... op -> source position ............................................... */
STATIC HV *indirect_map = NULL;
STATIC const char *indirect_linestr = NULL;
+#define OP2STR(O) (sprintf(buf, "%u", PTR2UV(o)))
+
STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) {
#define indirect_map_store(O, S, N) indirect_map_store(aTHX_ (O), (S), (N))
char buf[32];
val = newSVsv(sv);
SvUPGRADE(val, SVt_PVIV);
SvUVX(val) = PTR2UV(src);
- if (!hv_store(indirect_map, buf, sprintf(buf, "%u", PTR2UV(o)), val, 0))
- SvREFCNT_dec(val);
+ SvIOK_on(val);
+ SvIsUV_on(val);
+ if (!hv_store(indirect_map, buf, OP2STR(o), val, 0)) SvREFCNT_dec(val);
}
STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) {
char buf[32];
SV **val;
- if (indirect_linestr != SvPVX(PL_parser->linestr))
+ if (indirect_linestr != SvPVX_const(PL_parser->linestr))
return NULL;
- val = hv_fetch(indirect_map, buf, sprintf(buf, "%u", PTR2UV(o)), 0);
+ val = hv_fetch(indirect_map, buf, OP2STR(o), 0);
if (!val) {
*name = NULL;
return NULL;
return INT2PTR(const char *, SvUVX(*val));
}
+STATIC void indirect_map_delete(pTHX_ const OP *o) {
+#define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
+ char buf[32];
+
+ hv_delete(indirect_map, buf, OP2STR(o), G_DISCARD);
+}
+
+STATIC void indirect_map_clean(pTHX_ const OP *o) {
+#define indirect_map_clean(O) indirect_map_clean(aTHX_ (O))
+ if (o->op_flags & OPf_KIDS) {
+ const OP *kid = cUNOPo->op_first;
+ for (; kid; kid = kid->op_sibling) {
+ indirect_map_delete(kid);
+ indirect_map_clean(kid);
+ }
+ } else {
+ indirect_map_delete(o);
+ }
+}
+
STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
#define indirect_find(N, S) indirect_find(aTHX_ (N), (S))
STRLEN len;
const char *p = NULL, *r = SvPV_const(sv, len);
- if (!len)
- return s;
+ if (len >= 1 && *r == '$') {
+ ++r;
+ --len;
+ s = strchr(s, '$');
+ if (!s)
+ return NULL;
+ }
p = strstr(s, r);
while (p) {
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)) {
- SV *sv = sv_2mortal(newSVpvn("$", 1));
- sv_catsv(sv, name);
- indirect_map_store(o, indirect_find(sv, PL_parser->oldbufptr), sv);
+ SV *sv;
+ const char *name = NULL, *s;
+ 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)
+ goto done;
+
+ sv = sv_2mortal(newSVpvn("$", 1));
+ sv_catpvn_nomg(sv, name, len);
+ 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;
+ }
+ if (name[stashlen] != ':' || name[stashlen+1] != ':')
+ goto done;
+
+ sv_setpvn(sv, "$", 1);
+ 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;
while (s < t && isSPACE(*s)) ++s;
- while (t > s && isSPACE(*t)) --t;
- sv = sv_2mortal(newSVpvn(s, t - s + 1));
-
- indirect_map_store(o, s, sv);
+ if (*s == '$' && ++s <= t) {
+ while (s < t && isSPACE(*s)) ++s;
+ 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);
+ }
}
- return CALL_FPTR(indirect_old_ck_padany)(aTHX_ o);
+ return o;
}
/* ... ck_method ........................................................... */
STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
LISTOP *op;
OP *om, *oo;
- UV hint = indirect_hint();
+ IV hint = indirect_hint();
+
+ o = CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
if (hint) {
const char *pm, *po;
SV *svm, *svo;
- op = (LISTOP *) o;
- while (op->op_type != OP_PUSHMARK)
- op = (LISTOP *) op->op_first;
- oo = op->op_sibling;
- om = oo;
- while (om->op_sibling)
- om = om->op_sibling;
+ oo = o;
+ do {
+ op = (LISTOP *) oo;
+ if (!op->op_flags & OPf_KIDS)
+ goto done;
+ oo = op->op_first;
+ } while (oo->op_type != OP_PUSHMARK);
+ oo = oo->op_sibling;
+ om = op->op_last;
if (om->op_type == OP_METHOD)
om = cUNOPx(om)->op_first;
else if (om->op_type != OP_METHOD_NAMED)
goto done;
pm = indirect_map_fetch(om, &svm);
po = indirect_map_fetch(oo, &svo);
- if (pm && po && pm < po)
- ((hint == 2) ? croak : warn)(indirect_msg, SvPV_nolen(svm), SvPV_nolen(svo));
+ if (pm && po && pm < po) {
+ const char *psvm = SvPV_nolen_const(svm), *psvo = SvPV_nolen_const(svo);
+ if (hint == 2)
+ croak(indirect_msg, psvm, psvo);
+ else
+ warn(indirect_msg, psvm, psvo);
+ }
+done:
+ indirect_map_clean(o);
}
-done:
- return CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
+ return o;
}
STATIC U32 indirect_initialized = 0;
projects / perl / modules / indirect.git / blobdiff