diff options
| -rw-r--r-- | doio.c | 4 | ||||
| -rw-r--r-- | ext/List/Util/Util.xs | 2 | ||||
| -rwxr-xr-x | ext/threads/threads.xs | 2 | ||||
| -rw-r--r-- | op.c | 2 | ||||
| -rw-r--r-- | pp.c | 6 | ||||
| -rw-r--r-- | pp_ctl.c | 2 | ||||
| -rw-r--r-- | pp_hot.c | 4 | ||||
| -rw-r--r-- | sv.c | 102 | ||||
| -rw-r--r-- | toke.c | 18 | ||||
| -rw-r--r-- | util.c | 6 |
10 files changed, 74 insertions, 74 deletions
@@ -674,10 +674,10 @@ Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw, sv = *av_fetch(PL_fdpid,fd,TRUE); (void)SvUPGRADE(sv, SVt_IV); pid = SvIVX(sv); - SvIVX(sv) = 0; + SvIV_set(sv, 0); sv = *av_fetch(PL_fdpid,savefd,TRUE); (void)SvUPGRADE(sv, SVt_IV); - SvIVX(sv) = pid; + SvIV_set(sv, pid); UNLOCK_FDPID_MUTEX; } #endif diff --git a/ext/List/Util/Util.xs b/ext/List/Util/Util.xs index a1f956a6d6..96b8cab534 100644 --- a/ext/List/Util/Util.xs +++ b/ext/List/Util/Util.xs @@ -364,7 +364,7 @@ CODE: } #endif else { - SvIVX(ST(0)) = SvIV(num); + SvIV_set(ST(0), SvIV(num)); SvIOK_on(ST(0)); } if(PL_tainting && (SvTAINTED(num) || SvTAINTED(str))) diff --git a/ext/threads/threads.xs b/ext/threads/threads.xs index 693c922c82..03cb590b13 100755 --- a/ext/threads/threads.xs +++ b/ext/threads/threads.xs @@ -205,7 +205,7 @@ int ithread_mg_get(pTHX_ SV *sv, MAGIC *mg) { ithread *thread = (ithread *) mg->mg_ptr; - SvIVX(sv) = PTR2IV(thread); + SvIV_set(sv, PTR2IV(thread)); SvIOK_on(sv); return 0; } @@ -3444,7 +3444,7 @@ Perl_newSTATEOP(pTHX_ I32 flags, char *label, OP *o) SV **svp = av_fetch(CopFILEAV(PL_curcop), (I32)CopLINE(cop), FALSE); if (svp && *svp != &PL_sv_undef ) { (void)SvIOK_on(*svp); - SvIVX(*svp) = PTR2IV(cop); + SvIV_set(*svp, PTR2IV(cop)); } } @@ -844,7 +844,7 @@ PP(pp_predec) if (!SvREADONLY(TOPs) && SvIOK_notUV(TOPs) && !SvNOK(TOPs) && !SvPOK(TOPs) && SvIVX(TOPs) != IV_MIN) { - --SvIVX(TOPs); + SvIV_set(TOPs, SvIVX(TOPs) - 1); SvFLAGS(TOPs) &= ~(SVp_NOK|SVp_POK); } else @@ -862,7 +862,7 @@ PP(pp_postinc) if (!SvREADONLY(TOPs) && SvIOK_notUV(TOPs) && !SvNOK(TOPs) && !SvPOK(TOPs) && SvIVX(TOPs) != IV_MAX) { - ++SvIVX(TOPs); + SvIV_set(TOPs, SvIVX(TOPs) + 1); SvFLAGS(TOPs) &= ~(SVp_NOK|SVp_POK); } else @@ -884,7 +884,7 @@ PP(pp_postdec) if (!SvREADONLY(TOPs) && SvIOK_notUV(TOPs) && !SvNOK(TOPs) && !SvPOK(TOPs) && SvIVX(TOPs) != IV_MIN) { - --SvIVX(TOPs); + SvIV_set(TOPs, SvIVX(TOPs) - 1); SvFLAGS(TOPs) &= ~(SVp_NOK|SVp_POK); } else @@ -2430,7 +2430,7 @@ PP(pp_goto) (void)SvUPGRADE(sv, SVt_PVIV); (void)SvIOK_on(sv); SAVEIV(SvIVX(sv)); - SvIVX(sv) = PTR2IV(cv); /* Do it the quickest way */ + SvIV_set(sv, PTR2IV(cv)); /* Do it the quickest way */ } else { save_item(sv); gv_efullname3(sv, CvGV(cv), Nullch); @@ -315,7 +315,7 @@ PP(pp_preinc) if (!SvREADONLY(TOPs) && SvIOK_notUV(TOPs) && !SvNOK(TOPs) && !SvPOK(TOPs) && SvIVX(TOPs) != IV_MAX) { - ++SvIVX(TOPs); + SvIV_set(TOPs, SvIVX(TOPs) + 1); SvFLAGS(TOPs) &= ~(SVp_NOK|SVp_POK); } else /* Do all the PERL_PRESERVE_IVUV conditionals in sv_inc */ @@ -2594,7 +2594,7 @@ S_get_db_sub(pTHX_ SV **svp, CV *cv) (void)SvUPGRADE(dbsv, SVt_PVIV); (void)SvIOK_on(dbsv); SAVEIV(SvIVX(dbsv)); - SvIVX(dbsv) = PTR2IV(cv); /* Do it the quickest way */ + SvIV_set(dbsv, PTR2IV(cv)); /* Do it the quickest way */ } if (CvXSUB(cv)) @@ -1898,7 +1898,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) Perl_croak(aTHX_ "Can't upgrade to undef"); case SVt_IV: SvANY(sv) = new_XIV(); - SvIVX(sv) = iv; + SvIV_set(sv, iv); break; case SVt_NV: SvANY(sv) = new_XNV(); @@ -1919,7 +1919,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; - SvIVX(sv) = iv; + SvIV_set(sv, iv); if (SvNIOK(sv)) (void)SvIOK_on(sv); SvNOK_off(sv); @@ -1929,7 +1929,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; - SvIVX(sv) = iv; + SvIV_set(sv, iv); SvNV_set(sv, nv); break; case SVt_PVMG: @@ -1937,7 +1937,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; - SvIVX(sv) = iv; + SvIV_set(sv, iv); SvNV_set(sv, nv); SvMAGIC(sv) = magic; SvSTASH(sv) = stash; @@ -1947,7 +1947,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; - SvIVX(sv) = iv; + SvIV_set(sv, iv); SvNV_set(sv, nv); SvMAGIC(sv) = magic; SvSTASH(sv) = stash; @@ -1968,7 +1968,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) SvPVX(sv) = 0; AvMAX(sv) = -1; AvFILLp(sv) = -1; - SvIVX(sv) = 0; + SvIV_set(sv, 0); SvNV_set(sv, 0.0); SvMAGIC(sv) = magic; SvSTASH(sv) = stash; @@ -1998,7 +1998,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; - SvIVX(sv) = iv; + SvIV_set(sv, iv); SvNV_set(sv, nv); SvMAGIC(sv) = magic; SvSTASH(sv) = stash; @@ -2008,7 +2008,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; - SvIVX(sv) = iv; + SvIV_set(sv, iv); SvNV_set(sv, nv); SvMAGIC(sv) = magic; SvSTASH(sv) = stash; @@ -2023,7 +2023,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; - SvIVX(sv) = iv; + SvIV_set(sv, iv); SvNV_set(sv, nv); SvMAGIC(sv) = magic; SvSTASH(sv) = stash; @@ -2037,7 +2037,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; - SvIVX(sv) = iv; + SvIV_set(sv, iv); SvNV_set(sv, nv); SvMAGIC(sv) = magic; SvSTASH(sv) = stash; @@ -2048,7 +2048,7 @@ Perl_sv_upgrade(pTHX_ register SV *sv, U32 mt) SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; - SvIVX(sv) = iv; + SvIV_set(sv, iv); SvNV_set(sv, nv); SvMAGIC(sv) = magic; SvSTASH(sv) = stash; @@ -2181,7 +2181,7 @@ Perl_sv_setiv(pTHX_ register SV *sv, IV i) OP_DESC(PL_op)); } (void)SvIOK_only(sv); /* validate number */ - SvIVX(sv) = i; + SvIV_set(sv, i); SvTAINT(sv); } @@ -2502,7 +2502,7 @@ S_sv_2iuv_non_preserve(pTHX_ register SV *sv, I32 numtype) if (SvNVX(sv) < (NV)IV_MIN) { (void)SvIOKp_on(sv); (void)SvNOK_on(sv); - SvIVX(sv) = IV_MIN; + SvIV_set(sv, IV_MIN); return IS_NUMBER_UNDERFLOW_IV; } if (SvNVX(sv) > (NV)UV_MAX) { @@ -2517,7 +2517,7 @@ S_sv_2iuv_non_preserve(pTHX_ register SV *sv, I32 numtype) /* Can't use strtol etc to convert this string. (See truth table in sv_2iv */ if (SvNVX(sv) <= (UV)IV_MAX) { - SvIVX(sv) = I_V(SvNVX(sv)); + SvIV_set(sv, I_V(SvNVX(sv))); if ((NV)(SvIVX(sv)) == SvNVX(sv)) { SvIOK_on(sv); /* Integer is precise. NOK, IOK */ } else { @@ -2625,7 +2625,7 @@ Perl_sv_2iv_flags(pTHX_ register SV *sv, I32 flags) answer is the UV IV_MAX +1. Hence < ensures that dodgy boundary cases go to UV */ if (SvNVX(sv) < (NV)IV_MAX + 0.5) { - SvIVX(sv) = I_V(SvNVX(sv)); + SvIV_set(sv, I_V(SvNVX(sv))); if (SvNVX(sv) == (NV) SvIVX(sv) #ifndef NV_PRESERVES_UV && (((UV)1 << NV_PRESERVES_UV_BITS) > @@ -2726,7 +2726,7 @@ Perl_sv_2iv_flags(pTHX_ register SV *sv, I32 flags) if (!(numtype & IS_NUMBER_NEG)) { /* positive */; if (value <= (UV)IV_MAX) { - SvIVX(sv) = (IV)value; + SvIV_set(sv, (IV)value); } else { SvUVX(sv) = value; SvIsUV_on(sv); @@ -2734,7 +2734,7 @@ Perl_sv_2iv_flags(pTHX_ register SV *sv, I32 flags) } else { /* 2s complement assumption */ if (value <= (UV)IV_MIN) { - SvIVX(sv) = -(IV)value; + SvIV_set(sv, -(IV)value); } else { /* Too negative for an IV. This is a double upgrade, but I'm assuming it will be rare. */ @@ -2744,7 +2744,7 @@ Perl_sv_2iv_flags(pTHX_ register SV *sv, I32 flags) SvIOK_off(sv); SvIOKp_on(sv); SvNV_set(sv, -(NV)value); - SvIVX(sv) = IV_MIN; + SvIV_set(sv, IV_MIN); } } } @@ -2773,7 +2773,7 @@ Perl_sv_2iv_flags(pTHX_ register SV *sv, I32 flags) (void)SvIOKp_on(sv); (void)SvNOK_on(sv); if (SvNVX(sv) < (NV)IV_MAX + 0.5) { - SvIVX(sv) = I_V(SvNVX(sv)); + SvIV_set(sv, I_V(SvNVX(sv))); if ((NV)(SvIVX(sv)) == SvNVX(sv)) { SvIOK_on(sv); } else { @@ -2813,7 +2813,7 @@ Perl_sv_2iv_flags(pTHX_ register SV *sv, I32 flags) /* Small enough to preserve all bits. */ (void)SvIOKp_on(sv); SvNOK_on(sv); - SvIVX(sv) = I_V(SvNVX(sv)); + SvIV_set(sv, I_V(SvNVX(sv))); if ((NV)(SvIVX(sv)) == SvNVX(sv)) SvIOK_on(sv); /* Assumption: first non-preserved integer is < IV_MAX, @@ -2930,7 +2930,7 @@ Perl_sv_2uv_flags(pTHX_ register SV *sv, I32 flags) (void)SvIOKp_on(sv); /* Must do this first, to clear any SvOOK */ if (SvNVX(sv) < (NV)IV_MAX + 0.5) { - SvIVX(sv) = I_V(SvNVX(sv)); + SvIV_set(sv, I_V(SvNVX(sv))); if (SvNVX(sv) == (NV) SvIVX(sv) #ifndef NV_PRESERVES_UV && (((UV)1 << NV_PRESERVES_UV_BITS) > @@ -3027,7 +3027,7 @@ Perl_sv_2uv_flags(pTHX_ register SV *sv, I32 flags) if (!(numtype & IS_NUMBER_NEG)) { /* positive */; if (value <= (UV)IV_MAX) { - SvIVX(sv) = (IV)value; + SvIV_set(sv, (IV)value); } else { /* it didn't overflow, and it was positive. */ SvUVX(sv) = value; @@ -3036,7 +3036,7 @@ Perl_sv_2uv_flags(pTHX_ register SV *sv, I32 flags) } else { /* 2s complement assumption */ if (value <= (UV)IV_MIN) { - SvIVX(sv) = -(IV)value; + SvIV_set(sv, -(IV)value); } else { /* Too negative for an IV. This is a double upgrade, but I'm assuming it will be rare. */ @@ -3046,7 +3046,7 @@ Perl_sv_2uv_flags(pTHX_ register SV *sv, I32 flags) SvIOK_off(sv); SvIOKp_on(sv); SvNV_set(sv, -(NV)value); - SvIVX(sv) = IV_MIN; + SvIV_set(sv, IV_MIN); } } } @@ -3071,7 +3071,7 @@ Perl_sv_2uv_flags(pTHX_ register SV *sv, I32 flags) (void)SvIOKp_on(sv); (void)SvNOK_on(sv); if (SvNVX(sv) < (NV)IV_MAX + 0.5) { - SvIVX(sv) = I_V(SvNVX(sv)); + SvIV_set(sv, I_V(SvNVX(sv))); if ((NV)(SvIVX(sv)) == SvNVX(sv)) { SvIOK_on(sv); } else { @@ -3111,7 +3111,7 @@ Perl_sv_2uv_flags(pTHX_ register SV *sv, I32 flags) /* Small enough to preserve all bits. */ (void)SvIOKp_on(sv); SvNOK_on(sv); - SvIVX(sv) = I_V(SvNVX(sv)); + SvIV_set(sv, I_V(SvNVX(sv))); if ((NV)(SvIVX(sv)) == SvNVX(sv)) SvIOK_on(sv); /* Assumption: first non-preserved integer is < IV_MAX, @@ -3277,9 +3277,9 @@ Perl_sv_2nv(pTHX_ register SV *sv) SvIOKp_on(sv); if (numtype & IS_NUMBER_NEG) { - SvIVX(sv) = -(IV)value; + SvIV_set(sv, -(IV)value); } else if (value <= (UV)IV_MAX) { - SvIVX(sv) = (IV)value; + SvIV_set(sv, (IV)value); } else { SvUVX(sv) = value; SvIsUV_on(sv); @@ -4209,7 +4209,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags) break; } (void)SvIOK_only(dstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); if (SvIsUV(sstr)) SvIsUV_on(dstr); if (SvTAINTED(sstr)) @@ -4505,7 +4505,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags) SvFLAGS(dstr) |= SVf_IOK; if (sflags & SVf_IVisUV) SvIsUV_on(dstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); } if (SvAMAGIC(sstr)) { SvAMAGIC_on(dstr); @@ -4648,7 +4648,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags) SvFLAGS(dstr) |= SVf_IOK; if (sflags & SVf_IVisUV) SvIsUV_on(dstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); } if (SvVOK(sstr)) { MAGIC *smg = mg_find(sstr,PERL_MAGIC_vstring); @@ -4667,7 +4667,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags) /* XXXX Do we want to set IsUV for IV(ROK)? Be extra safe... */ if (sflags & SVf_IVisUV) SvIsUV_on(dstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); if (sflags & SVp_NOK) { if (sflags & SVf_NOK) (void)SvNOK_on(dstr); @@ -5108,7 +5108,7 @@ Perl_sv_chop(pTHX_ register SV *sv, register char *ptr) Move(pvx,SvPVX(sv),len,char); *SvEND(sv) = '\0'; } - SvIVX(sv) = 0; + SvIV_set(sv, 0); /* Same SvOOK_on but SvOOK_on does a SvIOK_off and we do that anyway inside the SvNIOK_off */ @@ -5118,7 +5118,7 @@ Perl_sv_chop(pTHX_ register SV *sv, register char *ptr) SvLEN(sv) -= delta; SvCUR(sv) -= delta; SvPVX(sv) += delta; - SvIVX(sv) += delta; + SvIV_set(sv, SvIVX(sv) + delta); } /* sv_catpvn() is now a macro using Perl_sv_catpvn_flags(); @@ -7350,7 +7350,7 @@ Perl_sv_inc(pTHX_ register SV *sv) sv_setuv(sv, (UV)IV_MAX + 1); else { (void)SvIOK_only(sv); - ++SvIVX(sv); + SvIV_set(sv, SvIVX(sv) + 1); } } return; @@ -7365,7 +7365,7 @@ Perl_sv_inc(pTHX_ register SV *sv) if ((flags & SVTYPEMASK) < SVt_PVIV) sv_upgrade(sv, SVt_IV); (void)SvIOK_only(sv); - SvIVX(sv) = 1; + SvIV_set(sv, 1); return; } d = SvPVX(sv); @@ -7494,7 +7494,7 @@ Perl_sv_dec(pTHX_ register SV *sv) if (SvIsUV(sv)) { if (SvUVX(sv) == 0) { (void)SvIOK_only(sv); - SvIVX(sv) = -1; + SvIV_set(sv, -1); } else { (void)SvIOK_only_UV(sv); @@ -7505,7 +7505,7 @@ Perl_sv_dec(pTHX_ register SV *sv) sv_setnv(sv, (NV)IV_MIN - 1.0); else { (void)SvIOK_only(sv); - --SvIVX(sv); + SvIV_set(sv, SvIVX(sv) - 1); } } return; @@ -10790,7 +10790,7 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param) break; case SVt_IV: SvANY(dstr) = new_XIV(); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); break; case SVt_NV: SvANY(dstr) = new_XNV(); @@ -10810,14 +10810,14 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param) SvANY(dstr) = new_XPVIV(); SvCUR(dstr) = SvCUR(sstr); SvLEN(dstr) = SvLEN(sstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); Perl_rvpv_dup(aTHX_ dstr, sstr, param); break; case SVt_PVNV: SvANY(dstr) = new_XPVNV(); SvCUR(dstr) = SvCUR(sstr); SvLEN(dstr) = SvLEN(sstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); SvNV_set(dstr, SvNVX(sstr)); Perl_rvpv_dup(aTHX_ dstr, sstr, param); break; @@ -10825,7 +10825,7 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param) SvANY(dstr) = new_XPVMG(); SvCUR(dstr) = SvCUR(sstr); SvLEN(dstr) = SvLEN(sstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); SvNV_set(dstr, SvNVX(sstr)); SvMAGIC(dstr) = mg_dup(SvMAGIC(sstr), param); SvSTASH(dstr) = hv_dup_inc(SvSTASH(sstr), param); @@ -10835,7 +10835,7 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param) SvANY(dstr) = new_XPVBM(); SvCUR(dstr) = SvCUR(sstr); SvLEN(dstr) = SvLEN(sstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); SvNV_set(dstr, SvNVX(sstr)); SvMAGIC(dstr) = mg_dup(SvMAGIC(sstr), param); SvSTASH(dstr) = hv_dup_inc(SvSTASH(sstr), param); @@ -10848,7 +10848,7 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param) SvANY(dstr) = new_XPVLV(); SvCUR(dstr) = SvCUR(sstr); SvLEN(dstr) = SvLEN(sstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); SvNV_set(dstr, SvNVX(sstr)); SvMAGIC(dstr) = mg_dup(SvMAGIC(sstr), param); SvSTASH(dstr) = hv_dup_inc(SvSTASH(sstr), param); @@ -10880,7 +10880,7 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param) SvANY(dstr) = new_XPVGV(); SvCUR(dstr) = SvCUR(sstr); SvLEN(dstr) = SvLEN(sstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); SvNV_set(dstr, SvNVX(sstr)); SvMAGIC(dstr) = mg_dup(SvMAGIC(sstr), param); SvSTASH(dstr) = hv_dup_inc(SvSTASH(sstr), param); @@ -10896,7 +10896,7 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param) SvANY(dstr) = new_XPVIO(); SvCUR(dstr) = SvCUR(sstr); SvLEN(dstr) = SvLEN(sstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); SvNV_set(dstr, SvNVX(sstr)); SvMAGIC(dstr) = mg_dup(SvMAGIC(sstr), param); SvSTASH(dstr) = hv_dup_inc(SvSTASH(sstr), param); @@ -10938,7 +10938,7 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param) SvANY(dstr) = new_XPVAV(); SvCUR(dstr) = SvCUR(sstr); SvLEN(dstr) = SvLEN(sstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); SvNV_set(dstr, SvNVX(sstr)); SvMAGIC(dstr) = mg_dup(SvMAGIC(sstr), param); SvSTASH(dstr) = hv_dup_inc(SvSTASH(sstr), param); @@ -10975,7 +10975,7 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param) SvANY(dstr) = new_XPVHV(); SvCUR(dstr) = SvCUR(sstr); SvLEN(dstr) = SvLEN(sstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); SvNV_set(dstr, SvNVX(sstr)); SvMAGIC(dstr) = mg_dup(SvMAGIC(sstr), param); SvSTASH(dstr) = hv_dup_inc(SvSTASH(sstr), param); @@ -11015,7 +11015,7 @@ Perl_sv_dup(pTHX_ SV *sstr, CLONE_PARAMS* param) dup_pvcv: SvCUR(dstr) = SvCUR(sstr); SvLEN(dstr) = SvLEN(sstr); - SvIVX(dstr) = SvIVX(sstr); + SvIV_set(dstr, SvIVX(sstr)); SvNV_set(dstr, SvNVX(sstr)); SvMAGIC(dstr) = mg_dup(SvMAGIC(sstr), param); SvSTASH(dstr) = hv_dup_inc(SvSTASH(sstr), param); @@ -11694,7 +11694,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, SvPVX(&PL_sv_no) = SAVEPVN(PL_No, 0); SvCUR(&PL_sv_no) = 0; SvLEN(&PL_sv_no) = 1; - SvIVX(&PL_sv_no) = 0; + SvIV_set(&PL_sv_no, 0); SvNV_set(&PL_sv_no, 0); ptr_table_store(PL_ptr_table, &proto_perl->Isv_no, &PL_sv_no); @@ -11705,7 +11705,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, SvPVX(&PL_sv_yes) = SAVEPVN(PL_Yes, 1); SvCUR(&PL_sv_yes) = 1; SvLEN(&PL_sv_yes) = 2; - SvIVX(&PL_sv_yes) = 1; + SvIV_set(&PL_sv_yes, 1); SvNV_set(&PL_sv_yes, 1); ptr_table_store(PL_ptr_table, &proto_perl->Isv_yes, &PL_sv_yes); @@ -775,7 +775,7 @@ S_skipspace(pTHX_ register char *s) sv_upgrade(sv, SVt_PVMG); sv_setpvn(sv,PL_bufptr,PL_bufend-PL_bufptr); (void)SvIOK_on(sv); - SvIVX(sv) = 0; + SvIV_set(sv, 0); av_store(CopFILEAV(PL_curcop),(I32)CopLINE(PL_curcop),sv); } } @@ -2631,7 +2631,7 @@ Perl_yylex(pTHX) sv_upgrade(sv, SVt_PVMG); sv_setsv(sv,PL_linestr); (void)SvIOK_on(sv); - SvIVX(sv) = 0; + SvIV_set(sv, 0); av_store(CopFILEAV(PL_curcop),(I32)CopLINE(PL_curcop),sv); } goto retry; @@ -2718,7 +2718,7 @@ Perl_yylex(pTHX) sv_upgrade(sv, SVt_PVMG); sv_setsv(sv,PL_linestr); (void)SvIOK_on(sv); - SvIVX(sv) = 0; + SvIV_set(sv, 0); av_store(CopFILEAV(PL_curcop),(I32)CopLINE(PL_curcop),sv); } PL_bufend = SvPVX(PL_linestr) + SvCUR(PL_linestr); @@ -4990,7 +4990,7 @@ Perl_yylex(pTHX) missingterm((char*)0); yylval.ival = OP_STRINGIFY; if (SvIVX(PL_lex_stuff) == '\'') - SvIVX(PL_lex_stuff) = 0; /* qq'$foo' should intepolate */ + SvIV_set(PL_lex_stuff, 0); /* qq'$foo' should intepolate */ TERM(sublex_start()); case KEY_qr: @@ -9494,11 +9494,11 @@ S_scan_heredoc(pTHX_ register char *s) sv_upgrade(tmpstr, SVt_PVIV); if (term == '\'') { op_type = OP_CONST; - SvIVX(tmpstr) = -1; + SvIV_set(tmpstr, -1); } else if (term == '`') { op_type = OP_BACKTICK; - SvIVX(tmpstr) = '\\'; + SvIV_set(tmpstr, '\\'); } CLINE; @@ -9584,7 +9584,7 @@ S_scan_heredoc(pTHX_ register char *s) sv_upgrade(sv, SVt_PVMG); sv_setsv(sv,PL_linestr); (void)SvIOK_on(sv); - SvIVX(sv) = 0; + SvIV_set(sv, 0); av_store(CopFILEAV(PL_curcop), (I32)CopLINE(PL_curcop),sv); } if (*s == term && memEQ(s,PL_tokenbuf,len)) { @@ -9870,7 +9870,7 @@ S_scan_str(pTHX_ char *start, int keep_quoted, int keep_delims) assuming. 79 is the SV's initial length. What a random number. */ sv = NEWSV(87,79); sv_upgrade(sv, SVt_PVIV); - SvIVX(sv) = termcode; + SvIV_set(sv, termcode); (void)SvPOK_only(sv); /* validate pointer */ /* move past delimiter and try to read a complete string */ @@ -10056,7 +10056,7 @@ S_scan_str(pTHX_ char *start, int keep_quoted, int keep_delims) sv_upgrade(sv, SVt_PVMG); sv_setsv(sv,PL_linestr); (void)SvIOK_on(sv); - SvIVX(sv) = 0; + SvIV_set(sv, 0); av_store(CopFILEAV(PL_curcop), (I32)CopLINE(PL_curcop), sv); } @@ -2026,7 +2026,7 @@ Perl_my_popen_list(pTHX_ char *mode, int n, SV **args) sv = *av_fetch(PL_fdpid,p[This],TRUE); UNLOCK_FDPID_MUTEX; (void)SvUPGRADE(sv,SVt_IV); - SvIVX(sv) = pid; + SvIV_set(sv, pid); PL_forkprocess = pid; /* If we managed to get status pipe check for exec fail */ if (did_pipes && pid > 0) { @@ -2179,7 +2179,7 @@ Perl_my_popen(pTHX_ char *cmd, char *mode) sv = *av_fetch(PL_fdpid,p[This],TRUE); UNLOCK_FDPID_MUTEX; (void)SvUPGRADE(sv,SVt_IV); - SvIVX(sv) = pid; + SvIV_set(sv, pid); PL_forkprocess = pid; if (did_pipes && pid > 0) { int errkid; @@ -2636,7 +2636,7 @@ Perl_pidgone(pTHX_ Pid_t pid, int status) sprintf(spid, "%"IVdf, (IV)pid); sv = *hv_fetch(PL_pidstatus,spid,strlen(spid),TRUE); (void)SvUPGRADE(sv,SVt_IV); - SvIVX(sv) = status; + SvIV_set(sv, status); return; } |