X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/c9b3c8d047f74379a7deb3b62371eeeaa726d5db..4785469e43ed59eb07455c31ce1079ada2c9f91f:/doop.c diff --git a/doop.c b/doop.c index 3cdc23d..c1d4fd4 100644 --- a/doop.c +++ b/doop.c @@ -1,6 +1,7 @@ /* doop.c * - * Copyright (c) 1991-2000, Larry Wall + * 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. @@ -8,7 +9,14 @@ */ /* - * "'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 + * 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" @@ -16,364 +24,546 @@ #include "perl.h" #ifndef PERL_MICRO -#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) #include #endif -#endif - -#define HALF_UPGRADE(start,end) \ - STMT_START { \ - U8* NeWsTr; \ - STRLEN LeN = (end) - (start); \ - NeWsTr = bytes_to_utf8(start, &LeN); \ - Copy(NeWsTr,start,LeN,U8*); \ - end = (start) + LeN; \ - } STMT_END - STATIC I32 -S_do_trans_simple(pTHX_ SV *sv) +S_do_trans_simple(pTHX_ SV * const sv) { - dTHR; - U8 *s; - U8 *d; - U8 *send; - U8 *dstart; + dVAR; I32 matches = 0; - I32 sutf = SvUTF8(sv); STRLEN len; - short *tbl; - I32 ch; + U8 *s = (U8*)SvPV_nomg(sv,len); + U8 * const send = s+len; + const short * const tbl = (short*)cPVOP->op_pv; - tbl = (short*)cPVOP->op_pv; - if (!tbl) - Perl_croak(aTHX_ "panic: do_trans"); + PERL_ARGS_ASSERT_DO_TRANS_SIMPLE; - s = (U8*)SvPV(sv, len); - send = s + len; + if (!tbl) + Perl_croak(aTHX_ "panic: do_trans_simple line %d",__LINE__); - /* First, take care of non-UTF8 input strings, because they're easy */ - if (!sutf) { + /* 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++; + s++; } SvSETMAGIC(sv); - return matches; } + else { + const I32 grows = PL_op->op_private & OPpTRANS_GROWS; + U8 *d; + U8 *dstart; - /* Allow for expansion: $_="a".chr(400); tr/a/\xFE/, FE needs encoding */ - Newz(0, d, len*2+1, U8); - dstart = d; - while (s < send) { - I32 ulen; - short c; - - ulen = 1; - /* Need to check this, otherwise 128..255 won't match */ - c = utf8_to_uv(s, &ulen); - if (c < 0x100 && (ch = tbl[(short)c]) >= 0) { - matches++; - if (ch < 0x80) - *d++ = ch; - else - d = uv_to_utf8(d,ch); - s += ulen; - } - else { /* No match -> copy */ - while (ulen--) - *d++ = *s++; - } + /* Allow for expansion: $_="a".chr(400); tr/a/\xFE/, FE needs encoding */ + if (grows) + Newx(d, len*2+1, U8); + else + d = s; + dstart = d; + while (s < send) { + STRLEN ulen; + I32 ch; + + /* Need to check this, otherwise 128..255 won't match */ + const UV c = utf8n_to_uvchr(s, send - s, &ulen, UTF8_ALLOW_DEFAULT); + if (c < 0x100 && (ch = tbl[c]) >= 0) { + matches++; + d = uvchr_to_utf8(d, ch); + s += ulen; + } + else { /* No match -> copy */ + Move(s, d, ulen, U8); + d += ulen; + s += ulen; + } + } + if (grows) { + sv_setpvn(sv, (char*)dstart, d - dstart); + Safefree(dstart); + } + else { + *d = '\0'; + SvCUR_set(sv, d - dstart); + } + SvUTF8_on(sv); + SvSETMAGIC(sv); } - *d = '\0'; - sv_setpvn(sv, (const char*)dstart, d - dstart); - SvUTF8_on(sv); - SvLEN_set(sv, 2*len+1); - SvSETMAGIC(sv); return matches; } STATIC I32 -S_do_trans_count(pTHX_ SV *sv)/* SPC - OK */ +S_do_trans_count(pTHX_ SV * const sv) { - dTHR; - U8 *s; - U8 *send; - I32 matches = 0; - I32 hasutf = SvUTF8(sv); + dVAR; STRLEN len; - short *tbl; + const U8 *s = (const U8*)SvPV_nomg_const(sv, len); + const U8 * const send = s + len; + I32 matches = 0; + const short * const tbl = (short*)cPVOP->op_pv; - tbl = (short*)cPVOP->op_pv; - if (!tbl) - Perl_croak(aTHX_ "panic: do_trans"); + PERL_ARGS_ASSERT_DO_TRANS_COUNT; - s = (U8*)SvPV(sv, len); - send = s + len; + if (!tbl) + Perl_croak(aTHX_ "panic: do_trans_count line %d",__LINE__); - while (s < send) { - if (hasutf && *s & 0x80) - s += UTF8SKIP(s); - else { - UV c; - I32 ulen; - ulen = 1; - if (hasutf) - c = utf8_to_uv(s,&ulen); - else - c = *s; - if (c < 0x100 && tbl[c] >= 0) + if (!SvUTF8(sv)) { + while (s < send) { + if (tbl[*s++] >= 0) matches++; - s += ulen; - } + } + } + else { + const I32 complement = PL_op->op_private & OPpTRANS_COMPLEMENT; + while (s < send) { + STRLEN ulen; + const UV c = utf8n_to_uvchr(s, send - s, &ulen, UTF8_ALLOW_DEFAULT); + if (c < 0x100) { + if (tbl[c] >= 0) + matches++; + } else if (complement) + matches++; + s += ulen; + } } return matches; } STATIC I32 -S_do_trans_complex(pTHX_ SV *sv)/* SPC - NOT OK */ +S_do_trans_complex(pTHX_ SV * const sv) { - dTHR; - U8 *s; - U8 *send; - U8 *d; - I32 hasutf = SvUTF8(sv); - I32 matches = 0; + dVAR; STRLEN len; - short *tbl; - I32 ch; - - tbl = (short*)cPVOP->op_pv; - if (!tbl) - Perl_croak(aTHX_ "panic: do_trans"); - - s = (U8*)SvPV(sv, len); - send = s + len; + U8 *s = (U8*)SvPV_nomg(sv, len); + U8 * const send = s+len; + I32 matches = 0; + const short * const tbl = (short*)cPVOP->op_pv; - d = s; - if (PL_op->op_private & OPpTRANS_SQUASH) { - U8* p = send; + PERL_ARGS_ASSERT_DO_TRANS_COMPLEX; - while (s < send) { - if (hasutf && *s & 0x80) - s += UTF8SKIP(s); - else { - if ((ch = tbl[*s]) >= 0) { - *d = ch; + if (!tbl) + Perl_croak(aTHX_ "panic: do_trans_complex line %d",__LINE__); + + if (!SvUTF8(sv)) { + U8 *d = s; + U8 * const dstart = d; + + if (PL_op->op_private & OPpTRANS_SQUASH) { + const U8* p = send; + while (s < send) { + const I32 ch = tbl[*s]; + if (ch >= 0) { + *d = (U8)ch; matches++; - if (p == d - 1 && *p == *d) - matches--; - else - p = d++; - } - else if (ch == -1) /* -1 is unmapped character */ - *d++ = *s; /* -2 is delete character */ - s++; - } + if (p != d - 1 || *p != *d) + p = d++; + } + else if (ch == -1) /* -1 is unmapped character */ + *d++ = *s; + else if (ch == -2) /* -2 is delete character */ + matches++; + s++; + } + } + else { + while (s < send) { + const I32 ch = tbl[*s]; + if (ch >= 0) { + matches++; + *d++ = (U8)ch; + } + else if (ch == -1) /* -1 is unmapped character */ + *d++ = *s; + else if (ch == -2) /* -2 is delete character */ + matches++; + s++; + } } + *d = '\0'; + SvCUR_set(sv, d - dstart); } - else { - while (s < send) { - if (hasutf && *s & 0x80) - s += UTF8SKIP(s); - else { - if ((ch = tbl[*s]) >= 0) { - *d = ch; + else { /* is utf8 */ + const I32 complement = PL_op->op_private & OPpTRANS_COMPLEMENT; + const I32 grows = PL_op->op_private & OPpTRANS_GROWS; + const I32 del = PL_op->op_private & OPpTRANS_DELETE; + U8 *d; + U8 *dstart; + STRLEN rlen = 0; + + if (grows) + Newx(d, len*2+1, U8); + else + d = s; + dstart = d; + if (complement && !del) + rlen = tbl[0x100]; + + if (PL_op->op_private & OPpTRANS_SQUASH) { + UV pch = 0xfeedface; + while (s < send) { + STRLEN len; + const UV comp = utf8n_to_uvchr(s, send - s, &len, + UTF8_ALLOW_DEFAULT); + I32 ch; + + if (comp > 0xff) { + if (!complement) { + Move(s, d, len, U8); + d += len; + } + else { + matches++; + if (!del) { + ch = (rlen == 0) ? (I32)comp : + (comp - 0x100 < rlen) ? + tbl[comp+1] : tbl[0x100+rlen]; + if ((UV)ch != pch) { + d = uvchr_to_utf8(d, ch); + pch = (UV)ch; + } + s += len; + continue; + } + } + } + else if ((ch = tbl[comp]) >= 0) { + matches++; + if ((UV)ch != pch) { + d = uvchr_to_utf8(d, ch); + pch = (UV)ch; + } + s += len; + continue; + } + else if (ch == -1) { /* -1 is unmapped character */ + Move(s, d, len, U8); + d += len; + } + else if (ch == -2) /* -2 is delete character */ matches++; - d++; - } - else if (ch == -1) /* -1 is unmapped character */ - *d++ = *s; /* -2 is delete character */ - s++; - } + s += len; + pch = 0xfeedface; + } } + else { + while (s < send) { + STRLEN len; + const UV comp = utf8n_to_uvchr(s, send - s, &len, + UTF8_ALLOW_DEFAULT); + I32 ch; + if (comp > 0xff) { + if (!complement) { + Move(s, d, len, U8); + d += len; + } + else { + matches++; + if (!del) { + if (comp - 0x100 < rlen) + d = uvchr_to_utf8(d, tbl[comp+1]); + else + d = uvchr_to_utf8(d, tbl[0x100+rlen]); + } + } + } + else if ((ch = tbl[comp]) >= 0) { + d = uvchr_to_utf8(d, ch); + matches++; + } + else if (ch == -1) { /* -1 is unmapped character */ + Move(s, d, len, U8); + d += len; + } + else if (ch == -2) /* -2 is delete character */ + matches++; + s += len; + } + } + if (grows) { + sv_setpvn(sv, (char*)dstart, d - dstart); + Safefree(dstart); + } + else { + *d = '\0'; + SvCUR_set(sv, d - dstart); + } + SvUTF8_on(sv); } - matches += send - d; /* account for disappeared chars */ - *d = '\0'; - SvCUR_set(sv, d - (U8*)SvPVX(sv)); SvSETMAGIC(sv); - return matches; } STATIC I32 -S_do_trans_simple_utf8(pTHX_ SV *sv)/* SPC - OK */ +S_do_trans_simple_utf8(pTHX_ SV * const sv) { - dTHR; + dVAR; U8 *s; U8 *send; U8 *d; U8 *start; - U8 *dstart; + U8 *dstart, *dend; I32 matches = 0; + const I32 grows = PL_op->op_private & OPpTRANS_GROWS; 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 final; - UV uv; - I32 isutf; - I32 howmany; - - isutf = SvUTF8(sv); - s = (U8*)SvPV(sv, len); + 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_nomg(sv, len); + if (!SvUTF8(sv)) { + const U8 *t = s; + const U8 * const e = s + len; + while (t < e) { + const U8 ch = *t++; + hibit = !NATIVE_IS_INVARIANT(ch); + if (hibit) { + s = bytes_to_utf8(s, &len); + break; + } + } + } send = s + len; start = s; - svp = hv_fetch(hv, "FINAL", 5, FALSE); + svp = hv_fetchs(hv, "FINAL", FALSE); if (svp) final = SvUV(*svp); - /* d needs to be bigger than s, in case e.g. upgrading is required */ - Newz(0, d, len*2+1, U8); - dstart = d; + if (grows) { + /* d needs to be bigger than s, in case e.g. upgrading is required */ + Newx(d, len * 3 + UTF8_MAXBYTES, U8); + dend = d + len * 3; + dstart = d; + } + else { + dstart = d = s; + dend = d + len; + } + while (s < send) { - if ((uv = swash_fetch(rv, s)) < none) { + const UV uv = swash_fetch(rv, s, TRUE); + if (uv < none) { s += UTF8SKIP(s); matches++; - if ((uv & 0x80) && !isutf++) - HALF_UPGRADE(dstart,d); - d = uv_to_utf8(d, uv); + d = uvuni_to_utf8(d, uv); } else if (uv == none) { - int i; - i = UTF8SKIP(s); - if (i > 1 && !isutf++) - HALF_UPGRADE(dstart,d); - while(i--) - *d++ = *s++; + const int i = UTF8SKIP(s); + Move(s, d, i, U8); + d += i; + s += i; } else if (uv == extra) { - int i; - i = UTF8SKIP(s); - s += i; + s += UTF8SKIP(s); matches++; - if (i > 1 && !isutf++) - HALF_UPGRADE(dstart,d); - d = uv_to_utf8(d, final); + d = uvuni_to_utf8(d, final); } else s += UTF8SKIP(s); + + if (d > dend) { + 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_MAXBYTES, U8); + d = dstart + clen; + dend = dstart + nlen; + } + } + if (grows || hibit) { + sv_setpvn(sv, (char*)dstart, d - dstart); + Safefree(dstart); + if (grows && hibit) + Safefree(start); + } + else { + *d = '\0'; + SvCUR_set(sv, d - dstart); } - *d = '\0'; - sv_setpvn(sv, (const char*)dstart, d - dstart); SvSETMAGIC(sv); - if (isutf) - SvUTF8_on(sv); + SvUTF8_on(sv); return matches; } STATIC I32 -S_do_trans_count_utf8(pTHX_ SV *sv)/* SPC - OK */ +S_do_trans_count_utf8(pTHX_ SV * const sv) { - dTHR; - U8 *s; - U8 *send; + dVAR; + const U8 *s; + const U8 *start = NULL; + const U8 *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 uv; - - s = (U8*)SvPV(sv, len); - if (!SvUTF8(sv)) - s = bytes_to_utf8(s, &len); + 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_nomg_const(sv, len); + if (!SvUTF8(sv)) { + const U8 *t = s; + const U8 * const e = s + len; + while (t < e) { + const U8 ch = *t++; + hibit = !NATIVE_IS_INVARIANT(ch); + if (hibit) { + start = s = bytes_to_utf8(s, &len); + break; + } + } + } send = s + len; while (s < send) { - if ((uv = swash_fetch(rv, s)) < none) + const UV uv = swash_fetch(rv, s, TRUE); + if (uv < none || uv == extra) matches++; s += UTF8SKIP(s); } + if (hibit) + Safefree(start); return matches; } STATIC I32 -S_do_trans_complex_utf8(pTHX_ SV *sv) /* SPC - NOT OK */ +S_do_trans_complex_utf8(pTHX_ SV * const sv) { - dTHR; - U8 *s; - U8 *send; + dVAR; + U8 *start, *send; U8 *d; I32 matches = 0; - I32 squash = PL_op->op_private & OPpTRANS_SQUASH; - I32 del = PL_op->op_private & OPpTRANS_DELETE; - 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 final; - UV uv; + 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 = +#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; + bool havefinal = FALSE; STRLEN len; - U8 *dst; - I32 isutf = SvUTF8(sv); - - s = (U8*)SvPV(sv, len); + U8 *dstart, *dend; + U8 hibit = 0; + U8 *s = (U8*)SvPV_nomg(sv, len); + + PERL_ARGS_ASSERT_DO_TRANS_COMPLEX_UTF8; + + if (!SvUTF8(sv)) { + const U8 *t = s; + const U8 * const e = s + len; + while (t < e) { + const U8 ch = *t++; + hibit = !NATIVE_IS_INVARIANT(ch); + if (hibit) { + s = bytes_to_utf8(s, &len); + break; + } + } + } send = s + len; + start = s; - svp = hv_fetch(hv, "FINAL", 5, FALSE); - if (svp) + svp = hv_fetchs(hv, "FINAL", FALSE); + if (svp) { final = SvUV(*svp); + havefinal = TRUE; + } - Newz(0, d, len*2+1, U8); - dst = d; + if (grows) { + /* d needs to be bigger than s, in case e.g. upgrading is required */ + Newx(d, len * 3 + UTF8_MAXBYTES, U8); + dend = d + len * 3; + dstart = d; + } + else { + dstart = d = s; + dend = d + len; + } if (squash) { UV puv = 0xfeedface; while (s < send) { - if (SvUTF8(sv)) - uv = swash_fetch(rv, s); - else { - U8 tmpbuf[2]; - uv = *s++; - if (uv < 0x80) - tmpbuf[0] = uv; - else { - tmpbuf[0] = (( uv >> 6) | 0xc0); - tmpbuf[1] = (( uv & 0x3f) | 0x80); - } - uv = swash_fetch(rv, tmpbuf); + UV uv = swash_fetch(rv, s, TRUE); + + if (d > dend) { + 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_MAXBYTES, U8); + d = dstart + clen; + dend = dstart + nlen; } - if (uv < none) { matches++; + s += UTF8SKIP(s); if (uv != puv) { - if ((uv & 0x80) && !isutf++) - HALF_UPGRADE(dst,d); - d = uv_to_utf8(d, uv); + d = uvuni_to_utf8(d, uv); puv = uv; } - s += UTF8SKIP(s); continue; } else if (uv == none) { /* "none" is unmapped character */ - I32 ulen; - *d++ = (U8)utf8_to_uv(s, &ulen); - s += ulen; + const int i = UTF8SKIP(s); + Move(s, d, i, U8); + d += i; + s += i; puv = 0xfeedface; continue; } else if (uv == extra && !del) { matches++; - if (uv != puv) { - d = uv_to_utf8(d, final); - puv = final; + if (havefinal) { + s += UTF8SKIP(s); + if (puv != final) { + d = uvuni_to_utf8(d, final); + puv = final; + } + } + else { + STRLEN len; + uv = utf8n_to_uvuni(s, send - s, &len, UTF8_ALLOW_DEFAULT); + if (uv != puv) { + Move(s, d, len, U8); + d += len; + puv = uv; + } + s += len; } - s += UTF8SKIP(s); continue; } matches++; /* "none+1" is delete character */ @@ -382,47 +572,50 @@ S_do_trans_complex_utf8(pTHX_ SV *sv) /* SPC - NOT OK */ } else { while (s < send) { - if (SvUTF8(sv)) - uv = swash_fetch(rv, s); - else { - U8 tmpbuf[2]; - uv = *s++; - if (uv < 0x80) - tmpbuf[0] = uv; - else { - tmpbuf[0] = (( uv >> 6) | 0xc0); - tmpbuf[1] = (( uv & 0x3f) | 0x80); - } - uv = swash_fetch(rv, tmpbuf); + const UV uv = swash_fetch(rv, s, TRUE); + if (d > dend) { + 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_MAXBYTES, U8); + d = dstart + clen; + dend = dstart + nlen; } if (uv < none) { matches++; - d = uv_to_utf8(d, uv); s += UTF8SKIP(s); + d = uvuni_to_utf8(d, uv); continue; } else if (uv == none) { /* "none" is unmapped character */ - I32 ulen; - *d++ = (U8)utf8_to_uv(s, &ulen); - s += ulen; + const int i = UTF8SKIP(s); + Move(s, d, i, U8); + d += i; + s += i; continue; } else if (uv == extra && !del) { matches++; - d = uv_to_utf8(d, final); s += UTF8SKIP(s); + d = uvuni_to_utf8(d, final); continue; } matches++; /* "none+1" is delete character */ s += UTF8SKIP(s); } } - if (dst) - sv_usepvn(sv, (char*)dst, d - dst); + if (grows || hibit) { + sv_setpvn(sv, (char*)dstart, d - dstart); + Safefree(dstart); + if (grows && hibit) + Safefree(start); + } else { *d = '\0'; - SvCUR_set(sv, d - (U8*)SvPVX(sv)); + SvCUR_set(sv, d - dstart); } + SvUTF8_on(sv); SvSETMAGIC(sv); return matches; @@ -431,25 +624,31 @@ S_do_trans_complex_utf8(pTHX_ SV *sv) /* SPC - NOT OK */ I32 Perl_do_trans(pTHX_ SV *sv) { - dTHR; + dVAR; STRLEN len; - I32 hasutf = (PL_op->op_private & + const I32 hasutf = (PL_op->op_private & (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF)); - if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL)) - Perl_croak(aTHX_ PL_no_modify); + PERL_ARGS_ASSERT_DO_TRANS; - (void)SvPV(sv, len); + if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL)) { + if (!SvIsCOW(sv)) + Perl_croak_no_modify(aTHX); + } + (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) || SvTHINKFIRST(sv)) + (void)SvPV_force_nomg(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); @@ -457,6 +656,7 @@ Perl_do_trans(pTHX_ SV *sv) return do_trans_simple(sv); case OPpTRANS_IDENTICAL: + case OPpTRANS_IDENTICAL|OPpTRANS_COMPLEMENT: if (hasutf) return do_trans_count_utf8(sv); else @@ -471,22 +671,27 @@ Perl_do_trans(pTHX_ SV *sv) } 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) { - SV **oldmark = mark; - register I32 items = sp - mark; - register STRLEN len; + dVAR; + SV ** const oldmark = mark; + I32 items = sp - mark; + STRLEN len; STRLEN delimlen; - register char *delim = SvPV(del, delimlen); - STRLEN tmplen; + + 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++; 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 && !SvGMAGICAL(*mark) && SvOK(*mark)) { - SvPV(*mark, tmplen); + if (*mark && !SvGAMAGIC(*mark) && SvOK(*mark)) { + STRLEN tmplen; + SvPV_const(*mark, tmplen); len += tmplen; } mark++; @@ -498,20 +703,22 @@ Perl_do_join(pTHX_ register SV *sv, SV *del, register SV **mark, register SV **s ++mark; } - if (items-- > 0) { - char *s; + sv_setpvs(sv, ""); + /* sv_setpv retains old UTF8ness [perl #24846] */ + SvUTF8_off(sv); + + if (PL_tainting && SvMAGICAL(sv)) + SvTAINTED_off(sv); - sv_setpv(sv, ""); + if (items-- > 0) { if (*mark) sv_catsv(sv, *mark); mark++; } - else - sv_setpv(sv,""); - len = delimlen; - if (len) { + + if (delimlen) { for (; items > 0; items--,mark++) { - sv_catpvn(sv,delim,len); + sv_catsv_nomg(sv,delim); sv_catsv(sv,*mark); } } @@ -525,142 +732,171 @@ Perl_do_join(pTHX_ register SV *sv, SV *del, register SV **mark, register SV **s void Perl_do_sprintf(pTHX_ SV *sv, I32 len, SV **sarg) { + dVAR; STRLEN patlen; - char *pat = SvPV(*sarg, patlen); + const char * const pat = SvPV_const(*sarg, patlen); bool do_taint = FALSE; - sv_vsetpvfn(sv, pat, patlen, Null(va_list*), sarg + 1, len - 1, &do_taint); + PERL_ARGS_ASSERT_DO_SPRINTF; + + if (SvTAINTED(*sarg)) + TAINT_PROPER( + (PL_op && PL_op->op_type < OP_max) + ? (PL_op->op_type == OP_PRTF) + ? "printf" + : PL_op_name[PL_op->op_type] + : "(unknown)" + ); + SvUTF8_off(sv); + if (DO_UTF8(*sarg)) + SvUTF8_on(sv); + sv_vsetpvfn(sv, pat, patlen, NULL, sarg + 1, len - 1, &do_taint); SvSETMAGIC(sv); if (do_taint) SvTAINTED_on(sv); } -/* XXX SvUTF8 support missing! */ +/* currently converts input to bytes if possible, but doesn't sweat failure */ UV -Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size) +Perl_do_vecget(pTHX_ SV *sv, SSize_t offset, int size) { - STRLEN srclen, len; - unsigned char *s = (unsigned char *) SvPV(sv, srclen); + dVAR; + STRLEN srclen, len, uoffset, bitoffs = 0; + const unsigned char *s = (const unsigned char *) SvPV_flags_const(sv, srclen, + SV_GMAGIC | ((PL_op->op_flags & OPf_MOD || LVRET) + ? SV_UNDEF_RETURNS_NULL : 0)); UV retnum = 0; + if (!s) { + s = (const unsigned char *)""; + } + + PERL_ARGS_ASSERT_DO_VECGET; + if (offset < 0) - return retnum; - if (size < 1 || (size & (size-1))) /* size < 1 or not a power of two */ + 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"); - offset *= size; /* turn into bit offset */ - len = (offset + size + 7) / 8; /* required number of bytes */ + + if (SvUTF8(sv)) + (void) Perl_sv_utf8_downgrade(aTHX_ sv, TRUE); + + 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 (offset >= srclen) + if (uoffset >= srclen) retnum = 0; else - retnum = (UV) s[offset] << 8; + retnum = (UV) s[uoffset] << 8; } else if (size == 32) { - if (offset >= srclen) + if (uoffset >= srclen) retnum = 0; - else if (offset + 1 >= srclen) + else if (uoffset + 1 >= srclen) retnum = - ((UV) s[offset ] << 24); - else if (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) { - dTHR; - if (ckWARN(WARN_PORTABLE)) - Perl_warner(aTHX_ 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); + retnum = + ((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) { - dTHR; - if (ckWARN(WARN_PORTABLE)) - Perl_warner(aTHX_ 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 } @@ -668,73 +904,91 @@ Perl_do_vecget(pTHX_ SV *sv, I32 offset, I32 size) return retnum; } -/* XXX SvUTF8 support missing! */ +/* currently converts input to bytes if possible but doesn't sweat failures, + * although it does ensure that the string it clobbers is not marked as + * utf8-valid any more + */ void Perl_do_vecset(pTHX_ SV *sv) { - SV *targ = LvTARG(sv); - register I32 offset; - register I32 size; - register unsigned char *s; - register UV lval; + dVAR; + SSize_t offset, bitoffs = 0; + int size; + unsigned char *s; + UV lval; I32 mask; STRLEN targlen; STRLEN len; + SV * const targ = LvTARG(sv); + + PERL_ARGS_ASSERT_DO_VECSET; if (!targ) return; - s = (unsigned char*)SvPV_force(targ, targlen); + s = (unsigned char*)SvPV_force_flags(targ, targlen, + SV_GMAGIC | SV_UNDEF_RETURNS_NULL); + if (SvUTF8(targ)) { + /* This is handled by the SvPOK_only below... + if (!Perl_sv_utf8_downgrade(aTHX_ targ, TRUE)) + SvUTF8_off(targ); + */ + (void) Perl_sv_utf8_downgrade(aTHX_ targ, TRUE); + } + (void)SvPOK_only(targ); lval = SvUV(sv); offset = LvTARGOFF(sv); + if (offset < 0) + 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 */ + 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); SvCUR_set(targ, len); } - + 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 ] = 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) { - dTHR; - if (ckWARN(WARN_PORTABLE)) - Perl_warner(aTHX_ 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; + 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); + 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 } @@ -742,188 +996,73 @@ Perl_do_vecset(pTHX_ SV *sv) } void -Perl_do_chop(pTHX_ register SV *astr, register SV *sv) +Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) { + dVAR; +#ifdef LIBERAL + long *dl; + long *ll; + long *rl; +#endif + char *dc; + STRLEN leftlen; + STRLEN rightlen; + const char *lc; + const char *rc; STRLEN len; - char *s; - dTHR; - - if (SvTYPE(sv) == SVt_PVAV) { - register I32 i; - I32 max; - AV* av = (AV*)sv; - 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); - } - return; - } - else if (SvTYPE(sv) == SVt_PVHV) { - 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; + STRLEN lensave; + const char *lsave; + const char *rsave; + bool left_utf; + bool right_utf; + STRLEN needlen = 0; + + PERL_ARGS_ASSERT_DO_VOP; + + if (sv != left || (optype != OP_BIT_AND && !SvOK(sv))) + sv_setpvs(sv, ""); /* avoid undef warning on |= and ^= */ + if (sv == left) { + lsave = lc = SvPV_force_nomg(left, leftlen); } - else if (SvREADONLY(sv)) - Perl_croak(aTHX_ PL_no_modify); - s = SvPV(sv, len); - if (len && !SvPOK(sv)) - s = SvPV_force(sv, len); - if (DO_UTF8(sv)) { - if (s && len) { - char *send = s + len; - char *start = s; - s = send - 1; - while ((*s & 0xc0) == 0x80) - --s; - if (UTF8SKIP(s) != send - s && ckWARN_d(WARN_UTF8)) - Perl_warner(aTHX_ WARN_UTF8, "Malformed UTF-8 character"); - sv_setpvn(astr, s, send - s); - *s = '\0'; - SvCUR_set(sv, s - start); - SvNIOK_off(sv); - SvUTF8_on(astr); - } - else - sv_setpvn(astr, "", 0); - } - else if (s && len) { - s += --len; - sv_setpvn(astr, s, 1); - *s = '\0'; - SvCUR_set(sv, len); - SvUTF8_off(sv); - SvNIOK_off(sv); + else { + lsave = lc = SvPV_nomg_const(left, leftlen); + SvPV_force_nomg_nolen(sv); } - else - sv_setpvn(astr, "", 0); - SvSETMAGIC(sv); -} + rsave = rc = SvPV_nomg_const(right, rightlen); -I32 -Perl_do_chomp(pTHX_ register SV *sv) -{ - dTHR; - register I32 count; - STRLEN len; - char *s; + /* This need to come after SvPV to ensure that string overloading has + fired off. */ - if (RsSNARF(PL_rs)) - return 0; - if (RsRECORD(PL_rs)) - return 0; - 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++) { - sv = (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* 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); - s = SvPV(sv, len); - if (len && !SvPOKp(sv)) - s = SvPV_force(sv, len); - if (s && len) { - s += --len; - if (RsPARA(PL_rs)) { - if (*s != '\n') - goto nope; - ++count; - while (len && s[-1] == '\n') { - --len; - --s; - ++count; - } - } - else { - STRLEN rslen; - char *rsptr = SvPV(PL_rs, rslen); - if (rslen == 1) { - if (*s != *rsptr) - goto nope; - ++count; - } - else { - if (len < rslen - 1) - goto nope; - len -= rslen - 1; - s -= rslen - 1; - if (memNE(s, rsptr, rslen)) - goto nope; - count += rslen; - } - } - *s = '\0'; - SvCUR_set(sv, len); - SvNIOK_off(sv); - } - nope: - SvSETMAGIC(sv); - return count; -} + left_utf = DO_UTF8(left); + right_utf = DO_UTF8(right); -void -Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) -{ - dTHR; /* just for taint */ -#ifdef LIBERAL - register long *dl; - register long *ll; - register long *rl; -#endif - register char *dc; - STRLEN leftlen; - STRLEN rightlen; - register char *lc; - register char *rc; - register I32 len; - I32 lensave; - char *lsave; - char *rsave; - bool left_utf = DO_UTF8(left); - bool right_utf = DO_UTF8(right); - I32 needlen; - - if (left_utf && !right_utf) + 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); - if (!left_utf && right_utf) + 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; + } - 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); len = leftlen < rightlen ? leftlen : rightlen; lensave = len; + SvCUR_set(sv, len); + (void)SvPOK_only(sv); 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 = SvPV_force_nomg_nolen(sv); + if (SvLEN(sv) < len + 1) { dc = SvGROW(sv, len + 1); (void)memzero(dc + SvCUR(sv), len - SvCUR(sv) + 1); } @@ -931,71 +1070,80 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) dc = SvGROW(sv, leftlen + rightlen + 1); } else { - needlen = ((optype == OP_BIT_AND) - ? len : (leftlen > rightlen ? leftlen : rightlen)); - Newz(801, dc, needlen + 1, char); - (void)sv_usepvn(sv, dc, needlen); + 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() */ } - SvCUR_set(sv, len); - (void)SvPOK_only(sv); if (left_utf || right_utf) { UV duc, luc, ruc; - char *dcsave = dc; + char *dcorig = dc; + char *dcsave = NULL; STRLEN lulen = leftlen; STRLEN rulen = rightlen; - I32 ulen; + STRLEN ulen; switch (optype) { case OP_BIT_AND: while (lulen && rulen) { - luc = utf8_to_uv((U8*)lc, &ulen); + luc = utf8n_to_uvchr((U8*)lc, lulen, &ulen, UTF8_ALLOW_ANYUV); lc += ulen; lulen -= ulen; - ruc = utf8_to_uv((U8*)rc, &ulen); + ruc = utf8n_to_uvchr((U8*)rc, rulen, &ulen, UTF8_ALLOW_ANYUV); rc += ulen; rulen -= ulen; duc = luc & ruc; - dc = (char*)uv_to_utf8((U8*)dc, duc); + dc = (char*)uvchr_to_utf8((U8*)dc, duc); } if (sv == left || sv == right) - (void)sv_usepvn(sv, dcsave, needlen); - SvCUR_set(sv, dc - dcsave); + (void)sv_usepvn(sv, dcorig, needlen); + SvCUR_set(sv, dc - dcorig); break; case OP_BIT_XOR: while (lulen && rulen) { - luc = utf8_to_uv((U8*)lc, &ulen); + luc = utf8n_to_uvchr((U8*)lc, lulen, &ulen, UTF8_ALLOW_ANYUV); lc += ulen; lulen -= ulen; - ruc = utf8_to_uv((U8*)rc, &ulen); + ruc = utf8n_to_uvchr((U8*)rc, rulen, &ulen, UTF8_ALLOW_ANYUV); rc += ulen; rulen -= ulen; duc = luc ^ ruc; - dc = (char*)uv_to_utf8((U8*)dc, duc); + dc = (char*)uvchr_to_utf8((U8*)dc, duc); } goto mop_up_utf; case OP_BIT_OR: while (lulen && rulen) { - luc = utf8_to_uv((U8*)lc, &ulen); + luc = utf8n_to_uvchr((U8*)lc, lulen, &ulen, UTF8_ALLOW_ANYUV); lc += ulen; lulen -= ulen; - ruc = utf8_to_uv((U8*)rc, &ulen); + ruc = utf8n_to_uvchr((U8*)rc, rulen, &ulen, UTF8_ALLOW_ANYUV); rc += ulen; rulen -= ulen; duc = luc | ruc; - dc = (char*)uv_to_utf8((U8*)dc, duc); + dc = (char*)uvchr_to_utf8((U8*)dc, duc); } mop_up_utf: + if (rulen) + dcsave = savepvn(rc, rulen); + else if (lulen) + dcsave = savepvn(lc, lulen); if (sv == left || sv == right) - (void)sv_usepvn(sv, dcsave, needlen); - SvCUR_set(sv, dc - dcsave); + (void)sv_usepvn(sv, dcorig, needlen); /* uses Renew(); defaults to nomg */ + SvCUR_set(sv, dc - dcorig); if (rulen) - sv_catpvn(sv, rc, rulen); + sv_catpvn_nomg(sv, dcsave, rulen); else if (lulen) - sv_catpvn(sv, lc, lulen); + sv_catpvn_nomg(sv, dcsave, lulen); else *SvEND(sv) = '\0'; + Safefree(dcsave); break; + default: + if (sv == left || sv == right) + Safefree(dcorig); + Perl_croak(aTHX_ "panic: do_vop called for op %u (%s)", + (unsigned)optype, PL_op_name[optype]); } SvUTF8_on(sv); goto finish; @@ -1003,11 +1151,11 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) 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... */ { - I32 remainder = len % (sizeof(long)*4); + const STRLEN remainder = len % (sizeof(long)*4); len /= (sizeof(long)*4); dl = (long*)dc; @@ -1052,6 +1200,7 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) case OP_BIT_AND: while (len--) *dc++ = *lc++ & *rc++; + *dc = '\0'; break; case OP_BIT_XOR: while (len--) @@ -1063,9 +1212,9 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) mop_up: len = lensave; if (rightlen > len) - sv_catpvn(sv, rsave + len, rightlen - len); - else if (leftlen > len) - sv_catpvn(sv, lsave + len, leftlen - len); + sv_catpvn_nomg(sv, rsave + len, rightlen - len); + else if (leftlen > (STRLEN)len) + sv_catpvn_nomg(sv, lsave + len, leftlen - len); else *SvEND(sv) = '\0'; break; @@ -1078,79 +1227,61 @@ finish: OP * Perl_do_kv(pTHX) { - djSP; - 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; - - if (!hv) { - if (PL_op->op_flags & OPf_MOD) { /* lvalue */ - dTARGET; /* make sure to clear its target here */ - if (SvTYPE(TARG) == SVt_PVLV) - LvTARG(TARG) = Nullsv; - PUSHs(TARG); - } - RETURN; - } + dVAR; + dSP; + HV * const keys = MUTABLE_HV(POPs); + HE *entry; + const I32 gimme = GIMME_V; + const I32 dokv = (PL_op->op_type == OP_RV2HV || PL_op->op_type == OP_PADHV); + /* op_type is OP_RKEYS/OP_RVALUES if pp_rkeys delegated to here */ + const I32 dokeys = dokv || (PL_op->op_type == OP_KEYS || PL_op->op_type == OP_RKEYS); + const I32 dovalues = dokv || (PL_op->op_type == OP_VALUES || PL_op->op_type == OP_RVALUES); - keys = realhv ? hv : avhv_keys((AV*)hv); (void)hv_iterinit(keys); /* always reset iterator regardless */ if (gimme == G_VOID) RETURN; if (gimme == G_SCALAR) { - IV i; - dTARGET; + if (PL_op->op_flags & OPf_MOD || LVRET) { /* lvalue */ + SV * const ret = sv_2mortal(newSV_type(SVt_PVLV)); /* Not TARG RT#67838 */ + sv_magic(ret, NULL, PERL_MAGIC_nkeys, NULL, 0); + LvTYPE(ret) = 'k'; + LvTARG(ret) = SvREFCNT_inc_simple(keys); + PUSHs(ret); + } + else { + IV i; + dTARGET; - if (PL_op->op_flags & OPf_MOD) { /* lvalue */ - if (SvTYPE(TARG) < SVt_PVLV) { - sv_upgrade(TARG, SVt_PVLV); - sv_magic(TARG, Nullsv, 'k', Nullch, 0); + if (! SvTIED_mg((const SV *)keys, PERL_MAGIC_tied) ) { + i = HvUSEDKEYS(keys); } - LvTYPE(TARG) = 'k'; - if (LvTARG(TARG) != (SV*)keys) { - if (LvTARG(TARG)) - SvREFCNT_dec(LvTARG(TARG)); - LvTARG(TARG) = SvREFCNT_inc(keys); + else { + i = 0; + while (hv_iternext(keys)) i++; } - PUSHs(TARG); - RETURN; + PUSHi( i ); } - - if (! SvTIED_mg((SV*)keys, 'P')) - i = HvKEYS(keys); - else { - i = 0; - /*SUPPRESS 560*/ - while (hv_iternext(keys)) i++; - } - PUSHi( i ); RETURN; } - EXTEND(SP, HvKEYS(keys) * (dokeys + dovalues)); + EXTEND(SP, HvUSEDKEYS(keys) * (dokeys + dovalues)); 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(keys,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); @@ -1160,3 +1291,12 @@ Perl_do_kv(pTHX) return NORMAL; } +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * + * ex: set ts=8 sts=4 sw=4 et: + */