MAGIC *mg;
HV *stash;
- if (!av)
- return 0;
+ if (!av) return 0;
if (SvCANEXISTDELETE(av))
return av_exists(av, key);
#endif /* SAVEADELETE */
-STATIC void su_save_aelem(pTHX_ AV *av, I32 key, SV **svp, I32 preeminent) {
-#define su_save_aelem(A, K, S, P) su_save_aelem(aTHX_ (A), (K), (S), (P))
+STATIC void su_save_aelem(pTHX_ void *av_, SV *key, SV *val) {
+#define su_save_aelem(A, K, V) su_save_aelem(aTHX_ (A), (K), (V))
+ AV *av = av_;
+ I32 idx;
+ I32 preeminent;
+ SV **svp;
+
+ idx = SvIV(key);
+ preeminent = su_av_preeminent(av, idx);
+ svp = av_fetch(av, idx, 1);
+ if (!*svp || *svp == &PL_sv_undef) croak(PL_no_aelem, idx);
+
if (preeminent)
- save_aelem(av, key, svp);
+ save_aelem(av, idx, svp);
else
- SAVEADELETE(av, key);
+ SAVEADELETE(av, idx);
+
+ if (val) { /* local $x[$idx] = $val; */
+ SvSetMagicSV(*svp, val);
+ } else { /* local $x[$idx]; delete $x[$idx]; */
+ av_delete(av, idx, G_DISCARD);
+ }
}
/* ... Saving hash elements ................................................ */
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);
return 1;
}
-STATIC void su_save_helem(pTHX_ HV *hv, SV *keysv, SV **svp, I32 preeminent) {
-#define su_save_helem(H, K, S, P) su_save_helem(aTHX_ (H), (K), (S), (P))
+STATIC void su_save_helem(pTHX_ void *hv_, SV *keysv, SV *val) {
+#define su_save_helem(H, K, V) su_save_helem(aTHX_ (H), (K), (V))
+ HV *hv = hv_;
+ I32 preeminent;
+ HE *he;
+ SV **svp;
+
+ preeminent = su_hv_preeminent(hv, keysv);
+ he = hv_fetch_ent(hv, keysv, 1, 0);
+ svp = he ? &HeVAL(he) : NULL;
+ if (!svp || *svp == &PL_sv_undef) croak("Modification of non-creatable hash value attempted, subscript \"%s\"", SvPV_nolen_const(*svp));
+
if (HvNAME_get(hv) && isGV(*svp)) {
save_gp((GV *) *svp, 0);
return;
}
+
if (preeminent)
save_helem(hv, keysv, svp);
else {
SAVEDELETE(hv, savepvn(key, keylen),
SvUTF8(keysv) ? -(I32)keylen : (I32)keylen);
}
+
+ if (val) { /* local $x{$keysv} = $val; */
+ SvSetMagicSV(*svp, val);
+ } else { /* local $x{$keysv}; delete $x{$keysv}; */
+ hv_delete_ent(hv, keysv, G_DISCARD, HeHASH(he));
+ }
}
/* --- Actions ------------------------------------------------------------- */
#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 ................................................................ */
SV *elem;
} su_ud_localize;
+STATIC void su_localize_elem(pTHX_ void *obj, SV *elem, SV *val, void (*do_elem)(pTHX_ void *, SV *, SV *)) {
+#define su_localize_elem(O, E, V, D) su_localize_elem(aTHX_ (O), (E), (V), (D))
+ AV *aelem, *aval;
+ if (SvROK(elem) && (aelem = (AV *) SvRV(elem), SvTYPE(aelem) == SVt_PVAV)) {
+ I32 i, last = av_len(aelem);
+ SV **svpe, **svpv;
+ if (!val) {
+ for (i = 0; i <= last; ++i) {
+ svpe = av_fetch(aelem, i, 0);
+ if (!svpe) continue;
+ do_elem(aTHX_ obj, *svpe, NULL);
+ }
+ } else if (SvROK(val) && (aval = (AV *) SvRV(val), SvTYPE(aval) == SVt_PVAV)){
+ for (i = 0; i <= last; ++i) {
+ svpe = av_fetch(aelem, i, 0);
+ if (!svpe) continue;
+ svpv = av_fetch(aval, i, 0);
+ if (!svpv) continue;
+ do_elem(aTHX_ obj, *svpe, *svpv);
+ }
+ }
+ } else {
+ do_elem(aTHX_ obj, elem, val);
+ }
+}
+
STATIC void su_localize(pTHX_ void *ud_) {
#define su_localize(U) su_localize(aTHX_ (U))
su_ud_localize *ud = (su_ud_localize *) ud_;
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);
}
switch (t) {
case SVt_PVAV:
if (elem) {
- I32 idx = SvIV(elem);
- AV *av = GvAV(gv);
- I32 preeminent = su_av_preeminent(av, idx);
- SV **svp = av_fetch(av, idx, 1);
- if (!*svp || *svp == &PL_sv_undef) croak(PL_no_aelem, idx);
- su_save_aelem(av, idx, svp, preeminent);
- gv = (GV *) *svp;
- goto maybe_deref;
+ su_localize_elem(GvAV(gv), elem, val, su_save_aelem);
+ goto done;
} else
save_ary(gv);
break;
case SVt_PVHV:
if (elem) {
- HV *hv = GvHV(gv);
- I32 preeminent = su_hv_preeminent(hv, elem);
- HE *he = hv_fetch_ent(hv, elem, 1, 0);
- SV **svp = he ? &HeVAL(he) : NULL;
- 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;
+ su_localize_elem(GvHV(gv), elem, val, su_save_helem);
+ 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, ...)
PROTOTYPE: $$$;$
PREINIT:
- I32 level = 0;
+ I32 level = 0, slots = 1;
su_ud_localize *ud;
CODE:
SU_GET_LEVEL(3);
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;
+ if (SvROK(elem) && (elem = SvRV(elem), SvTYPE(elem) == SVt_PVAV))
+ slots = 1 + av_len((AV *) elem);
+ su_init(level, ud, slots * 4);
+void
+localize_delete(SV *sv, SV *elem, ...)
+PROTOTYPE: $$;$
+PREINIT:
+ I32 level = 0, slots = 1;
+ 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;
+ if (SvROK(elem) && (elem = SvRV(elem), SvTYPE(elem) == SVt_PVAV))
+ slots = 1 + av_len((AV *) elem);
+ su_init(level, ud, slots * 3);
projects / perl / modules / Scope-Upper.git / blobdiff