X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/2c27f131241beb434fcd2e4d3c6e9314506513c0..2d5e9bac83412e103d6b07a688dd7aea80148bd8:/regexec.c diff --git a/regexec.c b/regexec.c index cae8a19..82128a7 100644 --- a/regexec.c +++ b/regexec.c @@ -119,7 +119,6 @@ static const char* const non_utf8_target_but_utf8_required */ #define CHR_SVLEN(sv) (utf8_target ? sv_len_utf8(sv) : SvCUR(sv)) -#define CHR_DIST(a,b) (reginfo->is_utf8_target ? utf8_distance(a,b) : a - b) #define HOPc(pos,off) \ (char *)(reginfo->is_utf8_target \ @@ -150,6 +149,7 @@ static const char* const non_utf8_target_but_utf8_required #define HOP3lim(pos,off,lim) (reginfo->is_utf8_target \ ? reghop3((U8*)(pos), off, (U8*)(lim)) \ : (U8*)((pos + off) > lim ? lim : (pos + off))) +#define HOP3clim(pos,off,lim) ((char*)HOP3lim(pos,off,lim)) #define HOP4(pos,off,llim, rlim) (reginfo->is_utf8_target \ ? reghop4((U8*)(pos), off, (U8*)(llim), (U8*)(rlim)) \ @@ -272,7 +272,7 @@ static regmatch_state * S_push_slab(pTHX); * are needed for the regexp context stack bookkeeping. */ STATIC CHECKPOINT -S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen, int depth) +S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen _pDEPTH) { const int retval = PL_savestack_ix; const int paren_elems_to_push = @@ -290,7 +290,7 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen, int depth (int)parenfloor, (unsigned)REGCP_PAREN_ELEMS); if ((elems_shifted >> SAVE_TIGHT_SHIFT) != total_elems) - Perl_croak(aTHX_ "panic: paren_elems_to_push offset %"UVuf + Perl_croak(aTHX_ "panic: paren_elems_to_push offset %" UVuf " out of range (%lu-%ld)", total_elems, (unsigned long)maxopenparen, @@ -301,7 +301,7 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen, int depth DEBUG_BUFFERS_r( if ((int)maxopenparen > (int)parenfloor) Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" offs=0x%"UVxf": saving capture indices:\n", + "rex=0x%" UVxf " offs=0x%" UVxf ": saving capture indices:\n", depth, PTR2UV(rex), PTR2UV(rex->offs) @@ -313,7 +313,7 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen, int depth SSPUSHIV(rex->offs[p].start); SSPUSHINT(rex->offs[p].start_tmp); DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ - " \\%"UVuf": %"IVdf"(%"IVdf")..%"IVdf"\n", + " \\%" UVuf ": %" IVdf "(%" IVdf ")..%" IVdf "\n", depth, (UV)p, (IV)rex->offs[p].start, @@ -333,8 +333,8 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen, int depth /* These are needed since we do not localize EVAL nodes: */ #define REGCP_SET(cp) \ DEBUG_STATE_r( \ - Perl_re_exec_indentf( aTHX_ \ - "Setting an EVAL scope, savestack=%"IVdf",\n", \ + Perl_re_exec_indentf( aTHX_ \ + "Setting an EVAL scope, savestack=%" IVdf ",\n", \ depth, (IV)PL_savestack_ix \ ) \ ); \ @@ -343,8 +343,9 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen, int depth #define REGCP_UNWIND(cp) \ DEBUG_STATE_r( \ if (cp != PL_savestack_ix) \ - Perl_re_exec_indentf( aTHX_ \ - "Clearing an EVAL scope, savestack=%"IVdf"..%"IVdf"\n",\ + Perl_re_exec_indentf( aTHX_ \ + "Clearing an EVAL scope, savestack=%" \ + IVdf "..%" IVdf "\n", \ depth, (IV)(cp), (IV)PL_savestack_ix \ ) \ ); \ @@ -358,7 +359,7 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen, int depth STATIC void -S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p, int depth) +S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p _pDEPTH) { UV i; U32 paren; @@ -379,7 +380,7 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p, int depth) DEBUG_BUFFERS_r( if (i || rex->lastparen + 1 <= rex->nparens) Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" offs=0x%"UVxf": restoring capture indices to:\n", + "rex=0x%" UVxf " offs=0x%" UVxf ": restoring capture indices to:\n", depth, PTR2UV(rex), PTR2UV(rex->offs) @@ -394,7 +395,7 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p, int depth) if (paren <= rex->lastparen) rex->offs[paren].end = tmps; DEBUG_BUFFERS_r( Perl_re_exec_indentf( aTHX_ - " \\%"UVuf": %"IVdf"(%"IVdf")..%"IVdf"%s\n", + " \\%" UVuf ": %" IVdf "(%" IVdf ")..%" IVdf "%s\n", depth, (UV)paren, (IV)rex->offs[paren].start, @@ -419,7 +420,7 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p, int depth) rex->offs[i].start = -1; rex->offs[i].end = -1; DEBUG_BUFFERS_r( Perl_re_exec_indentf( aTHX_ - " \\%"UVuf": %s ..-1 undeffing\n", + " \\%" UVuf ": %s ..-1 undeffing\n", depth, (UV)i, (i > *maxopenparen_p) ? "-1" : " " @@ -432,18 +433,22 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p, int depth) * but without popping the stack */ STATIC void -S_regcp_restore(pTHX_ regexp *rex, I32 ix, U32 *maxopenparen_p, int depth) +S_regcp_restore(pTHX_ regexp *rex, I32 ix, U32 *maxopenparen_p _pDEPTH) { I32 tmpix = PL_savestack_ix; + PERL_ARGS_ASSERT_REGCP_RESTORE; + PL_savestack_ix = ix; - S_regcppop(aTHX_ rex, maxopenparen_p, depth); + regcppop(rex, maxopenparen_p); PL_savestack_ix = tmpix; } #define regcpblow(cp) LEAVE_SCOPE(cp) /* Ignores regcppush()ed data. */ -STATIC bool -S_isFOO_lc(pTHX_ const U8 classnum, const U8 character) +#ifndef PERL_IN_XSUB_RE + +bool +Perl_isFOO_lc(pTHX_ const U8 classnum, const U8 character) { /* Returns a boolean as to whether or not 'character' is a member of the * Posix character class given by 'classnum' that should be equivalent to a @@ -483,6 +488,8 @@ S_isFOO_lc(pTHX_ const U8 classnum, const U8 character) return FALSE; } +#endif + STATIC bool S_isFOO_utf8_lc(pTHX_ const U8 classnum, const U8* character) { @@ -731,8 +738,8 @@ Perl_re_intuit_start(pTHX_ continue; Perl_re_printf( aTHX_ - " substrs[%d]: min=%"IVdf" max=%"IVdf" end shift=%"IVdf - " useful=%"IVdf" utf8=%d [%s]\n", + " substrs[%d]: min=%" IVdf " max=%" IVdf " end shift=%" IVdf + " useful=%" IVdf " utf8=%d [%s]\n", i, (IV)prog->substrs->data[i].min_offset, (IV)prog->substrs->data[i].max_offset, @@ -791,7 +798,7 @@ Perl_re_intuit_start(pTHX_ char *s = HOP3c(strpos, prog->check_offset_min, strend); DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " Looking for check substr at fixed offset %"IVdf"...\n", + " Looking for check substr at fixed offset %" IVdf "...\n", (IV)prog->check_offset_min)); if (SvTAIL(check)) { @@ -811,8 +818,9 @@ Perl_re_intuit_start(pTHX_ /* Now should match s[0..slen-2] */ slen--; } - if (slen && (*SvPVX_const(check) != *s - || (slen > 1 && memNE(SvPVX_const(check), s, slen)))) + if (slen && (strend - s < slen + || *SvPVX_const(check) != *s + || (slen > 1 && (memNE(SvPVX_const(check), s, slen))))) { DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " String not equal...\n")); @@ -829,7 +837,7 @@ Perl_re_intuit_start(pTHX_ #ifdef DEBUGGING /* 7/99: reports of failure (with the older version) */ if (end_shift < 0) - Perl_croak(aTHX_ "panic: end_shift: %"IVdf" pattern:\n%s\n ", + Perl_croak(aTHX_ "panic: end_shift: %" IVdf " pattern:\n%s\n ", (IV)end_shift, RX_PRECOMP(prog)); #endif @@ -866,9 +874,9 @@ Perl_re_intuit_start(pTHX_ DEBUG_OPTIMISE_MORE_r({ Perl_re_printf( aTHX_ - " At restart: rx_origin=%"IVdf" Check offset min: %"IVdf - " Start shift: %"IVdf" End shift %"IVdf - " Real end Shift: %"IVdf"\n", + " At restart: rx_origin=%" IVdf " Check offset min: %" IVdf + " Start shift: %" IVdf " End shift %" IVdf + " Real end Shift: %" IVdf "\n", (IV)(rx_origin - strbeg), (IV)prog->check_offset_min, (IV)start_shift, @@ -914,7 +922,7 @@ Perl_re_intuit_start(pTHX_ check, multiline ? FBMrf_MULTILINE : 0); DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " doing 'check' fbm scan, [%"IVdf"..%"IVdf"] gave %"IVdf"\n", + " doing 'check' fbm scan, [%" IVdf "..%" IVdf "] gave %" IVdf "\n", (IV)((char*)start_point - strbeg), (IV)((char*)end_point - strbeg), (IV)(check_at ? check_at - strbeg : -1) @@ -946,7 +954,7 @@ Perl_re_intuit_start(pTHX_ rx_origin = HOP3c(check_at, -prog->check_offset_max, rx_origin); /* Finish the diagnostic message */ DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - "%ld (rx_origin now %"IVdf")...\n", + "%ld (rx_origin now %" IVdf ")...\n", (long)(check_at - strbeg), (IV)(rx_origin - strbeg) )); @@ -1062,7 +1070,7 @@ Perl_re_intuit_start(pTHX_ if (from > to) { s = NULL; DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " skipping 'other' fbm scan: %"IVdf" > %"IVdf"\n", + " skipping 'other' fbm scan: %" IVdf " > %" IVdf "\n", (IV)(from - strbeg), (IV)(to - strbeg) )); @@ -1075,7 +1083,7 @@ Perl_re_intuit_start(pTHX_ multiline ? FBMrf_MULTILINE : 0 ); DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " doing 'other' fbm scan, [%"IVdf"..%"IVdf"] gave %"IVdf"\n", + " doing 'other' fbm scan, [%" IVdf "..%" IVdf "] gave %" IVdf "\n", (IV)(from - strbeg), (IV)(to - strbeg), (IV)(s ? s - strbeg : -1) @@ -1111,7 +1119,7 @@ Perl_re_intuit_start(pTHX_ ? HOP3c(rx_origin, 1, strend) : HOP4c(last, 1 - other->min_offset, strbeg, strend); DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - "; about to retry %s at offset %ld (rx_origin now %"IVdf")...\n", + "; about to retry %s at offset %ld (rx_origin now %" IVdf ")...\n", (other_ix ? "floating" : "anchored"), (long)(HOP3c(check_at, 1, strend) - strbeg), (IV)(rx_origin - strbeg) @@ -1135,7 +1143,7 @@ Perl_re_intuit_start(pTHX_ other_last = HOP3c(s, 1, strend); } DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " at offset %ld (rx_origin now %"IVdf")...\n", + " at offset %ld (rx_origin now %" IVdf ")...\n", (long)(s - strbeg), (IV)(rx_origin - strbeg) )); @@ -1145,9 +1153,9 @@ Perl_re_intuit_start(pTHX_ else { DEBUG_OPTIMISE_MORE_r( Perl_re_printf( aTHX_ - " Check-only match: offset min:%"IVdf" max:%"IVdf - " check_at:%"IVdf" rx_origin:%"IVdf" rx_origin-check_at:%"IVdf - " strend:%"IVdf"\n", + " Check-only match: offset min:%" IVdf " max:%" IVdf + " check_at:%" IVdf " rx_origin:%" IVdf " rx_origin-check_at:%" IVdf + " strend:%" IVdf "\n", (IV)prog->check_offset_min, (IV)prog->check_offset_max, (IV)(check_at-strbeg), @@ -1219,7 +1227,7 @@ Perl_re_intuit_start(pTHX_ * didn't contradict, so just retry the anchored "other" * substr */ DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " Found /%s^%s/m, rescanning for anchored from offset %"IVdf" (rx_origin now %"IVdf")...\n", + " Found /%s^%s/m, rescanning for anchored from offset %" IVdf " (rx_origin now %" IVdf ")...\n", PL_colors[0], PL_colors[1], (IV)(rx_origin - strbeg + prog->anchored_offset), (IV)(rx_origin - strbeg) @@ -1284,17 +1292,17 @@ Perl_re_intuit_start(pTHX_ */ if (prog->anchored_substr || prog->anchored_utf8 || ml_anch) - endpos= HOP3c(rx_origin, (prog->minlen ? cl_l : 0), strend); + endpos = HOP3clim(rx_origin, (prog->minlen ? cl_l : 0), strend); else if (prog->float_substr || prog->float_utf8) { rx_max_float = HOP3c(check_at, -start_shift, strbeg); - endpos= HOP3c(rx_max_float, cl_l, strend); + endpos = HOP3clim(rx_max_float, cl_l, strend); } else endpos= strend; DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ - " looking for class: start_shift: %"IVdf" check_at: %"IVdf - " rx_origin: %"IVdf" endpos: %"IVdf"\n", + " looking for class: start_shift: %" IVdf " check_at: %" IVdf + " rx_origin: %" IVdf " endpos: %" IVdf "\n", (IV)start_shift, (IV)(check_at - strbeg), (IV)(rx_origin - strbeg), (IV)(endpos - strbeg))); @@ -1328,7 +1336,7 @@ Perl_re_intuit_start(pTHX_ * practice the extra fbm_instr() is likely to * get skipped anyway. */ DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ - " about to retry anchored at offset %ld (rx_origin now %"IVdf")...\n", + " about to retry anchored at offset %ld (rx_origin now %" IVdf ")...\n", (long)(other_last - strbeg), (IV)(rx_origin - strbeg) )); @@ -1377,7 +1385,7 @@ Perl_re_intuit_start(pTHX_ goto fail; } DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ - " about to look for %s substr starting at offset %ld (rx_origin now %"IVdf")...\n", + " about to look for %s substr starting at offset %ld (rx_origin now %" IVdf ")...\n", (prog->substrs->check_ix ? "floating" : "anchored"), (long)(rx_origin + start_shift - strbeg), (IV)(rx_origin - strbeg) @@ -1496,8 +1504,9 @@ STMT_START { uscan += len; \ len=0; \ } else { \ - uvc = _to_utf8_fold_flags( (const U8*) uc, foldbuf, &foldlen, flags); \ len = UTF8SKIP(uc); \ + uvc = _toFOLD_utf8_flags( (const U8*) uc, uc + len, foldbuf, &foldlen, \ + flags); \ skiplen = UVCHR_SKIP( uvc ); \ foldlen -= skiplen; \ uscan = foldbuf + skiplen; \ @@ -1674,7 +1683,7 @@ REXEC_FBC_SCAN( /* Loops while (s < strend) */ \ tmp = TEST_UV(tmp); \ LOAD_UTF8_CHARCLASS_ALNUM(); \ REXEC_FBC_UTF8_SCAN( /* advances s while s < strend */ \ - if (tmp == ! (TEST_UTF8((U8 *) s))) { \ + if (tmp == ! (TEST_UTF8((U8 *) s, (U8 *) reginfo->strend))) { \ tmp = !tmp; \ IF_SUCCESS; \ } \ @@ -1877,8 +1886,11 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, REXEC_FBC_UTF8_CLASS_SCAN( reginclass(prog, c, (U8*)s, (U8*) strend, utf8_target)); } + else if (ANYOF_FLAGS(c)) { + REXEC_FBC_CLASS_SCAN(reginclass(prog,c, (U8*)s, (U8*)s+1, 0)); + } else { - REXEC_FBC_CLASS_SCAN(REGINCLASS(prog, c, (U8*)s, 0)); + REXEC_FBC_CLASS_SCAN(ANYOF_BITMAP_TEST(c, *((U8*)s))); } break; @@ -1962,10 +1974,8 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, * trying that it will fail; so don't start a match past the * required minimum number from the far end */ e = HOP3c(strend, -((SSize_t)ln), s); - - if (reginfo->intuit && e < s) { - e = s; /* Due to minlen logic of intuit() */ - } + if (e < s) + break; c1 = *pat_string; c2 = fold_array[c1]; @@ -2009,10 +2019,6 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, */ e = HOP3c(strend, -((SSize_t)lnc), s); - if (reginfo->intuit && e < s) { - e = s; /* Due to minlen logic of intuit() */ - } - /* XXX Note that we could recalculate e to stop the loop earlier, * as the worst case expansion above will rarely be met, and as we * go along we would usually find that e moves further to the left. @@ -2043,7 +2049,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, goto do_boundu; } - FBC_BOUND(isWORDCHAR_LC, isWORDCHAR_LC_uvchr, isWORDCHAR_LC_utf8); + FBC_BOUND(isWORDCHAR_LC, isWORDCHAR_LC_uvchr, isWORDCHAR_LC_utf8_safe); break; case NBOUNDL: @@ -2056,14 +2062,14 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, goto do_nboundu; } - FBC_NBOUND(isWORDCHAR_LC, isWORDCHAR_LC_uvchr, isWORDCHAR_LC_utf8); + FBC_NBOUND(isWORDCHAR_LC, isWORDCHAR_LC_uvchr, isWORDCHAR_LC_utf8_safe); break; case BOUND: /* regcomp.c makes sure that this only has the traditional \b meaning */ assert(FLAGS(c) == TRADITIONAL_BOUND); - FBC_BOUND(isWORDCHAR, isWORDCHAR_uni, isWORDCHAR_utf8); + FBC_BOUND(isWORDCHAR, isWORDCHAR_uni, isWORDCHAR_utf8_safe); break; case BOUNDA: /* regcomp.c makes sure that this only has the traditional \b @@ -2077,7 +2083,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, meaning */ assert(FLAGS(c) == TRADITIONAL_BOUND); - FBC_NBOUND(isWORDCHAR, isWORDCHAR_uni, isWORDCHAR_utf8); + FBC_NBOUND(isWORDCHAR, isWORDCHAR_uni, isWORDCHAR_utf8_safe); break; case NBOUNDA: /* regcomp.c makes sure that this only has the traditional \b @@ -2089,7 +2095,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, case NBOUNDU: if ((bound_type) FLAGS(c) == TRADITIONAL_BOUND) { - FBC_NBOUND(isWORDCHAR_L1, isWORDCHAR_uni, isWORDCHAR_utf8); + FBC_NBOUND(isWORDCHAR_L1, isWORDCHAR_uni, isWORDCHAR_utf8_safe); break; } @@ -2102,7 +2108,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, do_boundu: switch((bound_type) FLAGS(c)) { case TRADITIONAL_BOUND: - FBC_BOUND(isWORDCHAR_L1, isWORDCHAR_uni, isWORDCHAR_utf8); + FBC_BOUND(isWORDCHAR_L1, isWORDCHAR_uni, isWORDCHAR_utf8_safe); break; case GCB_BOUND: if (s == reginfo->strbeg) { @@ -2380,7 +2386,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, if (utf8_target) { /* The complement of something that matches only ASCII matches all * non-ASCII, plus everything in ASCII that isn't in the class. */ - REXEC_FBC_UTF8_CLASS_SCAN(! isASCII_utf8(s) + REXEC_FBC_UTF8_CLASS_SCAN( ! isASCII_utf8_safe(s, strend) || ! _generic_isCC_A(*s, FLAGS(c))); break; } @@ -2422,7 +2428,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, if ((UTF8_IS_INVARIANT(*s) && to_complement ^ cBOOL(_generic_isCC((U8) *s, classnum))) - || (UTF8_IS_DOWNGRADEABLE_START(*s) + || ( UTF8_IS_NEXT_CHAR_DOWNGRADEABLE(s, strend) && to_complement ^ cBOOL( _generic_isCC(EIGHT_BIT_UTF8_TO_NATIVE(*s, *(s + 1)), @@ -2444,27 +2450,27 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, macros */ case _CC_ENUM_SPACE: REXEC_FBC_UTF8_CLASS_SCAN( - to_complement ^ cBOOL(isSPACE_utf8(s))); + to_complement ^ cBOOL(isSPACE_utf8_safe(s, strend))); break; case _CC_ENUM_BLANK: REXEC_FBC_UTF8_CLASS_SCAN( - to_complement ^ cBOOL(isBLANK_utf8(s))); + to_complement ^ cBOOL(isBLANK_utf8_safe(s, strend))); break; case _CC_ENUM_XDIGIT: REXEC_FBC_UTF8_CLASS_SCAN( - to_complement ^ cBOOL(isXDIGIT_utf8(s))); + to_complement ^ cBOOL(isXDIGIT_utf8_safe(s, strend))); break; case _CC_ENUM_VERTSPACE: REXEC_FBC_UTF8_CLASS_SCAN( - to_complement ^ cBOOL(isVERTWS_utf8(s))); + to_complement ^ cBOOL(isVERTWS_utf8_safe(s, strend))); break; case _CC_ENUM_CNTRL: REXEC_FBC_UTF8_CLASS_SCAN( - to_complement ^ cBOOL(isCNTRL_utf8(s))); + to_complement ^ cBOOL(isCNTRL_utf8_safe(s, strend))); break; default: @@ -2489,9 +2495,10 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, * FBC macro instead of being expanded out. Since we've loaded the * swash, we don't have to check for that each time through the loop */ REXEC_FBC_UTF8_CLASS_SCAN( - to_complement ^ cBOOL(_generic_utf8( + to_complement ^ cBOOL(_generic_utf8_safe( classnum, s, + strend, swash_fetch(PL_utf8_swash_ptrs[classnum], (U8 *) s, TRUE)))); break; @@ -2619,7 +2626,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, dump_exec_pos( (char *)uc, c, strend, real_start, s, utf8_target, 0); Perl_re_printf( aTHX_ - " Charid:%3u CP:%4"UVxf" ", + " Charid:%3u CP:%4" UVxf " ", charid, uvc); }); } @@ -2640,7 +2647,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, dump_exec_pos( (char *)uc, c, strend, real_start, s, utf8_target, 0 ); Perl_re_printf( aTHX_ - "%sState: %4"UVxf", word=%"UVxf, + "%sState: %4" UVxf ", word=%" UVxf, failed ? " Fail transition to " : "", (UV)state, (UV)word); }); @@ -2691,7 +2698,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, if (leftmost) { s = (char*)leftmost; DEBUG_TRIE_EXECUTE_r({ - Perl_re_printf( aTHX_ "Matches word #%"UVxf" at position %"IVdf". Trying full pattern...\n", + Perl_re_printf( aTHX_ "Matches word #%" UVxf " at position %" IVdf ". Trying full pattern...\n", (UV)accepted_word, (IV)(s - real_start) ); }); @@ -2937,7 +2944,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, : strbeg; /* pos() not defined; use start of string */ DEBUG_GPOS_r(Perl_re_printf( aTHX_ - "GPOS ganch set to strbeg[%"IVdf"]\n", (IV)(reginfo->ganch - strbeg))); + "GPOS ganch set to strbeg[%" IVdf "]\n", (IV)(reginfo->ganch - strbeg))); /* in the presence of \G, we may need to start looking earlier in * the string than the suggested start point of stringarg: @@ -3132,7 +3139,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, /* do we need a save destructor here for eval dies? */ Newxz(prog->offs, (prog->nparens + 1), regexp_paren_pair); DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" saving offs: orig=0x%"UVxf" new=0x%"UVxf"\n", + "rex=0x%" UVxf " saving offs: orig=0x%" UVxf " new=0x%" UVxf "\n", 0, PTR2UV(prog), PTR2UV(swap), @@ -3517,7 +3524,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, DEBUG_BUFFERS_r( if (swap) Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" freeing offs: 0x%"UVxf"\n", + "rex=0x%" UVxf " freeing offs: 0x%" UVxf "\n", 0, PTR2UV(prog), PTR2UV(swap) @@ -3555,7 +3562,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, if (swap) { /* we failed :-( roll it back */ DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" rolling back offs: freeing=0x%"UVxf" restoring=0x%"UVxf"\n", + "rex=0x%" UVxf " rolling back offs: freeing=0x%" UVxf " restoring=0x%" UVxf "\n", 0, PTR2UV(prog), PTR2UV(prog->offs), @@ -3615,6 +3622,14 @@ S_regtry(pTHX_ regmatch_info *reginfo, char **startposp) * above-mentioned test suite tests to succeed. The common theme * on those tests seems to be returning null fields from matches. * --jhi updated by dapm */ + + /* After encountering a variant of the issue mentioned above I think + * the point Ilya was making is that if we properly unwind whenever + * we set lastparen to a smaller value then we should not need to do + * this every time, only when needed. So if we have tests that fail if + * we remove this, then it suggests somewhere else we are improperly + * unwinding the lastparen/paren buffers. See UNWIND_PARENS() and + * places it is called, and related regcp() routines. - Yves */ #if 1 if (prog->nparens) { regexp_paren_pair *pp = prog->offs; @@ -3665,7 +3680,7 @@ Perl_re_exec_indentf(pTHX_ const char *fmt, U32 depth, ...) PerlIO *f= Perl_debug_log; PERL_ARGS_ASSERT_RE_EXEC_INDENTF; va_start(ap, depth); - PerlIO_printf(f, "%*s|%4"UVuf"| %*s", REPORT_CODE_OFF, "", (UV)depth, INDENT_CHARS(depth), "" ); + PerlIO_printf(f, "%*s|%4" UVuf "| %*s", REPORT_CODE_OFF, "", (UV)depth, INDENT_CHARS(depth), "" ); result = PerlIO_vprintf(f, fmt, ap); va_end(ap); return result; @@ -3683,9 +3698,6 @@ Perl_re_exec_indentf(pTHX_ const char *fmt, U32 depth, ...) STATIC regmatch_state * S_push_slab(pTHX) { -#if PERL_VERSION < 9 && !defined(PERL_CORE) - dMY_CXT; -#endif regmatch_slab *s = PL_regmatch_slab->next; if (!s) { Newx(s, 1, regmatch_slab); @@ -3952,7 +3964,7 @@ S_dump_exec_pos(pTHX_ const char *locinput, const STRLEN tlen=len0+len1+len2; Perl_re_printf( aTHX_ - "%4"IVdf" <%.*s%.*s%s%.*s>%*s|%4u| ", + "%4" IVdf " <%.*s%.*s%s%.*s>%*s|%4u| ", (IV)(locinput - loc_bostr), len0, s0, len1, s1, @@ -4120,10 +4132,11 @@ S_setup_EXACTISH_ST_c1_c2(pTHX_ const regnode * const text_node, int *c1p, } else { STRLEN len; - _to_utf8_fold_flags(s, - d, - &len, - FOLD_FLAGS_FULL | FOLD_FLAGS_LOCALE); + _toFOLD_utf8_flags(s, + pat_end, + d, + &len, + FOLD_FLAGS_FULL | FOLD_FLAGS_LOCALE); d += len; s += UTF8SKIP(s); } @@ -4168,7 +4181,7 @@ S_setup_EXACTISH_ST_c1_c2(pTHX_ const regnode * const text_node, int *c1p, } else { /* Does participate in folds */ AV* list = (AV*) *listp; - if (av_tindex_nomg(list) != 1) { + if (av_tindex_skip_len_mg(list) != 1) { /* If there aren't exactly two folds to this, it is * outside the scope of this function */ @@ -5317,10 +5330,6 @@ S_backup_one_WB(pTHX_ WB_enum * previous, const U8 * const strbeg, U8 ** curpos, STATIC SSize_t S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) { - -#if PERL_VERSION < 9 && !defined(PERL_CORE) - dMY_CXT; -#endif dVAR; const bool utf8_target = reginfo->is_utf8_target; const U32 uniflags = UTF8_ALLOW_DEFAULT; @@ -5334,12 +5343,13 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) regnode *next; U32 n = 0; /* general value; init to avoid compiler warning */ SSize_t ln = 0; /* len or last; init to avoid compiler warning */ + SSize_t endref = 0; /* offset of end of backref when ln is start */ char *locinput = startpos; char *pushinput; /* where to continue after a PUSH */ I32 nextchr; /* is always set to UCHARAT(locinput), or -1 at EOS */ bool result = 0; /* return value of S_regmatch */ - int depth = 0; /* depth of backtrack stack */ + U32 depth = 0; /* depth of backtrack stack */ U32 nochange_depth = 0; /* depth of GOSUB recursion with nochange */ const U32 max_nochange_depth = (3 * rex->nparens > MAX_RECURSE_EVAL_NOCHANGE_DEPTH) ? @@ -5381,12 +5391,12 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) U8 gimme = G_SCALAR; CV *caller_cv = NULL; /* who called us */ CV *last_pushed_cv = NULL; /* most recently called (?{}) CV */ - CHECKPOINT runops_cp; /* savestack position before executing EVAL */ U32 maxopenparen = 0; /* max '(' index seen so far */ int to_complement; /* Invert the result? */ _char_class_number classnum; bool is_utf8_pat = reginfo->is_utf8_pat; bool match = FALSE; + I32 orig_savestack_ix = PL_savestack_ix; /* Solaris Studio 12.3 messes up fetching PL_charclass['\n'] */ #if (defined(__SUNPRO_C) && (__SUNPRO_C == 0x5120) && defined(__x86_64) && defined(USE_64_BIT_ALL)) @@ -5436,7 +5446,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) DUMP_EXEC_POS( locinput, scan, utf8_target, depth ); regprop(rex, prop, scan, reginfo, NULL); Perl_re_printf( aTHX_ - "%*s%"IVdf":%s(%"IVdf")\n", + "%*s%" IVdf ":%s(%" IVdf ")\n", INDENT_CHARS(depth), "", (IV)(scan - rexi->program), SvPVX_const(prop), @@ -5660,8 +5670,8 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) DEBUG_TRIE_EXECUTE_r({ DUMP_EXEC_POS( (char *)uc, scan, utf8_target, depth ); /* HERE */ - PerlIO_printf( aTHX_ Perl_debug_log, - "%*s%sState: %4"UVxf" Accepted: %c ", + PerlIO_printf( Perl_debug_log, + "%*s%sState: %4" UVxf " Accepted: %c ", INDENT_CHARS(depth), "", PL_colors[4], (UV)state, (accepted ? 'Y' : 'N')); }); @@ -5695,7 +5705,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) } DEBUG_TRIE_EXECUTE_r( Perl_re_printf( aTHX_ - "Charid:%3x CP:%4"UVxf" After State: %4"UVxf"%s\n", + "Charid:%3x CP:%4" UVxf " After State: %4" UVxf "%s\n", charid, uvc, (UV)state, PL_colors[5] ); ); } @@ -5714,7 +5724,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) } DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "%sgot %"IVdf" possible matches%s\n", + Perl_re_exec_indentf( aTHX_ "%sgot %" IVdf " possible matches%s\n", depth, PL_colors[4], (IV)ST.accepted, PL_colors[5] ); ); @@ -5726,6 +5736,11 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) { U8 *uc; if ( ST.jump ) { + /* undo any captures done in the tail part of a branch, + * e.g. + * /(?:X(.)(.)|Y(.)).../ + * where the trie just matches X then calls out to do the + * rest of the branch */ REGCP_UNWIND(ST.cp); UNWIND_PAREN(ST.lastparen, ST.lastcloseparen); } @@ -6059,12 +6074,14 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) if (locinput == reginfo->strbeg) b1 = isWORDCHAR_LC('\n'); else { - b1 = isWORDCHAR_LC_utf8(reghop3((U8*)locinput, -1, - (U8*)(reginfo->strbeg))); + b1 = isWORDCHAR_LC_utf8_safe(reghop3((U8*)locinput, -1, + (U8*)(reginfo->strbeg)), + (U8*)(reginfo->strend)); } b2 = (NEXTCHR_IS_EOS) ? isWORDCHAR_LC('\n') - : isWORDCHAR_LC_utf8((U8*)locinput); + : isWORDCHAR_LC_utf8_safe((U8*) locinput, + (U8*) reginfo->strend); } else { /* Here the string isn't utf8 */ b1 = (locinput == reginfo->strbeg) @@ -6138,11 +6155,15 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) bool b1, b2; b1 = (locinput == reginfo->strbeg) ? 0 /* isWORDCHAR_L1('\n') */ - : isWORDCHAR_utf8(reghop3((U8*)locinput, -1, - (U8*)(reginfo->strbeg))); + : isWORDCHAR_utf8_safe( + reghop3((U8*)locinput, + -1, + (U8*)(reginfo->strbeg)), + (U8*) reginfo->strend); b2 = (NEXTCHR_IS_EOS) ? 0 /* isWORDCHAR_L1('\n') */ - : isWORDCHAR_utf8((U8*)locinput); + : isWORDCHAR_utf8_safe((U8*)locinput, + (U8*) reginfo->strend); match = cBOOL(b1 != b2); break; } @@ -6358,8 +6379,10 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) break; } - if (! UTF8_IS_DOWNGRADEABLE_START(nextchr)) { /* An above Latin-1 code point */ - _CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(locinput, reginfo->strend); + if (! UTF8_IS_NEXT_CHAR_DOWNGRADEABLE(locinput, reginfo->strend)) { + /* An above Latin-1 code point, or malformed */ + _CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(locinput, + reginfo->strend); goto utf8_posix_above_latin1; } @@ -6443,7 +6466,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) } locinput++; } - else if (UTF8_IS_DOWNGRADEABLE_START(nextchr)) { + else if (UTF8_IS_NEXT_CHAR_DOWNGRADEABLE(locinput, reginfo->strend)) { if (! (to_complement ^ cBOOL(_generic_isCC(EIGHT_BIT_UTF8_TO_NATIVE(nextchr, *(locinput + 1)), @@ -6656,10 +6679,11 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) do_nref_ref_common: ln = rex->offs[n].start; + endref = rex->offs[n].end; reginfo->poscache_iter = reginfo->poscache_maxiter; /* Void cache */ - if (rex->lastparen < n || ln == -1) + if (rex->lastparen < n || ln == -1 || endref == -1) sayNO; /* Do not match unless seen CLOSEn. */ - if (ln == rex->offs[n].end) + if (ln == endref) break; s = reginfo->strbeg + ln; @@ -6673,7 +6697,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) * not going off the end given by reginfo->strend, and * returns in upon success, how much of the * current input was matched */ - if (! foldEQ_utf8_flags(s, NULL, rex->offs[n].end - ln, utf8_target, + if (! foldEQ_utf8_flags(s, NULL, endref - ln, utf8_target, locinput, &limit, 0, utf8_target, utf8_fold_flags)) { sayNO; @@ -6688,7 +6712,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) (type == REF || UCHARAT(s) != fold_array[nextchr])) sayNO; - ln = rex->offs[n].end - ln; + ln = endref - ln; if (locinput + ln > reginfo->strend) sayNO; if (ln > 1 && (type == REF @@ -6760,14 +6784,14 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) } /* Save all the positions seen so far. */ - ST.cp = S_regcppush(aTHX_ rex, 0, maxopenparen, depth); + ST.cp = regcppush(rex, 0, maxopenparen); REGCP_SET(ST.lastcp); /* and then jump to the code we share with EVAL */ goto eval_recurse_doit; /* NOTREACHED */ - case EVAL: /* /(?{A})B/ /(??{A})B/ and /(?(?{A})X|Y)B/ */ + case EVAL: /* /(?{...})B/ /(??{A})B/ and /(?(?{...})X|Y)B/ */ if (cur_eval && cur_eval->locinput==locinput) { if ( ++nochange_depth > max_nochange_depth ) Perl_croak(aTHX_ "EVAL without pos change exceeded limit in regex"); @@ -6785,8 +6809,8 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) CV *newcv; /* save *all* paren positions */ - S_regcppush(aTHX_ rex, 0, maxopenparen, depth); - REGCP_SET(runops_cp); + regcppush(rex, 0, maxopenparen); + REGCP_SET(ST.lastcp); if (!caller_cv) caller_cv = find_runcv(NULL); @@ -6811,30 +6835,67 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) nop = (OP*)rexi->data->data[n]; } - /* normally if we're about to execute code from the same - * CV that we used previously, we just use the existing - * CX stack entry. However, its possible that in the - * meantime we may have backtracked, popped from the save - * stack, and undone the SAVECOMPPAD(s) associated with - * PUSH_MULTICALL; in which case PL_comppad no longer - * points to newcv's pad. */ + /* Some notes about MULTICALL and the context and save stacks. + * + * In something like + * /...(?{ my $x)}...(?{ my $y)}...(?{ my $z)}.../ + * since codeblocks don't introduce a new scope (so that + * local() etc accumulate), at the end of a successful + * match there will be a SAVEt_CLEARSV on the savestack + * for each of $x, $y, $z. If the three code blocks above + * happen to have come from different CVs (e.g. via + * embedded qr//s), then we must ensure that during any + * savestack unwinding, PL_comppad always points to the + * right pad at each moment. We achieve this by + * interleaving SAVEt_COMPPAD's on the savestack whenever + * there is a change of pad. + * In theory whenever we call a code block, we should + * push a CXt_SUB context, then pop it on return from + * that code block. This causes a bit of an issue in that + * normally popping a context also clears the savestack + * back to cx->blk_oldsaveix, but here we specifically + * don't want to clear the save stack on exit from the + * code block. + * Also for efficiency we don't want to keep pushing and + * popping the single SUB context as we backtrack etc. + * So instead, we push a single context the first time + * we need, it, then hang onto it until the end of this + * function. Whenever we encounter a new code block, we + * update the CV etc if that's changed. During the times + * in this function where we're not executing a code + * block, having the SUB context still there is a bit + * naughty - but we hope that no-one notices. + * When the SUB context is initially pushed, we fake up + * cx->blk_oldsaveix to be as if we'd pushed this context + * on first entry to S_regmatch rather than at some random + * point during the regexe execution. That way if we + * croak, popping the context stack will ensure that + * *everything* SAVEd by this function is undone and then + * the context popped, rather than e.g., popping the + * context (and restoring the original PL_comppad) then + * popping more of the savestack and restoring a bad + * PL_comppad. + */ + + /* If this is the first EVAL, push a MULTICALL. On + * subsequent calls, if we're executing a different CV, or + * if PL_comppad has got messed up from backtracking + * through SAVECOMPPADs, then refresh the context. + */ if (newcv != last_pushed_cv || PL_comppad != last_pad) { U8 flags = (CXp_SUB_RE | ((newcv == caller_cv) ? CXp_SUB_RE_FAKE : 0)); + SAVECOMPPAD(); if (last_pushed_cv) { - /* PUSH/POP_MULTICALL save and restore the - * caller's PL_comppad; if we call multiple subs - * using the same CX block, we have to save and - * unwind the varying PL_comppad's ourselves, - * especially restoring the right PL_comppad on - * backtrack - so save it on the save stack */ - SAVECOMPPAD(); CHANGE_MULTICALL_FLAGS(newcv, flags); } else { PUSH_MULTICALL_FLAGS(newcv, flags); } + /* see notes above */ + CX_CUR()->blk_oldsaveix = orig_savestack_ix; + last_pushed_cv = newcv; } else { @@ -6877,7 +6938,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) nop = nop->op_next; DEBUG_STATE_r( Perl_re_printf( aTHX_ - " re EVAL PL_op=0x%"UVxf"\n", PTR2UV(nop)) ); + " re EVAL PL_op=0x%" UVxf "\n", PTR2UV(nop)) ); rex->offs[0].end = locinput - reginfo->strbeg; if (reginfo->info_aux_eval->pos_magic) @@ -6951,11 +7012,14 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) * in the regexp code uses the pad ! */ PL_op = oop; PL_curcop = ocurcop; - S_regcp_restore(aTHX_ rex, runops_cp, &maxopenparen, depth); - PL_curpm = PL_reg_curpm; + regcp_restore(rex, ST.lastcp, &maxopenparen); + PL_curpm_under = PL_curpm; + PL_curpm = PL_reg_curpm; - if (logical != 2) - break; + if (logical != 2) { + PUSH_STATE_GOTO(EVAL_B, next, locinput); + /* NOTREACHED */ + } } /* only /(??{})/ from now on */ @@ -7019,7 +7083,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) * close_paren only for GOSUB */ ST.prev_recurse_locinput= NULL; /* only used for GOSUB */ /* Save all the seen positions so far. */ - ST.cp = S_regcppush(aTHX_ rex, 0, maxopenparen, depth); + ST.cp = regcppush(rex, 0, maxopenparen); REGCP_SET(ST.lastcp); /* and set maxopenparen to 0, since we are starting a "fresh" match */ maxopenparen = 0; @@ -7053,11 +7117,11 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) ST.prev_eval = cur_eval; cur_eval = st; /* now continue from first node in postoned RE */ - PUSH_YES_STATE_GOTO(EVAL_AB, startpoint, locinput); + PUSH_YES_STATE_GOTO(EVAL_postponed_AB, startpoint, locinput); NOT_REACHED; /* NOTREACHED */ } - case EVAL_AB: /* cleanup after a successful (??{A})B */ + case EVAL_postponed_AB: /* cleanup after a successful (??{A})B */ /* note: this is called twice; first after popping B, then A */ DEBUG_STACK_r({ Perl_re_exec_indentf( aTHX_ "EVAL_AB cur_eval=%p prev_eval=%p\n", @@ -7103,7 +7167,11 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) sayYES; - case EVAL_AB_fail: /* unsuccessfully ran A or B in (??{A})B */ + case EVAL_B_fail: /* unsuccessful B in (?{...})B */ + REGCP_UNWIND(ST.lastcp); + sayNO; + + case EVAL_postponed_AB_fail: /* unsuccessfully ran A or B in (??{A})B */ /* note: this is called twice; first after popping B, then A */ DEBUG_STACK_r({ Perl_re_exec_indentf( aTHX_ "EVAL_AB_fail cur_eval=%p prev_eval=%p\n", @@ -7119,7 +7187,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) rexi = RXi_GET(rex); REGCP_UNWIND(ST.lastcp); - S_regcppop(aTHX_ rex, &maxopenparen, depth); + regcppop(rex, &maxopenparen); cur_eval = ST.prev_eval; cur_curlyx = ST.prev_curlyx; @@ -7138,7 +7206,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) if (n > maxopenparen) maxopenparen = n; DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ - "rex=0x%"UVxf" offs=0x%"UVxf": \\%"UVuf": set %"IVdf" tmp; maxopenparen=%"UVuf"\n", + "rex=0x%" UVxf " offs=0x%" UVxf ": \\%" UVuf ": set %" IVdf " tmp; maxopenparen=%" UVuf "\n", depth, PTR2UV(rex), PTR2UV(rex->offs), @@ -7154,7 +7222,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) rex->offs[n].start = rex->offs[n].start_tmp; \ rex->offs[n].end = locinput - reginfo->strbeg; \ DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ \ - "rex=0x%"UVxf" offs=0x%"UVxf": \\%"UVuf": set %"IVdf"..%"IVdf"\n", \ + "rex=0x%" UVxf " offs=0x%" UVxf ": \\%" UVuf ": set %" IVdf "..%" IVdf "\n", \ depth, \ PTR2UV(rex), \ PTR2UV(rex->offs), \ @@ -7392,8 +7460,7 @@ NULL /* First just match a string of min A's. */ if (n < min) { - ST.cp = S_regcppush(aTHX_ rex, cur_curlyx->u.curlyx.parenfloor, - maxopenparen, depth); + ST.cp = regcppush(rex, cur_curlyx->u.curlyx.parenfloor, maxopenparen); cur_curlyx->u.curlyx.lastloc = locinput; REGCP_SET(ST.lastcp); @@ -7491,6 +7558,7 @@ NULL DEBUG_EXECUTE_r( Perl_re_exec_indentf( aTHX_ "whilem: (cache) already tried at this position...\n", depth) ); + cur_curlyx->u.curlyx.count--; sayNO; /* cache records failure */ } ST.cache_offset = offset; @@ -7503,9 +7571,6 @@ NULL if (cur_curlyx->u.curlyx.minmod) { ST.save_curlyx = cur_curlyx; cur_curlyx = cur_curlyx->u.curlyx.prev_curlyx; - ST.cp = S_regcppush(aTHX_ rex, ST.save_curlyx->u.curlyx.parenfloor, - maxopenparen, depth); - REGCP_SET(ST.lastcp); PUSH_YES_STATE_GOTO(WHILEM_B_min, ST.save_curlyx->u.curlyx.B, locinput); NOT_REACHED; /* NOTREACHED */ @@ -7514,8 +7579,8 @@ NULL /* Prefer A over B for maximal matching. */ if (n < max) { /* More greed allowed? */ - ST.cp = S_regcppush(aTHX_ rex, cur_curlyx->u.curlyx.parenfloor, - maxopenparen, depth); + ST.cp = regcppush(rex, cur_curlyx->u.curlyx.parenfloor, + maxopenparen); cur_curlyx->u.curlyx.lastloc = locinput; REGCP_SET(ST.lastcp); PUSH_STATE_GOTO(WHILEM_A_max, A, locinput); @@ -7538,11 +7603,11 @@ NULL CACHEsayNO; NOT_REACHED; /* NOTREACHED */ - case WHILEM_A_min_fail: /* just failed to match A in a minimal match */ - /* FALLTHROUGH */ case WHILEM_A_pre_fail: /* just failed to match even minimal A */ REGCP_UNWIND(ST.lastcp); - S_regcppop(aTHX_ rex, &maxopenparen, depth); + regcppop(rex, &maxopenparen); + /* FALLTHROUGH */ + case WHILEM_A_min_fail: /* just failed to match A in a minimal match */ cur_curlyx->u.curlyx.lastloc = ST.save_lastloc; cur_curlyx->u.curlyx.count--; CACHEsayNO; @@ -7550,7 +7615,7 @@ NULL case WHILEM_A_max_fail: /* just failed to match A in a maximal match */ REGCP_UNWIND(ST.lastcp); - S_regcppop(aTHX_ rex, &maxopenparen, depth); /* Restore some previous $s? */ + regcppop(rex, &maxopenparen); /* Restore some previous $s? */ DEBUG_EXECUTE_r(Perl_re_exec_indentf( aTHX_ "whilem: failed, trying continuation...\n", depth) ); @@ -7575,8 +7640,6 @@ NULL case WHILEM_B_min_fail: /* just failed to match B in a minimal match */ cur_curlyx = ST.save_curlyx; - REGCP_UNWIND(ST.lastcp); - S_regcppop(aTHX_ rex, &maxopenparen, depth); if (cur_curlyx->u.curlyx.count >= /*max*/ARG2(cur_curlyx->u.curlyx.me)) { /* Maximum greed exceeded */ @@ -7598,9 +7661,6 @@ NULL ); /* Try grabbing another A and see if it helps. */ cur_curlyx->u.curlyx.lastloc = locinput; - ST.cp = S_regcppush(aTHX_ rex, cur_curlyx->u.curlyx.parenfloor, - maxopenparen, depth); - REGCP_SET(ST.lastcp); PUSH_STATE_GOTO(WHILEM_A_min, /*A*/ NEXTOPER(ST.save_curlyx->u.curlyx.me) + EXTRA_STEP_2ARGS, locinput); @@ -7733,7 +7793,7 @@ NULL ST.count = ST.minmod ? ARG1(ST.me) : ARG2(ST.me); } DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "CURLYM now matched %"IVdf" times, len=%"IVdf"...\n", + Perl_re_exec_indentf( aTHX_ "CURLYM now matched %" IVdf " times, len=%" IVdf "...\n", depth, (IV) ST.count, (IV)ST.alen) ); @@ -7786,7 +7846,7 @@ NULL } DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "CURLYM trying tail with matches=%"IVdf"...\n", + Perl_re_exec_indentf( aTHX_ "CURLYM trying tail with matches=%" IVdf "...\n", depth, (IV)ST.count) ); if (! NEXTCHR_IS_EOS && ST.c1 != CHRTEST_VOID) { @@ -7796,7 +7856,7 @@ NULL { /* simulate B failing */ DEBUG_OPTIMISE_r( - Perl_re_exec_indentf( aTHX_ "CURLYM Fast bail next target=0x%"UVXf" c1=0x%"UVXf" c2=0x%"UVXf"\n", + Perl_re_exec_indentf( aTHX_ "CURLYM Fast bail next target=0x%" UVXf " c1=0x%" UVXf " c2=0x%" UVXf "\n", depth, valid_utf8_to_uvchr((U8 *) locinput, NULL), valid_utf8_to_uvchr(ST.c1_utf8, NULL), @@ -7964,7 +8024,7 @@ NULL char *li = locinput; minmod = 0; if (ST.min && - regrepeat(rex, &li, ST.A, reginfo, ST.min, depth) + regrepeat(rex, &li, ST.A, reginfo, ST.min) < ST.min) sayNO; SET_locinput(li); @@ -8001,7 +8061,7 @@ NULL /* avoid taking address of locinput, so it can remain * a register var */ char *li = locinput; - ST.count = regrepeat(rex, &li, ST.A, reginfo, ST.max, depth); + ST.count = regrepeat(rex, &li, ST.A, reginfo, ST.max); if (ST.count < ST.min) sayNO; SET_locinput(li); @@ -8084,7 +8144,7 @@ NULL * locinput matches */ char *li = ST.oldloc; ST.count += n; - if (regrepeat(rex, &li, ST.A, reginfo, n, depth) < n) + if (regrepeat(rex, &li, ST.A, reginfo, n) < n) sayNO; assert(n == REG_INFTY || locinput == li); } @@ -8105,7 +8165,7 @@ NULL /* failed -- move forward one */ { char *li = locinput; - if (!regrepeat(rex, &li, ST.A, reginfo, 1, depth)) { + if (!regrepeat(rex, &li, ST.A, reginfo, 1)) { sayNO; } locinput = li; @@ -8179,7 +8239,7 @@ NULL st->u.eval.prev_rex = rex_sv; /* inner */ /* Save *all* the positions. */ - st->u.eval.cp = S_regcppush(aTHX_ rex, 0, maxopenparen, depth); + st->u.eval.cp = regcppush(rex, 0, maxopenparen); rex_sv = CUR_EVAL.prev_rex; is_utf8_pat = reginfo->is_utf8_pat = cBOOL(RX_UTF8(rex_sv)); SET_reg_curpm(rex_sv); @@ -8193,8 +8253,7 @@ NULL /* Restore parens of the outer rex without popping the * savestack */ - S_regcp_restore(aTHX_ rex, CUR_EVAL.lastcp, - &maxopenparen, depth); + regcp_restore(rex, CUR_EVAL.lastcp, &maxopenparen); st->u.eval.prev_eval = cur_eval; cur_eval = CUR_EVAL.prev_eval; @@ -8206,7 +8265,7 @@ NULL SET_RECURSE_LOCINPUT("FAKE-END[after]", cur_eval->locinput); - PUSH_YES_STATE_GOTO(EVAL_AB, st->u.eval.prev_eval->u.eval.B, + PUSH_YES_STATE_GOTO(EVAL_postponed_AB, st->u.eval.prev_eval->u.eval.B, locinput); /* match B */ } @@ -8359,7 +8418,7 @@ NULL sv_commit = ST.mark_name; DEBUG_EXECUTE_r({ - Perl_re_exec_indentf( aTHX_ "%ssetting cutpoint to mark:%"SVf"...%s\n", + Perl_re_exec_indentf( aTHX_ "%ssetting cutpoint to mark:%" SVf "...%s\n", depth, PL_colors[4], SVfARG(sv_commit), PL_colors[5]); }); @@ -8424,7 +8483,7 @@ NULL break; default: - PerlIO_printf(Perl_error_log, "%"UVxf" %d\n", + PerlIO_printf(Perl_error_log, "%" UVxf " %d\n", PTR2UV(scan), OP(scan)); Perl_croak(aTHX_ "regexp memory corruption"); @@ -8434,7 +8493,8 @@ NULL assert(!NEXTCHR_IS_EOS); if (utf8_target) { locinput += PL_utf8skip[nextchr]; - /* locinput is allowed to go 1 char off the end, but not 2+ */ + /* locinput is allowed to go 1 char off the end (signifying + * EOS), but not 2+ */ if (locinput > reginfo->strend) sayNO; } @@ -8462,16 +8522,17 @@ NULL DEBUG_STACK_r({ regmatch_state *cur = st; regmatch_state *curyes = yes_state; - int curd = depth; + U32 i; regmatch_slab *slab = PL_regmatch_slab; - for (;curd > -1 && (depth-curd < 3);cur--,curd--) { + for (i = 0; i < 3 && i <= depth; cur--,i++) { if (cur < SLAB_FIRST(slab)) { slab = slab->prev; cur = SLAB_LAST(slab); } - Perl_re_exec_indentf( aTHX_ "#%-3d %-10s %s\n", + Perl_re_exec_indentf( aTHX_ "%4s #%-3d %-10s %s\n", depth, - curd, PL_reg_name[cur->resume_state], + i ? " " : "push", + depth - i, PL_reg_name[cur->resume_state], (curyes == cur) ? "yes" : "" ); if (curyes == cur) @@ -8623,9 +8684,12 @@ NULL if (last_pushed_cv) { dSP; + /* see "Some notes about MULTICALL" above */ POP_MULTICALL; PERL_UNUSED_VAR(SP); } + else + LEAVE_SCOPE(orig_savestack_ix); assert(!result || locinput - reginfo->strbeg >= 0); return result ? locinput - reginfo->strbeg : -1; @@ -8647,7 +8711,7 @@ NULL */ STATIC I32 S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, - regmatch_info *const reginfo, I32 max, int depth) + regmatch_info *const reginfo, I32 max _pDEPTH) { char *scan; /* Pointer to current position in target string */ I32 c; @@ -8657,9 +8721,6 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, unsigned int to_complement = 0; /* Invert the result? */ UV utf8_flags; _char_class_number classnum; -#ifndef DEBUGGING - PERL_UNUSED_ARG(depth); -#endif PERL_ARGS_ASSERT_REGREPEAT; @@ -8890,8 +8951,14 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, scan += UTF8SKIP(scan); hardcount++; } - } else { - while (scan < loceol && REGINCLASS(prog, p, (U8*)scan, 0)) + } + else if (ANYOF_FLAGS(p)) { + while (scan < loceol + && reginclass(prog, p, (U8*)scan, (U8*)scan+1, 0)) + scan++; + } + else { + while (scan < loceol && ANYOF_BITMAP_TEST(p, *((U8*)scan))) scan++; } break; @@ -8958,7 +9025,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, /* The complement of something that matches only ASCII matches all * non-ASCII, plus everything in ASCII that isn't in the class. */ while (hardcount < max && scan < loceol - && (! isASCII_utf8(scan) + && ( ! isASCII_utf8_safe(scan, reginfo->strend) || ! _generic_isCC_A((U8) *scan, FLAGS(p)))) { scan += UTF8SKIP(scan); @@ -9026,7 +9093,8 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, case _CC_ENUM_SPACE: while (hardcount < max && scan < loceol - && (to_complement ^ cBOOL(isSPACE_utf8(scan)))) + && (to_complement + ^ cBOOL(isSPACE_utf8_safe(scan, loceol)))) { scan += UTF8SKIP(scan); hardcount++; @@ -9035,7 +9103,8 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, case _CC_ENUM_BLANK: while (hardcount < max && scan < loceol - && (to_complement ^ cBOOL(isBLANK_utf8(scan)))) + && (to_complement + ^ cBOOL(isBLANK_utf8_safe(scan, loceol)))) { scan += UTF8SKIP(scan); hardcount++; @@ -9044,7 +9113,8 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, case _CC_ENUM_XDIGIT: while (hardcount < max && scan < loceol - && (to_complement ^ cBOOL(isXDIGIT_utf8(scan)))) + && (to_complement + ^ cBOOL(isXDIGIT_utf8_safe(scan, loceol)))) { scan += UTF8SKIP(scan); hardcount++; @@ -9053,7 +9123,8 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, case _CC_ENUM_VERTSPACE: while (hardcount < max && scan < loceol - && (to_complement ^ cBOOL(isVERTWS_utf8(scan)))) + && (to_complement + ^ cBOOL(isVERTWS_utf8_safe(scan, loceol)))) { scan += UTF8SKIP(scan); hardcount++; @@ -9062,7 +9133,8 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, case _CC_ENUM_CNTRL: while (hardcount < max && scan < loceol - && (to_complement ^ cBOOL(isCNTRL_utf8(scan)))) + && (to_complement + ^ cBOOL(isCNTRL_utf8_safe(scan, loceol)))) { scan += UTF8SKIP(scan); hardcount++; @@ -9088,9 +9160,10 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, } while (hardcount < max && scan < loceol - && to_complement ^ cBOOL(_generic_utf8( + && to_complement ^ cBOOL(_generic_utf8_safe( classnum, scan, + loceol, swash_fetch(PL_utf8_swash_ptrs[classnum], (U8 *) scan, TRUE)))) @@ -9155,7 +9228,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, DEBUG_EXECUTE_r({ SV * const prop = sv_newmortal(); regprop(prog, prop, p, reginfo, NULL); - Perl_re_exec_indentf( aTHX_ "%s can match %"IVdf" times out of %"IVdf"...\n", + Perl_re_exec_indentf( aTHX_ "%s can match %" IVdf " times out of %" IVdf "...\n", depth, SvPVX_const(prop),(IV)c,(IV)max); }); }); @@ -9214,13 +9287,14 @@ S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8* const * UTF8_IS_INVARIANT() works even if not in UTF-8 */ if (! UTF8_IS_INVARIANT(c) && utf8_target) { STRLEN c_len = 0; - c = utf8n_to_uvchr(p, p_end - p, &c_len, - (UTF8_ALLOW_DEFAULT & UTF8_ALLOW_ANYUV) - | UTF8_ALLOW_FFFF | UTF8_CHECK_ONLY); - /* see [perl #37836] for UTF8_ALLOW_ANYUV; [perl #38293] for - * UTF8_ALLOW_FFFF */ - if (c_len == (STRLEN)-1) - Perl_croak(aTHX_ "Malformed UTF-8 character (fatal)"); + const U32 utf8n_flags = UTF8_ALLOW_DEFAULT; + c = utf8n_to_uvchr(p, p_end - p, &c_len, utf8n_flags | UTF8_CHECK_ONLY); + if (c_len == (STRLEN)-1) { + _force_out_malformed_utf8_message(p, p_end, + utf8n_flags, + 1 /* 1 means die */ ); + NOT_REACHED; /* NOTREACHED */ + } if (c > 255 && OP(n) == ANYOFL && ! ANYOFL_UTF8_LOCALE_REQD(flags)) { _CHECK_AND_OUTPUT_WIDE_LOCALE_CP_MSG(c); } @@ -9357,7 +9431,7 @@ S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8* const && ckWARN_d(WARN_NON_UNICODE)) { Perl_warner(aTHX_ packWARN(WARN_NON_UNICODE), - "Matched non-Unicode code point 0x%04"UVXf" against Unicode property; may not be portable", c); + "Matched non-Unicode code point 0x%04" UVXf " against Unicode property; may not be portable", c); } } @@ -9526,6 +9600,7 @@ S_setup_eval_state(pTHX_ regmatch_info *const reginfo) } SET_reg_curpm(reginfo->prog); eval_state->curpm = PL_curpm; + PL_curpm_under = PL_curpm; PL_curpm = PL_reg_curpm; if (RXp_MATCH_COPIED(rex)) { /* Here is a serious problem: we cannot rewrite subbeg, @@ -9674,6 +9749,64 @@ S_to_byte_substr(pTHX_ regexp *prog) return TRUE; } +bool +Perl__is_grapheme(pTHX_ const U8 * strbeg, const U8 * s, const U8 * strend, const UV cp) +{ + /* Temporary helper function for toke.c. Verify that the code point 'cp' + * is a stand-alone grapheme. The UTF-8 for 'cp' begins at position 's' in + * the larger string bounded by 'strbeg' and 'strend'. + * + * 'cp' needs to be assigned (if not a future version of the Unicode + * Standard could make it something that combines with adjacent characters, + * so code using it would then break), and there has to be a GCB break + * before and after the character. */ + + GCB_enum cp_gcb_val, prev_cp_gcb_val, next_cp_gcb_val; + const U8 * prev_cp_start; + + PERL_ARGS_ASSERT__IS_GRAPHEME; + + /* Unassigned code points are forbidden */ + if (UNLIKELY(! ELEMENT_RANGE_MATCHES_INVLIST( + _invlist_search(PL_Assigned_invlist, cp)))) + { + return FALSE; + } + + cp_gcb_val = getGCB_VAL_CP(cp); + + /* Find the GCB value of the previous code point in the input */ + prev_cp_start = utf8_hop_back(s, -1, strbeg); + if (UNLIKELY(prev_cp_start == s)) { + prev_cp_gcb_val = GCB_EDGE; + } + else { + prev_cp_gcb_val = getGCB_VAL_UTF8(prev_cp_start, strend); + } + + /* And check that is a grapheme boundary */ + if (! isGCB(prev_cp_gcb_val, cp_gcb_val, strbeg, s, + TRUE /* is UTF-8 encoded */ )) + { + return FALSE; + } + + /* Similarly verify there is a break between the current character and the + * following one */ + s += UTF8SKIP(s); + if (s >= strend) { + next_cp_gcb_val = GCB_EDGE; + } + else { + next_cp_gcb_val = getGCB_VAL_UTF8(s, strend); + } + + return isGCB(cp_gcb_val, next_cp_gcb_val, strbeg, s, TRUE); +} + + + + /* * ex: set ts=8 sts=4 sw=4 et: */