# define PERL_MAGIC_env 'E'
#endif
+#ifndef NEGATIVE_INDICES_VAR
+# define NEGATIVE_INDICES_VAR "NEGATIVE_INDICES"
+#endif
+
#define SU_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
/* --- Stack manipulations ------------------------------------------------- */
/* ... Saving array elements ............................................... */
-STATIC I32 su_av_preeminent(pTHX_ AV *av, I32 key) {
-#define su_av_preeminent(A, K) su_av_preeminent(aTHX_ (A), (K))
- MAGIC *mg;
- HV *stash;
+STATIC I32 su_av_key2idx(pTHX_ AV *av, I32 key) {
+#define su_av_key2idx(A, K) su_av_key2idx(aTHX_ (A), (K))
+ I32 idx;
+
+ if (key >= 0)
+ return key;
+
+/* Added by MJD in perl-5.8.1 with 6f12eb6d2a1dfaf441504d869b27d2e40ef4966a */
+#if SU_HAS_PERL(5, 8, 1)
+ if (SvRMAGICAL(av)) {
+ const MAGIC * const tied_magic = mg_find((SV *) av, PERL_MAGIC_tied);
+ if (tied_magic) {
+ int adjust_index = 1;
+ SV * const * const negative_indices_glob =
+ hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *) (av), tied_magic))),
+ NEGATIVE_INDICES_VAR, 16, 0);
+ if (negative_indices_glob && SvTRUE(GvSV(*negative_indices_glob)))
+ return key;
+ }
+ }
+#endif
- if (!av) return 0;
- if (SvCANEXISTDELETE(av))
- return av_exists(av, key);
+ idx = key + av_len(av) + 1;
+ if (idx < 0)
+ return key;
- return 1;
+ return idx;
}
#ifndef SAVEADELETE
typedef struct {
AV *av;
- I32 key;
+ I32 idx;
} su_ud_adelete;
STATIC void su_adelete(pTHX_ void *ud_) {
su_ud_adelete *ud = ud_;
- av_delete(ud->av, ud->key, G_DISCARD);
+ av_delete(ud->av, ud->idx, G_DISCARD);
SvREFCNT_dec(ud->av);
Safefree(ud);
}
-STATIC void su_save_adelete(pTHX_ AV *av, I32 key) {
+STATIC void su_save_adelete(pTHX_ AV *av, I32 idx) {
#define su_save_adelete(A, K) su_save_adelete(aTHX_ (A), (K))
su_ud_adelete *ud;
Newx(ud, 1, su_ud_adelete);
ud->av = av;
- ud->key = key;
+ ud->idx = idx;
SvREFCNT_inc(av);
SAVEDESTRUCTOR_X(su_adelete, ud);
#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_ AV *av, SV *key, SV *val) {
+#define su_save_aelem(A, K, V) su_save_aelem(aTHX_ (A), (K), (V))
+ I32 idx;
+ I32 preeminent = 1;
+ SV **svp;
+ HV *stash;
+ MAGIC *mg;
+
+ idx = su_av_key2idx(av, SvIV(key));
+
+ if (SvCANEXISTDELETE(av))
+ preeminent = av_exists(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 ................................................ */
-STATIC I32 su_hv_preeminent(pTHX_ HV *hv, SV *keysv) {
-#define su_hv_preeminent(H, K) su_hv_preeminent(aTHX_ (H), (K))
- MAGIC *mg;
+STATIC void su_save_helem(pTHX_ HV *hv, SV *keysv, SV *val) {
+#define su_save_helem(H, K, V) su_save_helem(aTHX_ (H), (K), (V))
+ I32 preeminent = 1;
+ HE *he;
+ SV **svp;
HV *stash;
+ MAGIC *mg;
- if (!hv) return 0;
if (SvCANEXISTDELETE(hv) || mg_find((SV *) hv, PERL_MAGIC_env))
- return hv_exists_ent(hv, keysv, 0);
+ preeminent = hv_exists_ent(hv, keysv, 0);
- return 1;
-}
+ 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));
-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))
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 ------------------------------------------------------------- */
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;
- if (val) { /* local $x[$idx] = $val; */
- goto maybe_deref;
- } else { /* local $x[$idx]; delete $x[$idx]; */
- av_delete(av, idx, G_DISCARD);
- goto done;
- }
+ su_save_aelem(GvAV(gv), elem, val);
+ 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;
- 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;
- }
+ su_save_helem(GvHV(gv), elem, val);
+ goto done;
} else
save_hash(gv);
break;
projects / perl / modules / Scope-Upper.git / blobdiff