STATIC HV *indirect_map = NULL;
STATIC const char *indirect_linestr = NULL;
-#define OP2STR(O) (sprintf(buf, "%u", PTR2UV(o)))
+/* We need (CHAR_BIT * sizeof(UV)) / 4 + 1 chars, but it's just better to take
+ * a power of two */
+#define OP2STR_BUF char buf[(CHAR_BIT * sizeof(UV)) / 2]
+#define OP2STR(O) (sprintf(buf, "%"UVxf, 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];
+ OP2STR_BUF;
const char *pl_linestr;
SV *val;
STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) {
#define indirect_map_fetch(O, S) indirect_map_fetch(aTHX_ (O), (S))
- char buf[32];
+ OP2STR_BUF;
SV **val;
if (indirect_linestr != SvPVX_const(PL_linestr))
STATIC void indirect_map_delete(pTHX_ const OP *o) {
#define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
- char buf[32];
+ OP2STR_BUF;
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))
+STATIC void indirect_map_clean_kids(pTHX_ const OP *o) {
+#define indirect_map_clean_kids(O) indirect_map_clean_kids(aTHX_ (O))
if (o->op_flags & OPf_KIDS) {
const OP *kid = cUNOPo->op_first;
for (; kid; kid = kid->op_sibling) {
+ indirect_map_clean_kids(kid);
indirect_map_delete(kid);
- indirect_map_clean(kid);
}
- } else {
- indirect_map_delete(o);
}
}
+STATIC void indirect_map_clean(pTHX_ const OP *o) {
+#define indirect_map_clean(O) indirect_map_clean(aTHX_ (O))
+ indirect_map_clean_kids(o);
+ 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;
SV *sv;
const char *name = NULL, *s;
STRLEN len;
- OPCODE type = op->op_type;
+ OPCODE type = (OPCODE) op->op_type;
switch (type) {
case OP_GV:
}
default:
if ((PL_opargs[type] & OA_CLASS_MASK) == OA_SVOP) {
- SV *sv = cSVOPx_sv(op);
- if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
- name = SvPV_const(sv, len);
+ SV *nsv = cSVOPx_sv(op);
+ if (SvPOK(nsv) && (SvTYPE(nsv) >= SVt_PV))
+ name = SvPV_const(nsv, len);
}
}
if (!name)