Skip to content

Commit

Permalink
Eliminate (SV *) casts from the rest of *.c, picking up one (further)
Browse files Browse the repository at this point in the history 
erroneous const in dump.c.

p4raw-id: //depot/perl@34675
  • Loading branch information
@nwc10
nwc10 committed Oct 30, 2008
1 parent b3dbd76 commit ad64d0e
Show file tree
Hide file tree
Showing 20 changed files with 406 additions and 392 deletions.
82 changes: 43 additions & 39 deletions av.c
View file
Expand Up @@ -33,7 +33,7 @@ Perl_av_reify(pTHX_ AV *av)
if (AvREAL(av))
return;
#ifdef DEBUGGING
if (SvTIED_mg((SV*)av, PERL_MAGIC_tied) && ckWARN_d(WARN_DEBUGGING))
if (SvTIED_mg((const SV *)av, PERL_MAGIC_tied) && ckWARN_d(WARN_DEBUGGING))
Perl_warner(aTHX_ packWARN(WARN_DEBUGGING), "av_reify called on tied array");
#endif
key = AvMAX(av) + 1;
Expand Down Expand Up @@ -70,15 +70,15 @@ Perl_av_extend(pTHX_ AV *av, I32 key)
PERL_ARGS_ASSERT_AV_EXTEND;
assert(SvTYPE(av) == SVt_PVAV);

mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied);
mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied);
if (mg) {
dSP;
ENTER;
SAVETMPS;
PUSHSTACKi(PERLSI_MAGIC);
PUSHMARK(SP);
EXTEND(SP,2);
PUSHs(SvTIED_obj((SV*)av, mg));
PUSHs(SvTIED_obj(MUTABLE_SV(av), mg));
mPUSHi(key + 1);
PUTBACK;
call_method("EXTEND", G_SCALAR|G_DISCARD);
Expand Down Expand Up @@ -215,15 +215,17 @@ Perl_av_fetch(pTHX_ register AV *av, I32 key, I32 lval)
assert(SvTYPE(av) == SVt_PVAV);

if (SvRMAGICAL(av)) {
const MAGIC * const tied_magic = mg_find((SV*)av, PERL_MAGIC_tied);
if (tied_magic || mg_find((SV*)av, PERL_MAGIC_regdata)) {
const MAGIC * const tied_magic
= mg_find((const SV *)av, PERL_MAGIC_tied);
if (tied_magic || mg_find((const SV *)av, PERL_MAGIC_regdata)) {
SV *sv;
if (key < 0) {
I32 adjust_index = 1;
if (tied_magic) {
/* Handle negative array indices 20020222 MJD */
SV * const * const negative_indices_glob =
hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *)av, tied_magic))),
hv_fetch(SvSTASH(SvRV(SvTIED_obj(MUTABLE_SV(av),
tied_magic))),
NEGATIVE_INDICES_VAR, 16, 0);

if (negative_indices_glob && SvTRUE(GvSV(*negative_indices_glob)))
Expand All @@ -239,7 +241,7 @@ Perl_av_fetch(pTHX_ register AV *av, I32 key, I32 lval)

sv = sv_newmortal();
sv_upgrade(sv, SVt_PVLV);
mg_copy((SV*)av, sv, 0, key);
mg_copy(MUTABLE_SV(av), sv, 0, key);
LvTYPE(sv) = 't';
LvTARG(sv) = sv; /* fake (SV**) */
return &(LvTARG(sv));
Expand Down Expand Up @@ -306,13 +308,13 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val)
val = &PL_sv_undef;

if (SvRMAGICAL(av)) {
const MAGIC * const tied_magic = mg_find((SV*)av, PERL_MAGIC_tied);
const MAGIC * const tied_magic = mg_find((const SV *)av, PERL_MAGIC_tied);
if (tied_magic) {
/* Handle negative array indices 20020222 MJD */
if (key < 0) {
bool adjust_index = 1;
SV * const * const negative_indices_glob =
hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *)av,
hv_fetch(SvSTASH(SvRV(SvTIED_obj(MUTABLE_SV(av),
tied_magic))),
NEGATIVE_INDICES_VAR, 16, 0);
if (negative_indices_glob
Expand All @@ -325,7 +327,7 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val)
}
}
if (val != &PL_sv_undef) {
mg_copy((SV*)av, val, 0, key);
mg_copy(MUTABLE_SV(av), val, 0, key);
}
return NULL;
}
Expand Down Expand Up @@ -362,12 +364,12 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val)
if (SvSMAGICAL(av)) {
const MAGIC* const mg = SvMAGIC(av);
if (val != &PL_sv_undef) {
sv_magic(val, (SV*)av, toLOWER(mg->mg_type), 0, key);
sv_magic(val, MUTABLE_SV(av), toLOWER(mg->mg_type), 0, key);
}
if (PL_delaymagic && mg->mg_type == PERL_MAGIC_isa)
PL_delaymagic |= DM_ARRAY;
else
mg_set((SV*)av);
mg_set(MUTABLE_SV(av));
}
return &ary[key];
}
Expand Down Expand Up @@ -440,7 +442,7 @@ Perl_av_clear(pTHX_ register AV *av)
if (PL_delaymagic && mg && mg->mg_type == PERL_MAGIC_isa)
PL_delaymagic |= DM_ARRAY;
else
mg_clear((SV*)av);
mg_clear(MUTABLE_SV(av));
}

if (AvMAX(av) < 0)
Expand Down Expand Up @@ -481,7 +483,7 @@ Perl_av_undef(pTHX_ register AV *av)
assert(SvTYPE(av) == SVt_PVAV);

/* Give any tie a chance to cleanup first */
if (SvTIED_mg((SV*)av, PERL_MAGIC_tied))
if (SvTIED_mg((const SV *)av, PERL_MAGIC_tied))
av_fill(av, -1);

if (AvREAL(av)) {
Expand All @@ -495,7 +497,7 @@ Perl_av_undef(pTHX_ register AV *av)
AvARRAY(av) = NULL;
AvMAX(av) = AvFILLp(av) = -1;

if(SvRMAGICAL(av)) mg_clear((SV*)av);
if(SvRMAGICAL(av)) mg_clear(MUTABLE_SV(av));
}

/*
Expand Down Expand Up @@ -539,12 +541,12 @@ Perl_av_push(pTHX_ register AV *av, SV *val)
if (SvREADONLY(av))
Perl_croak(aTHX_ PL_no_modify);

if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) {
dSP;
PUSHSTACKi(PERLSI_MAGIC);
PUSHMARK(SP);
EXTEND(SP,2);
PUSHs(SvTIED_obj((SV*)av, mg));
PUSHs(SvTIED_obj(MUTABLE_SV(av), mg));
PUSHs(val);
PUTBACK;
ENTER;
Expand Down Expand Up @@ -577,11 +579,11 @@ Perl_av_pop(pTHX_ register AV *av)

if (SvREADONLY(av))
Perl_croak(aTHX_ PL_no_modify);
if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) {
dSP;
PUSHSTACKi(PERLSI_MAGIC);
PUSHMARK(SP);
XPUSHs(SvTIED_obj((SV*)av, mg));
XPUSHs(SvTIED_obj(MUTABLE_SV(av), mg));
PUTBACK;
ENTER;
if (call_method("POP", G_SCALAR)) {
Expand All @@ -598,7 +600,7 @@ Perl_av_pop(pTHX_ register AV *av)
retval = AvARRAY(av)[AvFILLp(av)];
AvARRAY(av)[AvFILLp(av)--] = &PL_sv_undef;
if (SvSMAGICAL(av))
mg_set((SV*)av);
mg_set(MUTABLE_SV(av));
return retval;
}

Expand Down Expand Up @@ -647,12 +649,12 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num)
if (SvREADONLY(av))
Perl_croak(aTHX_ PL_no_modify);

if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) {
dSP;
PUSHSTACKi(PERLSI_MAGIC);
PUSHMARK(SP);
EXTEND(SP,1+num);
PUSHs(SvTIED_obj((SV*)av, mg));
PUSHs(SvTIED_obj(MUTABLE_SV(av), mg));
while (num-- > 0) {
PUSHs(&PL_sv_undef);
}
Expand Down Expand Up @@ -719,11 +721,11 @@ Perl_av_shift(pTHX_ register AV *av)

if (SvREADONLY(av))
Perl_croak(aTHX_ PL_no_modify);
if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) {
dSP;
PUSHSTACKi(PERLSI_MAGIC);
PUSHMARK(SP);
XPUSHs(SvTIED_obj((SV*)av, mg));
XPUSHs(SvTIED_obj(MUTABLE_SV(av), mg));
PUTBACK;
ENTER;
if (call_method("SHIFT", G_SCALAR)) {
Expand All @@ -744,7 +746,7 @@ Perl_av_shift(pTHX_ register AV *av)
AvMAX(av)--;
AvFILLp(av)--;
if (SvSMAGICAL(av))
mg_set((SV*)av);
mg_set(MUTABLE_SV(av));
return retval;
}

Expand Down Expand Up @@ -791,14 +793,14 @@ Perl_av_fill(pTHX_ register AV *av, I32 fill)

if (fill < 0)
fill = -1;
if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) {
dSP;
ENTER;
SAVETMPS;
PUSHSTACKi(PERLSI_MAGIC);
PUSHMARK(SP);
EXTEND(SP,2);
PUSHs(SvTIED_obj((SV*)av, mg));
PUSHs(SvTIED_obj(MUTABLE_SV(av), mg));
mPUSHi(fill + 1);
PUTBACK;
call_method("STORESIZE", G_SCALAR|G_DISCARD);
Expand All @@ -824,7 +826,7 @@ Perl_av_fill(pTHX_ register AV *av, I32 fill)

AvFILLp(av) = fill;
if (SvSMAGICAL(av))
mg_set((SV*)av);
mg_set(MUTABLE_SV(av));
}
else
(void)av_store(av,fill,&PL_sv_undef);
Expand Down Expand Up @@ -852,15 +854,16 @@ Perl_av_delete(pTHX_ AV *av, I32 key, I32 flags)
Perl_croak(aTHX_ PL_no_modify);

if (SvRMAGICAL(av)) {
const MAGIC * const tied_magic = mg_find((SV*)av, PERL_MAGIC_tied);
if ((tied_magic || mg_find((SV*)av, PERL_MAGIC_regdata))) {
const MAGIC * const tied_magic
= mg_find((const SV *)av, PERL_MAGIC_tied);
if ((tied_magic || mg_find((const SV *)av, PERL_MAGIC_regdata))) {
/* Handle negative array indices 20020222 MJD */
SV **svp;
if (key < 0) {
unsigned adjust_index = 1;
if (tied_magic) {
SV * const * const negative_indices_glob =
hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *)av,
hv_fetch(SvSTASH(SvRV(SvTIED_obj(MUTABLE_SV(av),
tied_magic))),
NEGATIVE_INDICES_VAR, 16, 0);
if (negative_indices_glob
Expand Down Expand Up @@ -907,7 +910,7 @@ Perl_av_delete(pTHX_ AV *av, I32 key, I32 flags)
else
AvARRAY(av)[key] = &PL_sv_undef;
if (SvSMAGICAL(av))
mg_set((SV*)av);
mg_set(MUTABLE_SV(av));
}
if (flags & G_DISCARD) {
SvREFCNT_dec(sv);
Expand Down Expand Up @@ -936,16 +939,17 @@ Perl_av_exists(pTHX_ AV *av, I32 key)
assert(SvTYPE(av) == SVt_PVAV);

if (SvRMAGICAL(av)) {
const MAGIC * const tied_magic = mg_find((SV*)av, PERL_MAGIC_tied);
if (tied_magic || mg_find((SV*)av, PERL_MAGIC_regdata)) {
const MAGIC * const tied_magic
= mg_find((const SV *)av, PERL_MAGIC_tied);
if (tied_magic || mg_find((const SV *)av, PERL_MAGIC_regdata)) {
SV * const sv = sv_newmortal();
MAGIC *mg;
/* Handle negative array indices 20020222 MJD */
if (key < 0) {
unsigned adjust_index = 1;
if (tied_magic) {
SV * const * const negative_indices_glob =
hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *)av,
hv_fetch(SvSTASH(SvRV(SvTIED_obj(MUTABLE_SV(av),
tied_magic))),
NEGATIVE_INDICES_VAR, 16, 0);
if (negative_indices_glob
Expand All @@ -959,7 +963,7 @@ Perl_av_exists(pTHX_ AV *av, I32 key)
}
}

mg_copy((SV*)av, sv, 0, key);
mg_copy(MUTABLE_SV(av), sv, 0, key);
mg = mg_find(sv, PERL_MAGIC_tiedelem);
if (mg) {
magic_existspack(sv, mg);
Expand Down Expand Up @@ -992,11 +996,11 @@ S_get_aux_mg(pTHX_ AV *av) {
PERL_ARGS_ASSERT_GET_AUX_MG;
assert(SvTYPE(av) == SVt_PVAV);

mg = mg_find((SV*)av, PERL_MAGIC_arylen_p);
mg = mg_find((const SV *)av, PERL_MAGIC_arylen_p);

if (!mg) {
mg = sv_magicext((SV*)av, 0, PERL_MAGIC_arylen_p, &PL_vtbl_arylen_p,
0, 0);
mg = sv_magicext(MUTABLE_SV(av), 0, PERL_MAGIC_arylen_p,
&PL_vtbl_arylen_p, 0, 0);
assert(mg);
/* sv_magicext won't set this for us because we pass in a NULL obj */
mg->mg_flags |= MGf_REFCOUNTED;
Expand Down
14 changes: 7 additions & 7 deletions doop.c
View file
Expand Up @@ -316,7 +316,7 @@ S_do_trans_simple_utf8(pTHX_ SV * const sv)
#ifdef USE_ITHREADS
PAD_SVl(cPADOP->op_padix);
#else
(SV*)cSVOP->op_sv;
MUTABLE_SV(cSVOP->op_sv);
#endif
HV* const hv = MUTABLE_HV(SvRV(rv));
SV* const * svp = hv_fetchs(hv, "NONE", FALSE);
Expand Down Expand Up @@ -418,7 +418,7 @@ S_do_trans_count_utf8(pTHX_ SV * const sv)
#ifdef USE_ITHREADS
PAD_SVl(cPADOP->op_padix);
#else
(SV*)cSVOP->op_sv;
MUTABLE_SV(cSVOP->op_sv);
#endif
HV* const hv = MUTABLE_HV(SvRV(rv));
SV* const * const svp = hv_fetchs(hv, "NONE", FALSE);
Expand Down Expand Up @@ -469,7 +469,7 @@ S_do_trans_complex_utf8(pTHX_ SV * const sv)
#ifdef USE_ITHREADS
PAD_SVl(cPADOP->op_padix);
#else
(SV*)cSVOP->op_sv;
MUTABLE_SV(cSVOP->op_sv);
#endif
HV * const hv = MUTABLE_HV(SvRV(rv));
SV * const *svp = hv_fetchs(hv, "NONE", FALSE);
Expand Down Expand Up @@ -1002,7 +1002,7 @@ Perl_do_chop(pTHX_ register SV *astr, register SV *sv)
const I32 max = AvFILL(av);

for (i = 0; i <= max; i++) {
sv = (SV*)av_fetch(av, i, FALSE);
sv = MUTABLE_SV(av_fetch(av, i, FALSE));
if (sv && ((sv = *(SV**)sv), sv != &PL_sv_undef))
do_chop(astr, sv);
}
Expand Down Expand Up @@ -1088,7 +1088,7 @@ Perl_do_chomp(pTHX_ register SV *sv)
const I32 max = AvFILL(av);

for (i = 0; i <= max; i++) {
sv = (SV*)av_fetch(av, i, FALSE);
sv = MUTABLE_SV(av_fetch(av, i, FALSE));
if (sv && ((sv = *(SV**)sv), sv != &PL_sv_undef))
count += do_chomp(sv);
}
Expand Down Expand Up @@ -1465,7 +1465,7 @@ Perl_do_kv(pTHX)
sv_magic(TARG, NULL, PERL_MAGIC_nkeys, NULL, 0);
}
LvTYPE(TARG) = 'k';
if (LvTARG(TARG) != (SV*)keys) {
if (LvTARG(TARG) != (const SV *)keys) {
if (LvTARG(TARG))
SvREFCNT_dec(LvTARG(TARG));
LvTARG(TARG) = SvREFCNT_inc_simple(keys);
Expand All @@ -1474,7 +1474,7 @@ Perl_do_kv(pTHX)
RETURN;
}

if (! SvTIED_mg((SV*)keys, PERL_MAGIC_tied) )
if (! SvTIED_mg((const SV *)keys, PERL_MAGIC_tied) )
{
i = HvKEYS(keys);
}
Expand Down

0 comments on commit ad64d0e

Please sign in to comment.