X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=doop.c;h=9e551032882c14a8d014f260cafd9e9eae6772b4;hb=a19d7498e238ac7c03cb96036dee4a734a2a0356;hp=bc772018bbec13ed5d02ad462db9b378463c23ef;hpb=2233f375aa37a706e02f773eded0886e392aa503;p=p5sagit%2Fp5-mst-13.2.git diff --git a/doop.c b/doop.c index bc77201..9e55103 100644 --- a/doop.c +++ b/doop.c @@ -1,6 +1,7 @@ /* doop.c * - * Copyright (c) 1991-2001, Larry Wall + * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + * 2000, 2001, 2002, 2004, 2005, 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. @@ -11,42 +12,44 @@ * "'So that was the job I felt I had to do when I started,' thought Sam." */ +/* This file contains some common functions needed to carry out certain + * ops. For example both pp_schomp() and pp_chomp() - scalar and array + * chomp operations - call the function do_chomp() found in this file. + */ + #include "EXTERN.h" #define PERL_IN_DOOP_C #include "perl.h" #ifndef PERL_MICRO -#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) #include #endif -#endif STATIC I32 S_do_trans_simple(pTHX_ SV *sv) { U8 *s; U8 *d; - U8 *send; + const U8 *send; U8 *dstart; I32 matches = 0; - I32 grows = PL_op->op_private & OPpTRANS_GROWS; + const I32 grows = PL_op->op_private & OPpTRANS_GROWS; STRLEN len; - short *tbl; - I32 ch; - tbl = (short*)cPVOP->op_pv; + const short *tbl = (short*)cPVOP->op_pv; if (!tbl) Perl_croak(aTHX_ "panic: do_trans_simple line %d",__LINE__); s = (U8*)SvPV(sv, len); send = s + len; - /* First, take care of non-UTF8 input strings, because they're easy */ + /* First, take care of non-UTF-8 input strings, because they're easy */ if (!SvUTF8(sv)) { while (s < send) { - if ((ch = tbl[*s]) >= 0) { + const I32 ch = tbl[*s]; + if (ch >= 0) { matches++; - *s++ = ch; + *s++ = (U8)ch; } else s++; @@ -57,23 +60,23 @@ S_do_trans_simple(pTHX_ SV *sv) /* Allow for expansion: $_="a".chr(400); tr/a/\xFE/, FE needs encoding */ if (grows) - New(0, d, len*2+1, U8); + Newx(d, len*2+1, U8); else d = s; dstart = d; while (s < send) { STRLEN ulen; - UV c; + I32 ch; /* Need to check this, otherwise 128..255 won't match */ - c = utf8n_to_uvchr(s, send - s, &ulen, 0); + const UV c = utf8n_to_uvchr(s, send - s, &ulen, 0); if (c < 0x100 && (ch = tbl[c]) >= 0) { matches++; d = uvchr_to_utf8(d, ch); s += ulen; } else { /* No match -> copy */ - Copy(s, d, ulen, U8); + Move(s, d, ulen, U8); d += ulen; s += ulen; } @@ -94,18 +97,17 @@ S_do_trans_simple(pTHX_ SV *sv) STATIC I32 S_do_trans_count(pTHX_ SV *sv) { - U8 *s; - U8 *send; + const U8 *s; + const U8 *send; I32 matches = 0; STRLEN len; - short *tbl; - I32 complement = PL_op->op_private & OPpTRANS_COMPLEMENT; + const I32 complement = PL_op->op_private & OPpTRANS_COMPLEMENT; - tbl = (short*)cPVOP->op_pv; + const short * const tbl = (short*)cPVOP->op_pv; if (!tbl) Perl_croak(aTHX_ "panic: do_trans_count line %d",__LINE__); - s = (U8*)SvPV(sv, len); + s = (const U8*)SvPV_const(sv, len); send = s + len; if (!SvUTF8(sv)) @@ -115,9 +117,8 @@ S_do_trans_count(pTHX_ SV *sv) } else while (s < send) { - UV c; STRLEN ulen; - c = utf8n_to_uvchr(s, send - s, &ulen, 0); + const UV c = utf8n_to_uvchr(s, send - s, &ulen, 0); if (c < 0x100) { if (tbl[c] >= 0) matches++; @@ -138,14 +139,12 @@ S_do_trans_complex(pTHX_ SV *sv) U8 *dstart; I32 isutf8; I32 matches = 0; - I32 grows = PL_op->op_private & OPpTRANS_GROWS; - I32 complement = PL_op->op_private & OPpTRANS_COMPLEMENT; - I32 del = PL_op->op_private & OPpTRANS_DELETE; + const I32 grows = PL_op->op_private & OPpTRANS_GROWS; + const I32 complement = PL_op->op_private & OPpTRANS_COMPLEMENT; + const I32 del = PL_op->op_private & OPpTRANS_DELETE; STRLEN len, rlen = 0; - short *tbl; - I32 ch; - tbl = (short*)cPVOP->op_pv; + const short * const tbl = (short*)cPVOP->op_pv; if (!tbl) Perl_croak(aTHX_ "panic: do_trans_complex line %d",__LINE__); @@ -156,10 +155,11 @@ S_do_trans_complex(pTHX_ SV *sv) if (!isutf8) { dstart = d = s; if (PL_op->op_private & OPpTRANS_SQUASH) { - U8* p = send; + const U8* p = send; while (s < send) { - if ((ch = tbl[*s]) >= 0) { - *d = ch; + const I32 ch = tbl[*s]; + if (ch >= 0) { + *d = (U8)ch; matches++; if (p != d - 1 || *p != *d) p = d++; @@ -173,9 +173,10 @@ S_do_trans_complex(pTHX_ SV *sv) } else { while (s < send) { - if ((ch = tbl[*s]) >= 0) { + const I32 ch = tbl[*s]; + if (ch >= 0) { matches++; - *d++ = ch; + *d++ = (U8)ch; } else if (ch == -1) /* -1 is unmapped character */ *d++ = *s; @@ -189,7 +190,7 @@ S_do_trans_complex(pTHX_ SV *sv) } else { /* isutf8 */ if (grows) - New(0, d, len*2+1, U8); + Newx(d, len*2+1, U8); else d = s; dstart = d; @@ -204,7 +205,8 @@ S_do_trans_complex(pTHX_ SV *sv) UV pch = 0xfeedface; while (s < send) { STRLEN len; - UV comp = utf8_to_uvchr(s, &len); + const UV comp = utf8_to_uvchr(s, &len); + I32 ch; if (comp > 0xff) { if (!complement) { @@ -217,9 +219,9 @@ S_do_trans_complex(pTHX_ SV *sv) ch = (rlen == 0) ? comp : (comp - 0x100 < rlen) ? tbl[comp+1] : tbl[0x100+rlen]; - if (ch != pch) { + if ((UV)ch != pch) { d = uvchr_to_utf8(d, ch); - pch = ch; + pch = (UV)ch; } s += len; continue; @@ -228,9 +230,9 @@ S_do_trans_complex(pTHX_ SV *sv) } else if ((ch = tbl[comp]) >= 0) { matches++; - if (ch != pch) { + if ((UV)ch != pch) { d = uvchr_to_utf8(d, ch); - pch = ch; + pch = (UV)ch; } s += len; continue; @@ -248,10 +250,11 @@ S_do_trans_complex(pTHX_ SV *sv) else { while (s < send) { STRLEN len; - UV comp = utf8_to_uvchr(s, &len); + const UV comp = utf8_to_uvchr(s, &len); + I32 ch; if (comp > 0xff) { if (!complement) { - Copy(s, d, len, U8); + Move(s, d, len, U8); d += len; } else { @@ -300,14 +303,14 @@ S_do_trans_simple_utf8(pTHX_ SV *sv) U8 *start; U8 *dstart, *dend; I32 matches = 0; - I32 grows = PL_op->op_private & OPpTRANS_GROWS; + const I32 grows = PL_op->op_private & OPpTRANS_GROWS; STRLEN len; - SV* rv = (SV*)cSVOP->op_sv; - HV* hv = (HV*)SvRV(rv); + SV* const rv = (SV*)cSVOP->op_sv; + HV* const hv = (HV*)SvRV(rv); SV** svp = hv_fetch(hv, "NONE", 4, FALSE); - UV none = svp ? SvUV(*svp) : 0x7fffffff; - UV extra = none + 1; + const UV none = svp ? SvUV(*svp) : 0x7fffffff; + const UV extra = none + 1; UV final = 0; UV uv; I32 isutf8; @@ -316,9 +319,9 @@ S_do_trans_simple_utf8(pTHX_ SV *sv) s = (U8*)SvPV(sv, len); isutf8 = SvUTF8(sv); if (!isutf8) { - U8 *t = s, *e = s + len; + const U8 *t = s, *e = s + len; while (t < e) { - U8 ch = *t++; + const U8 ch = *t++; if ((hibit = !NATIVE_IS_INVARIANT(ch))) break; } @@ -334,7 +337,7 @@ S_do_trans_simple_utf8(pTHX_ SV *sv) if (grows) { /* d needs to be bigger than s, in case e.g. upgrading is required */ - New(0, d, len*3+UTF8_MAXLEN, U8); + Newx(d, len * 3 + UTF8_MAXBYTES, U8); dend = d + len * 3; dstart = d; } @@ -350,14 +353,13 @@ S_do_trans_simple_utf8(pTHX_ SV *sv) d = uvuni_to_utf8(d, uv); } else if (uv == none) { - int i = UTF8SKIP(s); - Copy(s, d, i, U8); + const int i = UTF8SKIP(s); + Move(s, d, i, U8); d += i; s += i; } else if (uv == extra) { - int i = UTF8SKIP(s); - s += i; + s += UTF8SKIP(s); matches++; d = uvuni_to_utf8(d, final); } @@ -365,11 +367,11 @@ S_do_trans_simple_utf8(pTHX_ SV *sv) s += UTF8SKIP(s); if (d > dend) { - STRLEN clen = d - dstart; - STRLEN nlen = dend - dstart + len + UTF8_MAXLEN; + const STRLEN clen = d - dstart; + const STRLEN nlen = dend - dstart + len + UTF8_MAXBYTES; if (!grows) Perl_croak(aTHX_ "panic: do_trans_simple_utf8 line %d",__LINE__); - Renew(dstart, nlen+UTF8_MAXLEN, U8); + Renew(dstart, nlen + UTF8_MAXBYTES, U8); d = dstart + clen; dend = dstart + nlen; } @@ -393,24 +395,24 @@ S_do_trans_simple_utf8(pTHX_ SV *sv) STATIC I32 S_do_trans_count_utf8(pTHX_ SV *sv) { - U8 *s; - U8 *start = 0, *send; + const U8 *s; + const U8 *start = 0, *send; I32 matches = 0; STRLEN len; - SV* rv = (SV*)cSVOP->op_sv; - HV* hv = (HV*)SvRV(rv); - SV** svp = hv_fetch(hv, "NONE", 4, FALSE); - UV none = svp ? SvUV(*svp) : 0x7fffffff; - UV extra = none + 1; - UV uv; + SV* const rv = (SV*)cSVOP->op_sv; + HV* const hv = (HV*)SvRV(rv); + SV** const svp = hv_fetch(hv, "NONE", 4, FALSE); + const UV none = svp ? SvUV(*svp) : 0x7fffffff; + const UV extra = none + 1; U8 hibit = 0; - s = (U8*)SvPV(sv, len); + s = (const U8*)SvPV_const(sv, len); if (!SvUTF8(sv)) { - U8 *t = s, *e = s + len; + const U8 *t = s; + const U8 *e = s + len; while (t < e) { - U8 ch = *t++; + const U8 ch = *t++; if ((hibit = !NATIVE_IS_INVARIANT(ch))) break; } @@ -420,6 +422,7 @@ S_do_trans_count_utf8(pTHX_ SV *sv) send = s + len; while (s < send) { + UV uv; if ((uv = swash_fetch(rv, s, TRUE)) < none || uv == extra) matches++; s += UTF8SKIP(s); @@ -433,32 +436,30 @@ S_do_trans_count_utf8(pTHX_ SV *sv) STATIC I32 S_do_trans_complex_utf8(pTHX_ SV *sv) { - U8 *s; U8 *start, *send; U8 *d; I32 matches = 0; - I32 squash = PL_op->op_private & OPpTRANS_SQUASH; - I32 del = PL_op->op_private & OPpTRANS_DELETE; - I32 grows = PL_op->op_private & OPpTRANS_GROWS; - SV* rv = (SV*)cSVOP->op_sv; - HV* hv = (HV*)SvRV(rv); + 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** svp = hv_fetch(hv, "NONE", 4, FALSE); - UV none = svp ? SvUV(*svp) : 0x7fffffff; - UV extra = none + 1; + const UV none = svp ? SvUV(*svp) : 0x7fffffff; + const UV extra = none + 1; UV final = 0; bool havefinal = FALSE; - UV uv; STRLEN len; U8 *dstart, *dend; - I32 isutf8; U8 hibit = 0; - s = (U8*)SvPV(sv, len); - isutf8 = SvUTF8(sv); + U8 *s = (U8*)SvPV(sv, len); + const I32 isutf8 = SvUTF8(sv); if (!isutf8) { - U8 *t = s, *e = s + len; + const U8 *t = s; + const U8 * const e = s + len; while (t < e) { - U8 ch = *t++; + const U8 ch = *t++; if ((hibit = !NATIVE_IS_INVARIANT(ch))) break; } @@ -476,7 +477,7 @@ S_do_trans_complex_utf8(pTHX_ SV *sv) if (grows) { /* d needs to be bigger than s, in case e.g. upgrading is required */ - New(0, d, len*3+UTF8_MAXLEN, U8); + Newx(d, len * 3 + UTF8_MAXBYTES, U8); dend = d + len * 3; dstart = d; } @@ -488,14 +489,14 @@ S_do_trans_complex_utf8(pTHX_ SV *sv) if (squash) { UV puv = 0xfeedface; while (s < send) { - uv = swash_fetch(rv, s, TRUE); + UV uv = swash_fetch(rv, s, TRUE); if (d > dend) { - STRLEN clen = d - dstart; - STRLEN nlen = dend - dstart + len + UTF8_MAXLEN; + const STRLEN clen = d - dstart; + const STRLEN nlen = dend - dstart + len + UTF8_MAXBYTES; if (!grows) Perl_croak(aTHX_ "panic: do_trans_complex_utf8 line %d",__LINE__); - Renew(dstart, nlen+UTF8_MAXLEN, U8); + Renew(dstart, nlen + UTF8_MAXBYTES, U8); d = dstart + clen; dend = dstart + nlen; } @@ -509,8 +510,8 @@ S_do_trans_complex_utf8(pTHX_ SV *sv) continue; } else if (uv == none) { /* "none" is unmapped character */ - int i = UTF8SKIP(s); - Copy(s, d, i, U8); + const int i = UTF8SKIP(s); + Move(s, d, i, U8); d += i; s += i; puv = 0xfeedface; @@ -529,7 +530,7 @@ S_do_trans_complex_utf8(pTHX_ SV *sv) STRLEN len; uv = utf8_to_uvuni(s, &len); if (uv != puv) { - Copy(s, d, len, U8); + Move(s, d, len, U8); d += len; puv = uv; } @@ -543,13 +544,13 @@ S_do_trans_complex_utf8(pTHX_ SV *sv) } else { while (s < send) { - uv = swash_fetch(rv, s, TRUE); + const UV uv = swash_fetch(rv, s, TRUE); if (d > dend) { - STRLEN clen = d - dstart; - STRLEN nlen = dend - dstart + len + UTF8_MAXLEN; + const STRLEN clen = d - dstart; + const STRLEN nlen = dend - dstart + len + UTF8_MAXBYTES; if (!grows) Perl_croak(aTHX_ "panic: do_trans_complex_utf8 line %d",__LINE__); - Renew(dstart, nlen+UTF8_MAXLEN, U8); + Renew(dstart, nlen + UTF8_MAXBYTES, U8); d = dstart + clen; dend = dstart + nlen; } @@ -560,8 +561,8 @@ S_do_trans_complex_utf8(pTHX_ SV *sv) continue; } else if (uv == none) { /* "none" is unmapped character */ - int i = UTF8SKIP(s); - Copy(s, d, i, U8); + const int i = UTF8SKIP(s); + Move(s, d, i, U8); d += i; s += i; continue; @@ -596,26 +597,29 @@ I32 Perl_do_trans(pTHX_ SV *sv) { STRLEN len; - I32 hasutf = (PL_op->op_private & + const I32 hasutf = (PL_op->op_private & (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF)); if (SvREADONLY(sv)) { - if (SvFAKE(sv)) - sv_force_normal(sv); + if (SvIsCOW(sv)) + sv_force_normal_flags(sv, 0); if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL)) Perl_croak(aTHX_ PL_no_modify); } - (void)SvPV(sv, len); + (void)SvPV_const(sv, len); if (!len) return 0; - if (!SvPOKp(sv)) - (void)SvPV_force(sv, len); - if (!(PL_op->op_private & OPpTRANS_IDENTICAL)) + if (!(PL_op->op_private & OPpTRANS_IDENTICAL)) { + if (!SvPOKp(sv)) + (void)SvPV_force(sv, len); (void)SvPOK_only_UTF8(sv); + } DEBUG_t( Perl_deb(aTHX_ "2.TBL\n")); - switch (PL_op->op_private & ~hasutf & 63) { + switch (PL_op->op_private & ~hasutf & ( + OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF|OPpTRANS_IDENTICAL| + OPpTRANS_SQUASH|OPpTRANS_DELETE|OPpTRANS_COMPLEMENT)) { case 0: if (hasutf) return do_trans_simple_utf8(sv); @@ -640,22 +644,22 @@ Perl_do_trans(pTHX_ SV *sv) void Perl_do_join(pTHX_ register SV *sv, SV *del, register SV **mark, register SV **sp) { - SV **oldmark = mark; + SV ** const oldmark = mark; register I32 items = sp - mark; register STRLEN len; STRLEN delimlen; - STRLEN tmplen; - (void) SvPV(del, delimlen); /* stringify and get the delimlen */ + (void) SvPV_const(del, delimlen); /* stringify and get the delimlen */ /* SvCUR assumes it's SvPOK() and woe betide you if it's not. */ mark++; len = (items > 0 ? (delimlen * (items - 1) ) : 0); - (void)SvUPGRADE(sv, SVt_PV); + SvUPGRADE(sv, SVt_PV); if (SvLEN(sv) < len + items) { /* current length is way too short */ while (items-- > 0) { if (*mark && !SvGAMAGIC(*mark) && SvOK(*mark)) { - SvPV(*mark, tmplen); + STRLEN tmplen; + SvPV_const(*mark, tmplen); len += tmplen; } mark++; @@ -667,7 +671,10 @@ Perl_do_join(pTHX_ register SV *sv, SV *del, register SV **mark, register SV **s ++mark; } - sv_setpv(sv, ""); + sv_setpvn(sv, "", 0); + /* sv_setpv retains old UTF8ness [perl #24846] */ + SvUTF8_off(sv); + if (PL_tainting && SvMAGICAL(sv)) SvTAINTED_off(sv); @@ -694,9 +701,12 @@ void Perl_do_sprintf(pTHX_ SV *sv, I32 len, SV **sarg) { STRLEN patlen; - char *pat = SvPV(*sarg, patlen); + const char * const pat = SvPV_const(*sarg, patlen); bool do_taint = FALSE; + SvUTF8_off(sv); + if (DO_UTF8(*sarg)) + SvUTF8_on(sv); sv_vsetpvfn(sv, pat, patlen, Null(va_list*), sarg + 1, len - 1, &do_taint); SvSETMAGIC(sv); if (do_taint) @@ -708,7 +718,7 @@ UV Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size) { STRLEN srclen, len; - unsigned char *s = (unsigned char *) SvPV(sv, srclen); + const unsigned char *s = (const unsigned char *) SvPV_const(sv, srclen); UV retnum = 0; if (offset < 0) @@ -727,18 +737,18 @@ Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size) else { offset >>= 3; /* turn into byte offset */ if (size == 16) { - if (offset >= srclen) + if ((STRLEN)offset >= srclen) retnum = 0; else retnum = (UV) s[offset] << 8; } else if (size == 32) { - if (offset >= srclen) + if ((STRLEN)offset >= srclen) retnum = 0; - else if (offset + 1 >= srclen) + else if ((STRLEN)(offset + 1) >= srclen) retnum = ((UV) s[offset ] << 24); - else if (offset + 2 >= srclen) + else if ((STRLEN)(offset + 2) >= srclen) retnum = ((UV) s[offset ] << 24) + ((UV) s[offset + 1] << 16); @@ -751,7 +761,7 @@ Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size) #ifdef UV_IS_QUAD else if (size == 64) { if (ckWARN(WARN_PORTABLE)) - Perl_warner(aTHX_ WARN_PORTABLE, + Perl_warner(aTHX_ packWARN(WARN_PORTABLE), "Bit vector size > 32 non-portable"); if (offset >= srclen) retnum = 0; @@ -820,7 +830,7 @@ Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size) #ifdef UV_IS_QUAD else if (size == 64) { if (ckWARN(WARN_PORTABLE)) - Perl_warner(aTHX_ WARN_PORTABLE, + Perl_warner(aTHX_ packWARN(WARN_PORTABLE), "Bit vector size > 32 non-portable"); retnum = ((UV) s[offset ] << 56) + @@ -869,7 +879,7 @@ Perl_do_vecset(pTHX_ SV *sv) lval = SvUV(sv); offset = LvTARGOFF(sv); if (offset < 0) - Perl_croak(aTHX_ "Assigning to negative offset in vec"); + Perl_croak(aTHX_ "Negative offset to vec in lvalue context"); size = LvTARGLEN(sv); if (size < 1 || (size & (size-1))) /* size < 1 or not a power of two */ Perl_croak(aTHX_ "Illegal number of bits in vec"); @@ -893,30 +903,30 @@ Perl_do_vecset(pTHX_ SV *sv) else { offset >>= 3; /* turn into byte offset */ if (size == 8) - s[offset ] = lval & 0xff; + s[offset ] = (U8)( lval & 0xff); else if (size == 16) { - s[offset ] = (lval >> 8) & 0xff; - s[offset+1] = lval & 0xff; + s[offset ] = (U8)((lval >> 8) & 0xff); + s[offset+1] = (U8)( lval & 0xff); } else if (size == 32) { - s[offset ] = (lval >> 24) & 0xff; - s[offset+1] = (lval >> 16) & 0xff; - s[offset+2] = (lval >> 8) & 0xff; - s[offset+3] = lval & 0xff; + s[offset ] = (U8)((lval >> 24) & 0xff); + s[offset+1] = (U8)((lval >> 16) & 0xff); + s[offset+2] = (U8)((lval >> 8) & 0xff); + s[offset+3] = (U8)( lval & 0xff); } #ifdef UV_IS_QUAD else if (size == 64) { if (ckWARN(WARN_PORTABLE)) - Perl_warner(aTHX_ WARN_PORTABLE, + Perl_warner(aTHX_ packWARN(WARN_PORTABLE), "Bit vector size > 32 non-portable"); - s[offset ] = (lval >> 56) & 0xff; - s[offset+1] = (lval >> 48) & 0xff; - s[offset+2] = (lval >> 40) & 0xff; - s[offset+3] = (lval >> 32) & 0xff; - s[offset+4] = (lval >> 24) & 0xff; - s[offset+5] = (lval >> 16) & 0xff; - s[offset+6] = (lval >> 8) & 0xff; - s[offset+7] = lval & 0xff; + s[offset ] = (U8)((lval >> 56) & 0xff); + s[offset+1] = (U8)((lval >> 48) & 0xff); + s[offset+2] = (U8)((lval >> 40) & 0xff); + s[offset+3] = (U8)((lval >> 32) & 0xff); + s[offset+4] = (U8)((lval >> 24) & 0xff); + s[offset+5] = (U8)((lval >> 16) & 0xff); + s[offset+6] = (U8)((lval >> 8) & 0xff); + s[offset+7] = (U8)( lval & 0xff); } #endif } @@ -931,10 +941,10 @@ Perl_do_chop(pTHX_ register SV *astr, register SV *sv) if (SvTYPE(sv) == SVt_PVAV) { register I32 i; - I32 max; AV* av = (AV*)sv; - max = AvFILL(av); - for (i = 0; i <= max; i++) { + const I32 max = AvFILL(av); + + for (i = 0; i <= max; i++) { sv = (SV*)av_fetch(av, i, FALSE); if (sv && ((sv = *(SV**)sv), sv != &PL_sv_undef)) do_chop(astr, sv); @@ -945,13 +955,18 @@ Perl_do_chop(pTHX_ register SV *astr, register SV *sv) HV* hv = (HV*)sv; HE* entry; (void)hv_iterinit(hv); - /*SUPPRESS 560*/ while ((entry = hv_iternext(hv))) do_chop(astr,hv_iterval(hv,entry)); return; } - else if (SvREADONLY(sv)) - Perl_croak(aTHX_ PL_no_modify); + else if (SvREADONLY(sv)) { + if (SvFAKE(sv)) { + /* SV is copy-on-write */ + sv_force_normal_flags(sv, 0); + } + if (SvREADONLY(sv)) + Perl_croak(aTHX_ PL_no_modify); + } s = SvPV(sv, len); if (len && !SvPOK(sv)) s = SvPV_force(sv, len); @@ -962,7 +977,7 @@ Perl_do_chop(pTHX_ register SV *astr, register SV *sv) s = send - 1; while (s > start && UTF8_IS_CONTINUATION(*s)) s--; - if (utf8_to_uvchr((U8*)s, 0)) { + if (is_utf8_string((U8*)s, send - s)) { sv_setpvn(astr, s, send - s); *s = '\0'; SvCUR_set(sv, s - start); @@ -991,8 +1006,9 @@ Perl_do_chomp(pTHX_ register SV *sv) { register I32 count; STRLEN len; - STRLEN n_a; char *s; + char *temp_buffer = NULL; + SV* svrecode = Nullsv; if (RsSNARF(PL_rs)) return 0; @@ -1001,10 +1017,10 @@ Perl_do_chomp(pTHX_ register SV *sv) count = 0; if (SvTYPE(sv) == SVt_PVAV) { register I32 i; - I32 max; - AV* av = (AV*)sv; - max = AvFILL(av); - for (i = 0; i <= max; i++) { + AV* const av = (AV*)sv; + const I32 max = AvFILL(av); + + for (i = 0; i <= max; i++) { sv = (SV*)av_fetch(av, i, FALSE); if (sv && ((sv = *(SV**)sv), sv != &PL_sv_undef)) count += do_chomp(sv); @@ -1012,16 +1028,33 @@ Perl_do_chomp(pTHX_ register SV *sv) return count; } else if (SvTYPE(sv) == SVt_PVHV) { - HV* hv = (HV*)sv; + HV* const hv = (HV*)sv; HE* entry; (void)hv_iterinit(hv); - /*SUPPRESS 560*/ while ((entry = hv_iternext(hv))) count += do_chomp(hv_iterval(hv,entry)); return count; } - else if (SvREADONLY(sv)) - Perl_croak(aTHX_ PL_no_modify); + else if (SvREADONLY(sv)) { + if (SvFAKE(sv)) { + /* SV is copy-on-write */ + sv_force_normal_flags(sv, 0); + } + if (SvREADONLY(sv)) + Perl_croak(aTHX_ PL_no_modify); + } + + if (PL_encoding) { + if (!SvUTF8(sv)) { + /* XXX, here sv is utf8-ized as a side-effect! + If encoding.pm is used properly, almost string-generating + operations, including literal strings, chr(), input data, etc. + should have been utf8-ized already, right? + */ + sv_recode_to_utf8(sv, PL_encoding); + } + } + s = SvPV(sv, len); if (s && len) { s += --len; @@ -1036,8 +1069,43 @@ Perl_do_chomp(pTHX_ register SV *sv) } } else { - STRLEN rslen; - char *rsptr = SvPV(PL_rs, rslen); + STRLEN rslen, rs_charlen; + const char *rsptr = SvPV_const(PL_rs, rslen); + + rs_charlen = SvUTF8(PL_rs) + ? sv_len_utf8(PL_rs) + : rslen; + + if (SvUTF8(PL_rs) != SvUTF8(sv)) { + /* Assumption is that rs is shorter than the scalar. */ + if (SvUTF8(PL_rs)) { + /* RS is utf8, scalar is 8 bit. */ + bool is_utf8 = TRUE; + temp_buffer = (char*)bytes_from_utf8((U8*)rsptr, + &rslen, &is_utf8); + if (is_utf8) { + /* Cannot downgrade, therefore cannot possibly match + */ + assert (temp_buffer == rsptr); + temp_buffer = NULL; + goto nope; + } + rsptr = temp_buffer; + } + else if (PL_encoding) { + /* RS is 8 bit, encoding.pm is used. + * Do not recode PL_rs as a side-effect. */ + svrecode = newSVpvn(rsptr, rslen); + sv_recode_to_utf8(svrecode, PL_encoding); + rsptr = SvPV_const(svrecode, rslen); + rs_charlen = sv_len_utf8(svrecode); + } + else { + /* RS is 8 bit, scalar is utf8. */ + temp_buffer = (char*)bytes_to_utf8((U8*)rsptr, &rslen); + rsptr = temp_buffer; + } + } if (rslen == 1) { if (*s != *rsptr) goto nope; @@ -1050,16 +1118,21 @@ Perl_do_chomp(pTHX_ register SV *sv) s -= rslen - 1; if (memNE(s, rsptr, rslen)) goto nope; - count += rslen; + count += rs_charlen; } } - s = SvPV_force(sv, n_a); + s = SvPV_force_nolen(sv); SvCUR_set(sv, len); *SvEND(sv) = '\0'; SvNIOK_off(sv); SvSETMAGIC(sv); } nope: + + if (svrecode) + SvREFCNT_dec(svrecode); + + Safefree(temp_buffer); return count; } @@ -1074,14 +1147,14 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) register char *dc; STRLEN leftlen; STRLEN rightlen; - register char *lc; - register char *rc; + register const char *lc; + register const char *rc; register I32 len; I32 lensave; - char *lsave; - char *rsave; - bool left_utf = DO_UTF8(left); - bool right_utf = DO_UTF8(right); + const char *lsave; + const char *rsave; + const bool left_utf = DO_UTF8(left); + const bool right_utf = DO_UTF8(right); I32 needlen = 0; if (left_utf && !right_utf) @@ -1091,19 +1164,18 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) if (sv != left || (optype != OP_BIT_AND && !SvOK(sv) && !SvGMAGICAL(sv))) sv_setpvn(sv, "", 0); /* avoid undef warning on |= and ^= */ - lsave = lc = SvPV(left, leftlen); - rsave = rc = SvPV(right, rightlen); + lsave = lc = SvPV_nomg_const(left, leftlen); + rsave = rc = SvPV_nomg_const(right, rightlen); len = leftlen < rightlen ? leftlen : rightlen; lensave = len; if ((left_utf || right_utf) && (sv == left || sv == right)) { needlen = optype == OP_BIT_AND ? len : leftlen + rightlen; - Newz(801, dc, needlen + 1, char); + Newxz(dc, needlen + 1, char); } else if (SvOK(sv) || SvTYPE(sv) > SVt_PVMG) { - STRLEN n_a; - dc = SvPV_force(sv, n_a); - if (SvCUR(sv) < len) { - dc = SvGROW(sv, len + 1); + dc = SvPV_force_nomg_nolen(sv); + if (SvCUR(sv) < (STRLEN)len) { + dc = SvGROW(sv, (STRLEN)(len + 1)); (void)memzero(dc + SvCUR(sv), len - SvCUR(sv) + 1); } if (optype != OP_BIT_AND && (left_utf || right_utf)) @@ -1112,7 +1184,7 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) else { needlen = ((optype == OP_BIT_AND) ? len : (leftlen > rightlen ? leftlen : rightlen)); - Newz(801, dc, needlen + 1, char); + Newxz(dc, needlen + 1, char); (void)sv_usepvn(sv, dc, needlen); dc = SvPVX(sv); /* sv_usepvn() calls Renew() */ } @@ -1186,7 +1258,7 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) !((long)lc % sizeof(long)) && !((long)rc % sizeof(long))) /* It's almost always aligned... */ { - I32 remainder = len % (sizeof(long)*4); + const I32 remainder = len % (sizeof(long)*4); len /= (sizeof(long)*4); dl = (long*)dc; @@ -1241,9 +1313,9 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) *dc++ = *lc++ | *rc++; mop_up: len = lensave; - if (rightlen > len) + if (rightlen > (STRLEN)len) sv_catpvn(sv, rsave + len, rightlen - len); - else if (leftlen > len) + else if (leftlen > (STRLEN)len) sv_catpvn(sv, lsave + len, leftlen - len); else *SvEND(sv) = '\0'; @@ -1261,14 +1333,10 @@ Perl_do_kv(pTHX) HV *hv = (HV*)POPs; HV *keys; register HE *entry; - SV *tmpstr; - I32 gimme = GIMME_V; - I32 dokeys = (PL_op->op_type == OP_KEYS); - I32 dovalues = (PL_op->op_type == OP_VALUES); - I32 realhv = (SvTYPE(hv) == SVt_PVHV); - - if (PL_op->op_type == OP_RV2HV || PL_op->op_type == OP_PADHV) - dokeys = dovalues = TRUE; + const I32 gimme = GIMME_V; + const I32 dokv = (PL_op->op_type == OP_RV2HV || PL_op->op_type == OP_PADHV); + const I32 dokeys = dokv || (PL_op->op_type == OP_KEYS); + const I32 dovalues = dokv || (PL_op->op_type == OP_VALUES); if (!hv) { if (PL_op->op_flags & OPf_MOD || LVRET) { /* lvalue */ @@ -1280,7 +1348,7 @@ Perl_do_kv(pTHX) RETURN; } - keys = realhv ? hv : avhv_keys((AV*)hv); + keys = hv; (void)hv_iterinit(keys); /* always reset iterator regardless */ if (gimme == G_VOID) @@ -1309,7 +1377,6 @@ Perl_do_kv(pTHX) i = HvKEYS(keys); else { i = 0; - /*SUPPRESS 560*/ while (hv_iternext(keys)) i++; } PUSHi( i ); @@ -1321,15 +1388,17 @@ Perl_do_kv(pTHX) PUTBACK; /* hv_iternext and hv_iterval might clobber stack_sp */ while ((entry = hv_iternext(keys))) { SPAGAIN; - if (dokeys) - XPUSHs(hv_iterkeysv(entry)); /* won't clobber stack_sp */ + if (dokeys) { + SV* const sv = hv_iterkeysv(entry); + XPUSHs(sv); /* won't clobber stack_sp */ + } if (dovalues) { + SV *tmpstr; PUTBACK; - tmpstr = realhv ? - hv_iterval(hv,entry) : avhv_iterval((AV*)hv,entry); + tmpstr = hv_iterval(hv,entry); DEBUG_H(Perl_sv_setpvf(aTHX_ tmpstr, "%lu%%%d=%lu", (unsigned long)HeHASH(entry), - HvMAX(keys)+1, + (int)HvMAX(keys)+1, (unsigned long)(HeHASH(entry) & HvMAX(keys)))); SPAGAIN; XPUSHs(tmpstr); @@ -1339,3 +1408,12 @@ Perl_do_kv(pTHX) return NORMAL; } +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * + * ex: set ts=8 sts=4 sw=4 noet: + */