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;
- switch (op->op_type) {
+ switch (type) {
case OP_GV:
case OP_GVSV: {
GV *gv = cGVOPx_gv(op);
len = GvNAMELEN(gv);
break;
}
- default: {
- SV *sv = cSVOPx_sv(op);
- if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
- name = SvPV_const(sv, len);
- break;
- }
+ 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);
+ }
}
if (!name)
goto done;