MAGIC *mg;
HV *stash;
- if (!av)
- return 0;
+ if (!av) return 0;
if (SvCANEXISTDELETE(av))
return av_exists(av, key);
MAGIC *mg;
HV *stash;
- if (!hv)
- return 0;
+ if (!hv) return 0;
if (SvCANEXISTDELETE(hv) || mg_find((SV *) hv, PERL_MAGIC_env))
return hv_exists_ent(hv, keysv, 0);
#define SU_UD_ORIGIN(U) (((su_ud_common *) (U))->origin)
#define SU_UD_HANDLER(U) (((su_ud_common *) (U))->handler)
-#define SU_UD_FREE(U) do { \
+#define SU_UD_FREE(U) STMT_START { \
if (SU_UD_ORIGIN(U)) Safefree(SU_UD_ORIGIN(U)); \
Safefree(U); \
-} while (0)
+} STMT_END
/* ... Reap ................................................................ */
if (SvTYPE(sv) >= SVt_PVGV) {
gv = (GV *) sv;
- if (!SvROK(val))
+ if (!val) { /* local *x; */
+ t = SVt_PVGV;
+ } else if (!SvROK(val)) { /* local *x = $val; */
goto assign;
- t = SvTYPE(SvRV(val));
- deref = 1;
+ } else { /* local *x = \$val; */
+ t = SvTYPE(SvRV(val));
+ deref = 1;
+ }
} else {
STRLEN len, l;
const char *p = SvPV_const(sv, len), *s;
case '&': t = SVt_PVCV; break;
case '*': t = SVt_PVGV; break;
}
- if (t == SVt_NULL) {
+ if (t != SVt_NULL) {
+ ++s;
+ --l;
+ } else if (val) { /* t == SVt_NULL, type can't be inferred from the sigil */
if (SvROK(val) && !sv_isobject(val)) {
t = SvTYPE(SvRV(val));
deref = 1;
} else {
t = SvTYPE(val);
}
- } else {
- ++s;
- --l;
}
gv = gv_fetchpvn_flags(s, l, GV_ADDMULTI, SVt_PVGV);
}
if (!*svp || *svp == &PL_sv_undef) croak(PL_no_aelem, idx);
su_save_aelem(av, idx, svp, preeminent);
gv = (GV *) *svp;
- goto maybe_deref;
+ if (val) { /* local $x[$idx] = $val; */
+ goto maybe_deref;
+ } else { /* local $x[$idx]; delete $x[$idx]; */
+ av_delete(av, idx, G_DISCARD);
+ goto done;
+ }
} else
save_ary(gv);
break;
if (!svp || *svp == &PL_sv_undef) croak("Modification of non-creatable hash value attempted, subscript \"%s\"", SvPV_nolen_const(*svp));
su_save_helem(hv, elem, svp, preeminent);
gv = (GV *) *svp;
- goto maybe_deref;
+ if (val) { /* local $x{$key} = $val; */
+ goto maybe_deref;
+ } else { /* local $x{$key}; delete $x{$key}; */
+ hv_delete_ent(hv, elem, G_DISCARD, HeHASH(he));
+ goto done;
+ }
} else
save_hash(gv);
break;
default:
gv = (GV *) save_scalar(gv);
maybe_deref:
- if (deref)
+ if (deref) /* val != NULL */
val = SvRV(val);
break;
}
PL_scopestack[PL_scopestack_ix]));
assign:
- SvSetMagicSV((SV *) gv, val);
+ if (val)
+ SvSetMagicSV((SV *) gv, val);
+done:
SvREFCNT_dec(ud->elem);
SvREFCNT_dec(ud->val);
SvREFCNT_dec(ud->sv);
I32 i, depth = 0, *origin;
I32 cur, last, step;
+ LEAVE;
+
+ if (level <= 0) {
+ SU_UD_HANDLER(ud)(aTHX_ ud);
+ goto done;
+ }
+
SU_D(PerlIO_printf(Perl_debug_log, "%p: ### init for level %d\n", ud, level));
for (i = 0; i < level; ++i) {
SU_UD_ORIGIN(ud) = origin;
SU_UD_DEPTH(ud) = depth;
+
+ SU_D(PerlIO_printf(Perl_debug_log, "%p: set original destructor at %d [%d]\n",
+ ud, PL_savestack_ix, depth));
+
+ SAVEDESTRUCTOR_X(su_pop, ud);
+
+done:
+ ENTER;
+
return depth;
}
SU_UD_ORIGIN(ud) = NULL;
SU_UD_HANDLER(ud) = su_reap;
ud->cb = newSVsv(hook);
- LEAVE;
- if (level) {
- I32 depth = su_init(level, ud, 3);
- SU_D(PerlIO_printf(Perl_debug_log, "%p: set original destructor at %d [%d]\n",
- ud, PL_savestack_ix, depth));
- SAVEDESTRUCTOR_X(su_pop, ud);
- } else
- su_reap(ud);
- ENTER;
+ su_init(level, ud, 3);
void
localize(SV *sv, SV *val, ...)
ud->sv = sv;
ud->val = newSVsv(val);
ud->elem = NULL;
- LEAVE;
- if (level) {
- I32 depth = su_init(level, ud, 3);
- SU_D(PerlIO_printf(Perl_debug_log, "%p: set original destructor at %d [%d]\n",
- ud, PL_savestack_ix, depth));
- SAVEDESTRUCTOR_X(su_pop, ud);
- } else
- su_localize(ud);
- ENTER;
+ su_init(level, ud, 3);
void
localize_elem(SV *sv, SV *elem, SV *val, ...)
ud->val = newSVsv(val);
SvREFCNT_inc(elem);
ud->elem = elem;
- LEAVE;
- if (level) {
- I32 depth = su_init(level, ud, 4);
- SU_D(PerlIO_printf(Perl_debug_log, "%p: set original destructor at %d [%d]\n",
- ud, PL_savestack_ix, depth));
- SAVEDESTRUCTOR_X(su_pop, ud);
- } else
- su_localize(ud);
- ENTER;
+ su_init(level, ud, 4);
+void
+localize_delete(SV *sv, SV *elem, ...)
+PROTOTYPE: $$;$
+PREINIT:
+ I32 level = 0;
+ su_ud_localize *ud;
+CODE:
+ SU_GET_LEVEL(2);
+ Newx(ud, 1, su_ud_localize);
+ SU_UD_ORIGIN(ud) = NULL;
+ SU_UD_HANDLER(ud) = su_localize;
+ SvREFCNT_inc(sv);
+ ud->sv = sv;
+ ud->val = NULL;
+ SvREFCNT_inc(elem);
+ ud->elem = elem;
+ su_init(level, ud, 4);