/* doop.c
*
- * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- * 2000, 2001, 2002, 2004, 2005, 2006, by Larry Wall and others
+ * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+ * 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009 by Larry Wall and others
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
*/
/*
- * "'So that was the job I felt I had to do when I started,' thought Sam."
+ * 'So that was the job I felt I had to do when I started,' thought Sam.
+ *
+ * [p.934 of _The Lord of the Rings_, VI/iii: "Mount Doom"]
*/
/* This file contains some common functions needed to carry out certain
STRLEN len;
U8 *s = (U8*)SvPV(sv,len);
U8 * const send = s+len;
-
const short * const tbl = (short*)cPVOP->op_pv;
+
+ PERL_ARGS_ASSERT_DO_TRANS_SIMPLE;
+
if (!tbl)
Perl_croak(aTHX_ "panic: do_trans_simple line %d",__LINE__);
const U8 *s = (const U8*)SvPV_const(sv, len);
const U8 * const send = s + len;
I32 matches = 0;
-
const short * const tbl = (short*)cPVOP->op_pv;
+
+ PERL_ARGS_ASSERT_DO_TRANS_COUNT;
+
if (!tbl)
Perl_croak(aTHX_ "panic: do_trans_count line %d",__LINE__);
U8 *s = (U8*)SvPV(sv, len);
U8 * const send = s+len;
I32 matches = 0;
-
const short * const tbl = (short*)cPVOP->op_pv;
+
+ PERL_ARGS_ASSERT_DO_TRANS_COMPLEX;
+
if (!tbl)
Perl_croak(aTHX_ "panic: do_trans_complex line %d",__LINE__);
if (complement && !del)
rlen = tbl[0x100];
-#ifdef MACOS_TRADITIONAL
-#define comp CoMP /* "comp" is a keyword in some compilers ... */
-#endif
-
if (PL_op->op_private & OPpTRANS_SQUASH) {
UV pch = 0xfeedface;
while (s < send) {
else {
matches++;
if (!del) {
- ch = (rlen == 0) ? comp :
+ ch = (rlen == 0) ? (I32)comp :
(comp - 0x100 < rlen) ?
tbl[comp+1] : tbl[0x100+rlen];
if ((UV)ch != pch) {
I32 matches = 0;
const I32 grows = PL_op->op_private & OPpTRANS_GROWS;
STRLEN len;
-
- SV* const rv = (SV*)cSVOP->op_sv;
- HV* const hv = (HV*)SvRV(rv);
+ SV* const rv =
+#ifdef USE_ITHREADS
+ PAD_SVl(cPADOP->op_padix);
+#else
+ MUTABLE_SV(cSVOP->op_sv);
+#endif
+ HV* const hv = MUTABLE_HV(SvRV(rv));
SV* const * svp = hv_fetchs(hv, "NONE", FALSE);
const UV none = svp ? SvUV(*svp) : 0x7fffffff;
const UV extra = none + 1;
UV final = 0;
U8 hibit = 0;
+ PERL_ARGS_ASSERT_DO_TRANS_SIMPLE_UTF8;
+
s = (U8*)SvPV(sv, len);
if (!SvUTF8(sv)) {
const U8 *t = s;
const U8 *send;
I32 matches = 0;
STRLEN len;
-
- SV* const rv = (SV*)cSVOP->op_sv;
- HV* const hv = (HV*)SvRV(rv);
+ SV* const rv =
+#ifdef USE_ITHREADS
+ PAD_SVl(cPADOP->op_padix);
+#else
+ MUTABLE_SV(cSVOP->op_sv);
+#endif
+ HV* const hv = MUTABLE_HV(SvRV(rv));
SV* const * const svp = hv_fetchs(hv, "NONE", FALSE);
const UV none = svp ? SvUV(*svp) : 0x7fffffff;
const UV extra = none + 1;
U8 hibit = 0;
+ PERL_ARGS_ASSERT_DO_TRANS_COUNT_UTF8;
+
s = (const U8*)SvPV_const(sv, len);
if (!SvUTF8(sv)) {
const U8 *t = s;
const I32 squash = PL_op->op_private & OPpTRANS_SQUASH;
const I32 del = PL_op->op_private & OPpTRANS_DELETE;
const I32 grows = PL_op->op_private & OPpTRANS_GROWS;
- SV * const rv = (SV*)cSVOP->op_sv;
- HV * const hv = (HV*)SvRV(rv);
+ SV* const rv =
+#ifdef USE_ITHREADS
+ PAD_SVl(cPADOP->op_padix);
+#else
+ MUTABLE_SV(cSVOP->op_sv);
+#endif
+ HV * const hv = MUTABLE_HV(SvRV(rv));
SV * const *svp = hv_fetchs(hv, "NONE", FALSE);
const UV none = svp ? SvUV(*svp) : 0x7fffffff;
const UV extra = none + 1;
STRLEN len;
U8 *dstart, *dend;
U8 hibit = 0;
-
U8 *s = (U8*)SvPV(sv, len);
+
+ PERL_ARGS_ASSERT_DO_TRANS_COMPLEX_UTF8;
+
if (!SvUTF8(sv)) {
const U8 *t = s;
const U8 * const e = s + len;
const I32 hasutf = (PL_op->op_private &
(OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF));
- if (SvREADONLY(sv)) {
+ PERL_ARGS_ASSERT_DO_TRANS;
+
+ if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL)) {
if (SvIsCOW(sv))
sv_force_normal_flags(sv, 0);
- if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL))
- Perl_croak(aTHX_ PL_no_modify);
+ if (SvREADONLY(sv))
+ Perl_croak(aTHX_ "%s", PL_no_modify);
}
(void)SvPV_const(sv, len);
if (!len)
}
void
-Perl_do_join(pTHX_ register SV *sv, SV *del, register SV **mark, register SV **sp)
+Perl_do_join(pTHX_ register SV *sv, SV *delim, register SV **mark, register SV **sp)
{
dVAR;
SV ** const oldmark = mark;
register STRLEN len;
STRLEN delimlen;
- (void) SvPV_const(del, delimlen); /* stringify and get the delimlen */
+ PERL_ARGS_ASSERT_DO_JOIN;
+
+ (void) SvPV_const(delim, delimlen); /* stringify and get the delimlen */
/* SvCUR assumes it's SvPOK() and woe betide you if it's not. */
mark++;
++mark;
}
- sv_setpvn(sv, "", 0);
+ sv_setpvs(sv, "");
/* sv_setpv retains old UTF8ness [perl #24846] */
SvUTF8_off(sv);
if (delimlen) {
for (; items > 0; items--,mark++) {
- sv_catsv(sv,del);
+ sv_catsv(sv,delim);
sv_catsv(sv,*mark);
}
}
const char * const pat = SvPV_const(*sarg, patlen);
bool do_taint = FALSE;
+ PERL_ARGS_ASSERT_DO_SPRINTF;
+
SvUTF8_off(sv);
if (DO_UTF8(*sarg))
SvUTF8_on(sv);
Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size)
{
dVAR;
- STRLEN srclen, len;
+ STRLEN srclen, len, uoffset, bitoffs = 0;
const unsigned char *s = (const unsigned char *) SvPV_const(sv, srclen);
UV retnum = 0;
+ PERL_ARGS_ASSERT_DO_VECGET;
+
if (offset < 0)
- return retnum;
+ return 0;
if (size < 1 || (size & (size-1))) /* size < 1 or not a power of two */
Perl_croak(aTHX_ "Illegal number of bits in vec");
if (SvUTF8(sv))
(void) Perl_sv_utf8_downgrade(aTHX_ sv, TRUE);
- offset *= size; /* turn into bit offset */
- len = (offset + size + 7) / 8; /* required number of bytes */
+ if (size < 8) {
+ bitoffs = ((offset%8)*size)%8;
+ uoffset = offset/(8/size);
+ }
+ else if (size > 8)
+ uoffset = offset*(size/8);
+ else
+ uoffset = offset;
+
+ len = uoffset + (bitoffs + size + 7)/8; /* required number of bytes */
if (len > srclen) {
if (size <= 8)
retnum = 0;
else {
- offset >>= 3; /* turn into byte offset */
if (size == 16) {
- if ((STRLEN)offset >= srclen)
+ if (uoffset >= srclen)
retnum = 0;
else
- retnum = (UV) s[offset] << 8;
+ retnum = (UV) s[uoffset] << 8;
}
else if (size == 32) {
- if ((STRLEN)offset >= srclen)
+ if (uoffset >= srclen)
retnum = 0;
- else if ((STRLEN)(offset + 1) >= srclen)
+ else if (uoffset + 1 >= srclen)
retnum =
- ((UV) s[offset ] << 24);
- else if ((STRLEN)(offset + 2) >= srclen)
+ ((UV) s[uoffset ] << 24);
+ else if (uoffset + 2 >= srclen)
retnum =
- ((UV) s[offset ] << 24) +
- ((UV) s[offset + 1] << 16);
+ ((UV) s[uoffset ] << 24) +
+ ((UV) s[uoffset + 1] << 16);
else
retnum =
- ((UV) s[offset ] << 24) +
- ((UV) s[offset + 1] << 16) +
- ( s[offset + 2] << 8);
+ ((UV) s[uoffset ] << 24) +
+ ((UV) s[uoffset + 1] << 16) +
+ ( s[uoffset + 2] << 8);
}
#ifdef UV_IS_QUAD
else if (size == 64) {
- if (ckWARN(WARN_PORTABLE))
- Perl_warner(aTHX_ packWARN(WARN_PORTABLE),
- "Bit vector size > 32 non-portable");
- if (offset >= srclen)
+ Perl_ck_warner(aTHX_ packWARN(WARN_PORTABLE),
+ "Bit vector size > 32 non-portable");
+ if (uoffset >= srclen)
retnum = 0;
- else if (offset + 1 >= srclen)
+ else if (uoffset + 1 >= srclen)
retnum =
- (UV) s[offset ] << 56;
- else if (offset + 2 >= srclen)
+ (UV) s[uoffset ] << 56;
+ else if (uoffset + 2 >= srclen)
retnum =
- ((UV) s[offset ] << 56) +
- ((UV) s[offset + 1] << 48);
- else if (offset + 3 >= srclen)
+ ((UV) s[uoffset ] << 56) +
+ ((UV) s[uoffset + 1] << 48);
+ else if (uoffset + 3 >= srclen)
retnum =
- ((UV) s[offset ] << 56) +
- ((UV) s[offset + 1] << 48) +
- ((UV) s[offset + 2] << 40);
- else if (offset + 4 >= srclen)
+ ((UV) s[uoffset ] << 56) +
+ ((UV) s[uoffset + 1] << 48) +
+ ((UV) s[uoffset + 2] << 40);
+ else if (uoffset + 4 >= srclen)
retnum =
- ((UV) s[offset ] << 56) +
- ((UV) s[offset + 1] << 48) +
- ((UV) s[offset + 2] << 40) +
- ((UV) s[offset + 3] << 32);
- else if (offset + 5 >= srclen)
+ ((UV) s[uoffset ] << 56) +
+ ((UV) s[uoffset + 1] << 48) +
+ ((UV) s[uoffset + 2] << 40) +
+ ((UV) s[uoffset + 3] << 32);
+ else if (uoffset + 5 >= srclen)
retnum =
- ((UV) s[offset ] << 56) +
- ((UV) s[offset + 1] << 48) +
- ((UV) s[offset + 2] << 40) +
- ((UV) s[offset + 3] << 32) +
- ( s[offset + 4] << 24);
- else if (offset + 6 >= srclen)
+ ((UV) s[uoffset ] << 56) +
+ ((UV) s[uoffset + 1] << 48) +
+ ((UV) s[uoffset + 2] << 40) +
+ ((UV) s[uoffset + 3] << 32) +
+ ( s[uoffset + 4] << 24);
+ else if (uoffset + 6 >= srclen)
retnum =
- ((UV) s[offset ] << 56) +
- ((UV) s[offset + 1] << 48) +
- ((UV) s[offset + 2] << 40) +
- ((UV) s[offset + 3] << 32) +
- ((UV) s[offset + 4] << 24) +
- ((UV) s[offset + 5] << 16);
+ ((UV) s[uoffset ] << 56) +
+ ((UV) s[uoffset + 1] << 48) +
+ ((UV) s[uoffset + 2] << 40) +
+ ((UV) s[uoffset + 3] << 32) +
+ ((UV) s[uoffset + 4] << 24) +
+ ((UV) s[uoffset + 5] << 16);
else
retnum =
- ((UV) s[offset ] << 56) +
- ((UV) s[offset + 1] << 48) +
- ((UV) s[offset + 2] << 40) +
- ((UV) s[offset + 3] << 32) +
- ((UV) s[offset + 4] << 24) +
- ((UV) s[offset + 5] << 16) +
- ( s[offset + 6] << 8);
+ ((UV) s[uoffset ] << 56) +
+ ((UV) s[uoffset + 1] << 48) +
+ ((UV) s[uoffset + 2] << 40) +
+ ((UV) s[uoffset + 3] << 32) +
+ ((UV) s[uoffset + 4] << 24) +
+ ((UV) s[uoffset + 5] << 16) +
+ ( s[uoffset + 6] << 8);
}
#endif
}
}
else if (size < 8)
- retnum = (s[offset >> 3] >> (offset & 7)) & ((1 << size) - 1);
+ retnum = (s[uoffset] >> bitoffs) & ((1 << size) - 1);
else {
- offset >>= 3; /* turn into byte offset */
if (size == 8)
- retnum = s[offset];
+ retnum = s[uoffset];
else if (size == 16)
retnum =
- ((UV) s[offset] << 8) +
- s[offset + 1];
+ ((UV) s[uoffset] << 8) +
+ s[uoffset + 1];
else if (size == 32)
retnum =
- ((UV) s[offset ] << 24) +
- ((UV) s[offset + 1] << 16) +
- ( s[offset + 2] << 8) +
- s[offset + 3];
+ ((UV) s[uoffset ] << 24) +
+ ((UV) s[uoffset + 1] << 16) +
+ ( s[uoffset + 2] << 8) +
+ s[uoffset + 3];
#ifdef UV_IS_QUAD
else if (size == 64) {
- if (ckWARN(WARN_PORTABLE))
- Perl_warner(aTHX_ packWARN(WARN_PORTABLE),
- "Bit vector size > 32 non-portable");
+ Perl_ck_warner(aTHX_ packWARN(WARN_PORTABLE),
+ "Bit vector size > 32 non-portable");
retnum =
- ((UV) s[offset ] << 56) +
- ((UV) s[offset + 1] << 48) +
- ((UV) s[offset + 2] << 40) +
- ((UV) s[offset + 3] << 32) +
- ((UV) s[offset + 4] << 24) +
- ((UV) s[offset + 5] << 16) +
- ( s[offset + 6] << 8) +
- s[offset + 7];
+ ((UV) s[uoffset ] << 56) +
+ ((UV) s[uoffset + 1] << 48) +
+ ((UV) s[uoffset + 2] << 40) +
+ ((UV) s[uoffset + 3] << 32) +
+ ((UV) s[uoffset + 4] << 24) +
+ ((UV) s[uoffset + 5] << 16) +
+ ( s[uoffset + 6] << 8) +
+ s[uoffset + 7];
}
#endif
}
Perl_do_vecset(pTHX_ SV *sv)
{
dVAR;
- register I32 offset;
+ register I32 offset, bitoffs = 0;
register I32 size;
register unsigned char *s;
register UV lval;
STRLEN len;
SV * const targ = LvTARG(sv);
+ PERL_ARGS_ASSERT_DO_VECSET;
+
if (!targ)
return;
s = (unsigned char*)SvPV_force(targ, targlen);
if (size < 1 || (size & (size-1))) /* size < 1 or not a power of two */
Perl_croak(aTHX_ "Illegal number of bits in vec");
- offset *= size; /* turn into bit offset */
- len = (offset + size + 7) / 8; /* required number of bytes */
+ if (size < 8) {
+ bitoffs = ((offset%8)*size)%8;
+ offset /= 8/size;
+ }
+ else if (size > 8)
+ offset *= size/8;
+
+ len = offset + (bitoffs + size + 7)/8; /* required number of bytes */
if (len > targlen) {
s = (unsigned char*)SvGROW(targ, len + 1);
(void)memzero((char *)(s + targlen), len - targlen + 1);
if (size < 8) {
mask = (1 << size) - 1;
- size = offset & 7;
lval &= mask;
- offset >>= 3; /* turn into byte offset */
- s[offset] &= ~(mask << size);
- s[offset] |= lval << size;
+ s[offset] &= ~(mask << bitoffs);
+ s[offset] |= lval << bitoffs;
}
else {
- offset >>= 3; /* turn into byte offset */
if (size == 8)
s[offset ] = (U8)( lval & 0xff);
else if (size == 16) {
}
#ifdef UV_IS_QUAD
else if (size == 64) {
- if (ckWARN(WARN_PORTABLE))
- Perl_warner(aTHX_ packWARN(WARN_PORTABLE),
- "Bit vector size > 32 non-portable");
+ Perl_ck_warner(aTHX_ packWARN(WARN_PORTABLE),
+ "Bit vector size > 32 non-portable");
s[offset ] = (U8)((lval >> 56) & 0xff);
s[offset+1] = (U8)((lval >> 48) & 0xff);
s[offset+2] = (U8)((lval >> 40) & 0xff);
STRLEN len;
char *s;
+ PERL_ARGS_ASSERT_DO_CHOP;
+
if (SvTYPE(sv) == SVt_PVAV) {
register I32 i;
- AV* const av = (AV*)sv;
+ AV *const av = MUTABLE_AV(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);
}
return;
}
else if (SvTYPE(sv) == SVt_PVHV) {
- HV* const hv = (HV*)sv;
+ HV* const hv = MUTABLE_HV(sv);
HE* entry;
(void)hv_iterinit(hv);
while ((entry = hv_iternext(hv)))
sv_force_normal_flags(sv, 0);
}
if (SvREADONLY(sv))
- Perl_croak(aTHX_ PL_no_modify);
+ Perl_croak(aTHX_ "%s", PL_no_modify);
}
if (PL_encoding && !SvUTF8(sv)) {
s = SvPV(sv, len);
if (len && !SvPOK(sv))
- s = SvPV_force(sv, len);
+ s = SvPV_force_nomg(sv, len);
if (DO_UTF8(sv)) {
if (s && len) {
char * const send = s + len;
}
}
else
- sv_setpvn(astr, "", 0);
+ sv_setpvs(astr, "");
}
else if (s && len) {
s += --len;
SvNIOK_off(sv);
}
else
- sv_setpvn(astr, "", 0);
+ sv_setpvs(astr, "");
SvSETMAGIC(sv);
}
char *temp_buffer = NULL;
SV* svrecode = NULL;
+ PERL_ARGS_ASSERT_DO_CHOMP;
+
if (RsSNARF(PL_rs))
return 0;
if (RsRECORD(PL_rs))
count = 0;
if (SvTYPE(sv) == SVt_PVAV) {
register I32 i;
- AV* const av = (AV*)sv;
+ AV *const av = MUTABLE_AV(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);
}
return count;
}
else if (SvTYPE(sv) == SVt_PVHV) {
- HV* const hv = (HV*)sv;
+ HV* const hv = MUTABLE_HV(sv);
HE* entry;
(void)hv_iterinit(hv);
while ((entry = hv_iternext(hv)))
sv_force_normal_flags(sv, 0);
}
if (SvREADONLY(sv))
- Perl_croak(aTHX_ PL_no_modify);
+ Perl_croak(aTHX_ "%s", PL_no_modify);
}
if (PL_encoding) {
}
nope:
- if (svrecode)
- SvREFCNT_dec(svrecode);
+ SvREFCNT_dec(svrecode);
Safefree(temp_buffer);
return count;
STRLEN rightlen;
register const char *lc;
register const char *rc;
- register I32 len;
- I32 lensave;
+ register STRLEN len;
+ STRLEN lensave;
const char *lsave;
const char *rsave;
- const bool left_utf = DO_UTF8(left);
- const bool right_utf = DO_UTF8(right);
- I32 needlen = 0;
+ bool left_utf;
+ bool right_utf;
+ STRLEN needlen = 0;
- if (left_utf && !right_utf)
- sv_utf8_upgrade(right);
- else if (!left_utf && right_utf)
- sv_utf8_upgrade(left);
+ PERL_ARGS_ASSERT_DO_VOP;
if (sv != left || (optype != OP_BIT_AND && !SvOK(sv) && !SvGMAGICAL(sv)))
- sv_setpvn(sv, "", 0); /* avoid undef warning on |= and ^= */
- lsave = lc = SvPV_nomg_const(left, leftlen);
+ sv_setpvs(sv, ""); /* avoid undef warning on |= and ^= */
+ if (sv == left) {
+ lsave = lc = SvPV_force_nomg(left, leftlen);
+ }
+ else {
+ lsave = lc = SvPV_nomg_const(left, leftlen);
+ SvPV_force_nomg_nolen(sv);
+ }
rsave = rc = SvPV_nomg_const(right, rightlen);
+
+ /* This need to come after SvPV to ensure that string overloading has
+ fired off. */
+
+ left_utf = DO_UTF8(left);
+ right_utf = DO_UTF8(right);
+
+ if (left_utf && !right_utf) {
+ /* Avoid triggering overloading again by using temporaries.
+ Maybe there should be a variant of sv_utf8_upgrade that takes pvn
+ */
+ right = newSVpvn_flags(rsave, rightlen, SVs_TEMP);
+ sv_utf8_upgrade(right);
+ rsave = rc = SvPV_nomg_const(right, rightlen);
+ right_utf = TRUE;
+ }
+ else if (!left_utf && right_utf) {
+ left = newSVpvn_flags(lsave, leftlen, SVs_TEMP);
+ sv_utf8_upgrade(left);
+ lsave = lc = SvPV_nomg_const(left, leftlen);
+ left_utf = TRUE;
+ }
+
len = leftlen < rightlen ? leftlen : rightlen;
lensave = len;
SvCUR_set(sv, len);
}
else if (SvOK(sv) || SvTYPE(sv) > SVt_PVMG) {
dc = SvPV_force_nomg_nolen(sv);
- if (SvLEN(sv) < (STRLEN)(len + 1)) {
- dc = SvGROW(sv, (STRLEN)(len + 1));
+ if (SvLEN(sv) < len + 1) {
+ dc = SvGROW(sv, len + 1);
(void)memzero(dc + SvCUR(sv), len - SvCUR(sv) + 1);
}
if (optype != OP_BIT_AND && (left_utf || right_utf))
dc = SvGROW(sv, leftlen + rightlen + 1);
}
else {
- needlen = ((optype == OP_BIT_AND)
- ? len : (leftlen > rightlen ? leftlen : rightlen));
+ needlen = optype == OP_BIT_AND
+ ? len : (leftlen > rightlen ? leftlen : rightlen);
Newxz(dc, needlen + 1, char);
sv_usepvn_flags(sv, dc, needlen, SV_HAS_TRAILING_NUL);
dc = SvPVX(sv); /* sv_usepvn() calls Renew() */
else
#ifdef LIBERAL
if (len >= sizeof(long)*4 &&
- !((long)dc % sizeof(long)) &&
- !((long)lc % sizeof(long)) &&
- !((long)rc % sizeof(long))) /* It's almost always aligned... */
+ !((unsigned long)dc % sizeof(long)) &&
+ !((unsigned long)lc % sizeof(long)) &&
+ !((unsigned long)rc % sizeof(long))) /* It's almost always aligned... */
{
- const I32 remainder = len % (sizeof(long)*4);
+ const STRLEN remainder = len % (sizeof(long)*4);
len /= (sizeof(long)*4);
dl = (long*)dc;
*dc++ = *lc++ | *rc++;
mop_up:
len = lensave;
- if (rightlen > (STRLEN)len)
+ if (rightlen > len)
sv_catpvn(sv, rsave + len, rightlen - len);
else if (leftlen > (STRLEN)len)
sv_catpvn(sv, lsave + len, leftlen - len);
{
dVAR;
dSP;
- HV * const hv = (HV*)POPs;
+ HV * const hv = MUTABLE_HV(POPs);
HV *keys;
register HE *entry;
const I32 gimme = GIMME_V;
sv_magic(TARG, NULL, PERL_MAGIC_nkeys, NULL, 0);
}
LvTYPE(TARG) = 'k';
- if (LvTARG(TARG) != (SV*)keys) {
- if (LvTARG(TARG))
- SvREFCNT_dec(LvTARG(TARG));
+ if (LvTARG(TARG) != (const SV *)keys) {
+ SvREFCNT_dec(LvTARG(TARG));
LvTARG(TARG) = SvREFCNT_inc_simple(keys);
}
PUSHs(TARG);
RETURN;
}
- if (! SvTIED_mg((SV*)keys, PERL_MAGIC_tied))
+ if (! SvTIED_mg((const SV *)keys, PERL_MAGIC_tied) )
+ {
i = HvKEYS(keys);
+ }
else {
i = 0;
while (hv_iternext(keys)) i++;