X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/451c6e0b1522c6ac8f890794e0432c7f5e8d1013..70ef9fe763912a6980805d072d9caa3f1e6b9421:/regexec.c diff --git a/regexec.c b/regexec.c index af15e3d..82128a7 100644 --- a/regexec.c +++ b/regexec.c @@ -96,9 +96,9 @@ static const char* const non_utf8_target_but_utf8_required = "Can't match, because target string needs to be in UTF-8\n"; #endif -#define NON_UTF8_TARGET_BUT_UTF8_REQUIRED(target) STMT_START { \ - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "%s", non_utf8_target_but_utf8_required));\ - goto target; \ +#define NON_UTF8_TARGET_BUT_UTF8_REQUIRED(target) STMT_START { \ + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "%s", non_utf8_target_but_utf8_required));\ + goto target; \ } STMT_END #define HAS_NONLATIN1_FOLD_CLOSURE(i) _HAS_NONLATIN1_FOLD_CLOSURE_ONLY_FOR_USE_BY_REGCOMP_DOT_C_AND_REGEXEC_DOT_C(i) @@ -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 \ @@ -129,7 +128,7 @@ static const char* const non_utf8_target_but_utf8_required #define HOPBACKc(pos, off) \ (char*)(reginfo->is_utf8_target \ - ? reghopmaybe3((U8*)pos, -off, (U8*)(reginfo->strbeg)) \ + ? reghopmaybe3((U8*)pos, (SSize_t)0-off, (U8*)(reginfo->strbeg)) \ : (pos - off >= reginfo->strbeg) \ ? (U8*)pos - off \ : NULL) @@ -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)) \ @@ -213,7 +213,8 @@ static const char* const non_utf8_target_but_utf8_required */ #define JUMPABLE(rn) ( \ OP(rn) == OPEN || \ - (OP(rn) == CLOSE && (!cur_eval || cur_eval->u.eval.close_paren != ARG(rn))) || \ + (OP(rn) == CLOSE && \ + !EVAL_CLOSE_PAREN_IS(cur_eval,ARG(rn)) ) || \ OP(rn) == EVAL || \ OP(rn) == SUSPEND || OP(rn) == IFMATCH || \ OP(rn) == PLUS || OP(rn) == MINMOD || \ @@ -271,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) +S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen _pDEPTH) { const int retval = PL_savestack_ix; const int paren_elems_to_push = @@ -289,7 +290,7 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen) (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, @@ -299,9 +300,10 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen) DEBUG_BUFFERS_r( if ((int)maxopenparen > (int)parenfloor) - PerlIO_printf(Perl_debug_log, - "rex=0x%"UVxf" offs=0x%"UVxf": saving capture indices:\n", - PTR2UV(rex), + Perl_re_exec_indentf( aTHX_ + "rex=0x%" UVxf " offs=0x%" UVxf ": saving capture indices:\n", + depth, + PTR2UV(rex), PTR2UV(rex->offs) ); ); @@ -310,9 +312,10 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen) SSPUSHIV(rex->offs[p].end); SSPUSHIV(rex->offs[p].start); SSPUSHINT(rex->offs[p].start_tmp); - DEBUG_BUFFERS_r(PerlIO_printf(Perl_debug_log, - " \\%"UVuf": %"IVdf"(%"IVdf")..%"IVdf"\n", - (UV)p, + DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ + " \\%" UVuf ": %" IVdf "(%" IVdf ")..%" IVdf "\n", + depth, + (UV)p, (IV)rex->offs[p].start, (IV)rex->offs[p].start_tmp, (IV)rex->offs[p].end @@ -330,17 +333,22 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen) /* These are needed since we do not localize EVAL nodes: */ #define REGCP_SET(cp) \ DEBUG_STATE_r( \ - PerlIO_printf(Perl_debug_log, \ - " Setting an EVAL scope, savestack=%"IVdf"\n", \ - (IV)PL_savestack_ix)); \ + Perl_re_exec_indentf( aTHX_ \ + "Setting an EVAL scope, savestack=%" IVdf ",\n", \ + depth, (IV)PL_savestack_ix \ + ) \ + ); \ cp = PL_savestack_ix #define REGCP_UNWIND(cp) \ DEBUG_STATE_r( \ - if (cp != PL_savestack_ix) \ - PerlIO_printf(Perl_debug_log, \ - " Clearing an EVAL scope, savestack=%"IVdf"..%"IVdf"\n", \ - (IV)(cp), (IV)PL_savestack_ix)); \ + if (cp != PL_savestack_ix) \ + Perl_re_exec_indentf( aTHX_ \ + "Clearing an EVAL scope, savestack=%" \ + IVdf "..%" IVdf "\n", \ + depth, (IV)(cp), (IV)PL_savestack_ix \ + ) \ + ); \ regcpblow(cp) #define UNWIND_PAREN(lp, lcp) \ @@ -351,7 +359,7 @@ S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen) STATIC void -S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p) +S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p _pDEPTH) { UV i; U32 paren; @@ -371,9 +379,10 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p) /* Now restore the parentheses context. */ DEBUG_BUFFERS_r( if (i || rex->lastparen + 1 <= rex->nparens) - PerlIO_printf(Perl_debug_log, - "rex=0x%"UVxf" offs=0x%"UVxf": restoring capture indices to:\n", - PTR2UV(rex), + Perl_re_exec_indentf( aTHX_ + "rex=0x%" UVxf " offs=0x%" UVxf ": restoring capture indices to:\n", + depth, + PTR2UV(rex), PTR2UV(rex->offs) ); ); @@ -385,9 +394,10 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p) tmps = SSPOPIV; if (paren <= rex->lastparen) rex->offs[paren].end = tmps; - DEBUG_BUFFERS_r( PerlIO_printf(Perl_debug_log, - " \\%"UVuf": %"IVdf"(%"IVdf")..%"IVdf"%s\n", - (UV)paren, + DEBUG_BUFFERS_r( Perl_re_exec_indentf( aTHX_ + " \\%" UVuf ": %" IVdf "(%" IVdf ")..%" IVdf "%s\n", + depth, + (UV)paren, (IV)rex->offs[paren].start, (IV)rex->offs[paren].start_tmp, (IV)rex->offs[paren].end, @@ -409,9 +419,10 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p) if (i > *maxopenparen_p) rex->offs[i].start = -1; rex->offs[i].end = -1; - DEBUG_BUFFERS_r( PerlIO_printf(Perl_debug_log, - " \\%"UVuf": %s ..-1 undeffing\n", - (UV)i, + DEBUG_BUFFERS_r( Perl_re_exec_indentf( aTHX_ + " \\%" UVuf ": %s ..-1 undeffing\n", + depth, + (UV)i, (i > *maxopenparen_p) ? "-1" : " " )); } @@ -422,9 +433,11 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p) * but without popping the stack */ STATIC void -S_regcp_restore(pTHX_ regexp *rex, I32 ix, U32 *maxopenparen_p) +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; regcppop(rex, maxopenparen_p); PL_savestack_ix = tmpix; @@ -432,8 +445,10 @@ S_regcp_restore(pTHX_ regexp *rex, I32 ix, U32 *maxopenparen_p) #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 @@ -453,7 +468,7 @@ S_isFOO_lc(pTHX_ const U8 classnum, const U8 character) case _CC_ENUM_ALPHA: return isALPHA_LC(character); case _CC_ENUM_ASCII: return isASCII_LC(character); case _CC_ENUM_BLANK: return isBLANK_LC(character); - case _CC_ENUM_CASED: return isLOWER_LC(character) + case _CC_ENUM_CASED: return isLOWER_LC(character) || isUPPER_LC(character); case _CC_ENUM_CNTRL: return isCNTRL_LC(character); case _CC_ENUM_DIGIT: return isDIGIT_LC(character); @@ -473,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) { @@ -651,7 +668,7 @@ Perl_re_intuit_start(pTHX_ PERL_UNUSED_ARG(flags); PERL_UNUSED_ARG(data); - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "Intuit: trying to determine minimum start position...\n")); /* for now, assume that all substr offsets are positive. If at some point @@ -682,7 +699,7 @@ Perl_re_intuit_start(pTHX_ * to quickly reject some cases that can't match, but will reject * them later after doing full char arithmetic */ if (prog->minlen > strend - strpos) { - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " String too short...\n")); goto fail; } @@ -698,7 +715,8 @@ Perl_re_intuit_start(pTHX_ reginfo->poscache_maxiter = 0; if (utf8_target) { - if (!prog->check_utf8 && prog->check_substr) + if ((!prog->anchored_utf8 && prog->anchored_substr) + || (!prog->float_utf8 && prog->float_substr)) to_utf8_substr(prog); check = prog->check_utf8; } else { @@ -719,9 +737,9 @@ Perl_re_intuit_start(pTHX_ if (!sv) continue; - PerlIO_printf(Perl_debug_log, - " substrs[%d]: min=%"IVdf" max=%"IVdf" end shift=%"IVdf - " useful=%"IVdf" utf8=%d [%s]\n", + Perl_re_printf( aTHX_ + " 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, @@ -759,7 +777,7 @@ Perl_re_intuit_start(pTHX_ if ( strpos != strbeg && (prog->intflags & PREGf_ANCH_SBOL)) { - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " Not at start...\n")); goto fail; } @@ -779,8 +797,8 @@ Perl_re_intuit_start(pTHX_ SSize_t slen = SvCUR(check); char *s = HOP3c(strpos, prog->check_offset_min, strend); - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - " Looking for check substr at fixed offset %"IVdf"...\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + " Looking for check substr at fixed offset %" IVdf "...\n", (IV)prog->check_offset_min)); if (SvTAIL(check)) { @@ -793,17 +811,18 @@ Perl_re_intuit_start(pTHX_ || strend - s < slen - 1 || (strend - s == slen && strend[-1] != '\n'))) { - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " String too long...\n")); goto fail_finish; } /* 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(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " String not equal...\n")); goto fail_finish; } @@ -818,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 @@ -854,10 +873,10 @@ Perl_re_intuit_start(pTHX_ U8* end_point; DEBUG_OPTIMISE_MORE_r({ - PerlIO_printf(Perl_debug_log, - " At restart: rx_origin=%"IVdf" Check offset min: %"IVdf - " Start shift: %"IVdf" End shift %"IVdf - " Real end Shift: %"IVdf"\n", + Perl_re_printf( aTHX_ + " 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, @@ -902,8 +921,8 @@ Perl_re_intuit_start(pTHX_ check_at = fbm_instr( start_point, end_point, check, multiline ? FBMrf_MULTILINE : 0); - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - " doing 'check' fbm scan, [%"IVdf"..%"IVdf"] gave %"IVdf"\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + " 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) @@ -915,7 +934,7 @@ Perl_re_intuit_start(pTHX_ DEBUG_EXECUTE_r({ RE_PV_QUOTED_DECL(quoted, utf8_target, PERL_DEBUG_PAD_ZERO(0), SvPVX_const(check), RE_SV_DUMPLEN(check), 30); - PerlIO_printf(Perl_debug_log, " %s %s substr %s%s%s", + Perl_re_printf( aTHX_ " %s %s substr %s%s%s", (check_at ? "Found" : "Did not find"), (check == (utf8_target ? prog->anchored_utf8 : prog->anchored_substr) ? "anchored" : "floating"), @@ -934,8 +953,8 @@ Perl_re_intuit_start(pTHX_ if (check_at - rx_origin > prog->check_offset_max) rx_origin = HOP3c(check_at, -prog->check_offset_max, rx_origin); /* Finish the diagnostic message */ - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - "%ld (rx_origin now %"IVdf")...\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + "%ld (rx_origin now %" IVdf ")...\n", (long)(check_at - strbeg), (IV)(rx_origin - strbeg) )); @@ -1046,10 +1065,12 @@ Perl_re_intuit_start(pTHX_ char *from = s; char *to = last + SvCUR(must) - (SvTAIL(must)!=0); + if (to > strend) + to = strend; if (from > to) { s = NULL; - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - " skipping 'other' fbm scan: %"IVdf" > %"IVdf"\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + " skipping 'other' fbm scan: %" IVdf " > %" IVdf "\n", (IV)(from - strbeg), (IV)(to - strbeg) )); @@ -1061,8 +1082,8 @@ Perl_re_intuit_start(pTHX_ must, multiline ? FBMrf_MULTILINE : 0 ); - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - " doing 'other' fbm scan, [%"IVdf"..%"IVdf"] gave %"IVdf"\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + " doing 'other' fbm scan, [%" IVdf "..%" IVdf "] gave %" IVdf "\n", (IV)(from - strbeg), (IV)(to - strbeg), (IV)(s ? s - strbeg : -1) @@ -1073,7 +1094,7 @@ Perl_re_intuit_start(pTHX_ DEBUG_EXECUTE_r({ RE_PV_QUOTED_DECL(quoted, utf8_target, PERL_DEBUG_PAD_ZERO(0), SvPVX_const(must), RE_SV_DUMPLEN(must), 30); - PerlIO_printf(Perl_debug_log, " %s %s substr %s%s", + Perl_re_printf( aTHX_ " %s %s substr %s%s", s ? "Found" : "Contradicts", other_ix ? "floating" : "anchored", quoted, RE_SV_TAIL(must)); @@ -1084,7 +1105,7 @@ Perl_re_intuit_start(pTHX_ /* last1 is latest possible substr location. If we didn't * find it before there, we never will */ if (last >= last1) { - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "; giving up...\n")); goto fail_finish; } @@ -1097,8 +1118,8 @@ Perl_re_intuit_start(pTHX_ other_ix /* i.e. if other-is-float */ ? HOP3c(rx_origin, 1, strend) : HOP4c(last, 1 - other->min_offset, strbeg, strend); - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - "; about to retry %s at offset %ld (rx_origin now %"IVdf")...\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + "; 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) @@ -1121,8 +1142,8 @@ Perl_re_intuit_start(pTHX_ rx_origin = HOP3c(s, -other->min_offset, strbeg); other_last = HOP3c(s, 1, strend); } - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - " at offset %ld (rx_origin now %"IVdf")...\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + " at offset %ld (rx_origin now %" IVdf ")...\n", (long)(s - strbeg), (IV)(rx_origin - strbeg) )); @@ -1131,10 +1152,10 @@ Perl_re_intuit_start(pTHX_ } else { DEBUG_OPTIMISE_MORE_r( - PerlIO_printf(Perl_debug_log, - " Check-only match: offset min:%"IVdf" max:%"IVdf - " check_at:%"IVdf" rx_origin:%"IVdf" rx_origin-check_at:%"IVdf - " strend:%"IVdf"\n", + 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", (IV)prog->check_offset_min, (IV)prog->check_offset_max, (IV)(check_at-strbeg), @@ -1152,7 +1173,7 @@ Perl_re_intuit_start(pTHX_ if (ml_anch && rx_origin != strbeg && rx_origin[-1] != '\n') { char *s; - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " looking for /^/m anchor")); /* we have failed the constraint of a \n before rx_origin. @@ -1172,7 +1193,7 @@ Perl_re_intuit_start(pTHX_ if (s <= rx_origin || ! ( rx_origin = (char *)memchr(rx_origin, '\n', s - rx_origin))) { - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " Did not find /%s^%s/m...\n", PL_colors[0], PL_colors[1])); goto fail_finish; @@ -1189,7 +1210,7 @@ Perl_re_intuit_start(pTHX_ /* Position contradicts check-string; either because * check was anchored (and thus has no wiggle room), * or check was float and rx_origin is above the float range */ - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " Found /%s^%s/m, about to restart lookup for check-string with rx_origin %ld...\n", PL_colors[0], PL_colors[1], (long)(rx_origin - strbeg))); goto restart; @@ -1205,8 +1226,8 @@ Perl_re_intuit_start(pTHX_ * contradict. On the other hand, the float "check" substr * didn't contradict, so just retry the anchored "other" * substr */ - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - " Found /%s^%s/m, rescanning for anchored from offset %"IVdf" (rx_origin now %"IVdf")...\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + " 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) @@ -1216,12 +1237,12 @@ Perl_re_intuit_start(pTHX_ /* success: we don't contradict the found floating substring * (and there's no anchored substr). */ - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " Found /%s^%s/m with rx_origin %ld...\n", PL_colors[0], PL_colors[1], (long)(rx_origin - strbeg))); } else { - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " (multiline anchor test skipped)\n")); } @@ -1271,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(PerlIO_printf(Perl_debug_log, - " looking for class: start_shift: %"IVdf" check_at: %"IVdf - " rx_origin: %"IVdf" endpos: %"IVdf"\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + " 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))); @@ -1289,11 +1310,11 @@ Perl_re_intuit_start(pTHX_ reginfo); if (!s) { if (endpos == strend) { - DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ " Could not match STCLASS...\n") ); goto fail; } - DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ " This position contradicts STCLASS...\n") ); if ((prog->intflags & PREGf_ANCH) && !ml_anch && !(prog->intflags & PREGf_IMPLICIT)) @@ -1314,8 +1335,8 @@ Perl_re_intuit_start(pTHX_ * an extra anchored search may get done, but in * practice the extra fbm_instr() is likely to * get skipped anyway. */ - DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log, - " about to retry anchored at offset %ld (rx_origin now %"IVdf")...\n", + DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ + " about to retry anchored at offset %ld (rx_origin now %" IVdf ")...\n", (long)(other_last - strbeg), (IV)(rx_origin - strbeg) )); @@ -1335,7 +1356,7 @@ Perl_re_intuit_start(pTHX_ * but since we goto a block of code that's going to * search for the next \n if any, its safe here */ rx_origin++; - DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ " about to look for /%s^%s/m starting at rx_origin %ld...\n", PL_colors[0], PL_colors[1], (long)(rx_origin - strbeg)) ); @@ -1359,12 +1380,12 @@ Perl_re_intuit_start(pTHX_ * It's conservative: it errs on the side of doing 'goto restart', * where there is code that does a proper char-based test */ if (rx_origin + start_shift + end_shift > strend) { - DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ " Could not match STCLASS...\n") ); goto fail; } - DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log, - " about to look for %s substr starting at offset %ld (rx_origin now %"IVdf")...\n", + DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ + " 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) @@ -1375,13 +1396,13 @@ Perl_re_intuit_start(pTHX_ /* Success !!! */ if (rx_origin != s) { - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " By STCLASS: moving %ld --> %ld\n", (long)(rx_origin - strbeg), (long)(s - strbeg)) ); } else { - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " Does not contradict STCLASS...\n"); ); } @@ -1393,7 +1414,7 @@ Perl_re_intuit_start(pTHX_ /* Fixed substring is found far enough so that the match cannot start at strpos. */ - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, " try at offset...\n")); + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " try at offset...\n")); ++BmUSEFUL(utf8_target ? prog->check_utf8 : prog->check_substr); /* hooray/5 */ } else { @@ -1413,7 +1434,7 @@ Perl_re_intuit_start(pTHX_ ))) { /* If flags & SOMETHING - do not do it many times on the same match */ - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, " ... Disabling check substring...\n")); + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " ... Disabling check substring...\n")); /* XXX Does the destruction order has to change with utf8_target? */ SvREFCNT_dec(utf8_target ? prog->check_utf8 : prog->check_substr); SvREFCNT_dec(utf8_target ? prog->check_substr : prog->check_utf8); @@ -1427,7 +1448,7 @@ Perl_re_intuit_start(pTHX_ } } - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "Intuit: %sSuccessfully guessed:%s match at offset %ld\n", PL_colors[4], PL_colors[5], (long)(rx_origin - strbeg)) ); @@ -1437,7 +1458,7 @@ Perl_re_intuit_start(pTHX_ if (prog->check_substr || prog->check_utf8) /* could be removed already */ BmUSEFUL(utf8_target ? prog->check_utf8 : prog->check_substr) += 5; /* hooray */ fail: - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "%sMatch rejected by optimizer%s\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "%sMatch rejected by optimizer%s\n", PL_colors[4], PL_colors[5])); return NULL; } @@ -1483,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; \ @@ -1534,9 +1556,9 @@ STMT_START { } \ } STMT_END -#define DUMP_EXEC_POS(li,s,doutf8) \ +#define DUMP_EXEC_POS(li,s,doutf8,depth) \ dump_exec_pos(li,s,(reginfo->strend),(reginfo->strbeg), \ - startpos, doutf8) + startpos, doutf8, depth) #define REXEC_FBC_EXACTISH_SCAN(COND) \ STMT_START { \ @@ -1661,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; \ } \ @@ -1864,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; @@ -1949,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]; @@ -1996,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. @@ -2030,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: @@ -2043,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 @@ -2064,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 @@ -2076,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; } @@ -2089,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) { @@ -2113,7 +2132,11 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, while (s < strend) { GCB_enum after = getGCB_VAL_UTF8((U8*) s, (U8*) reginfo->strend); - if ( (to_complement ^ isGCB(before, after)) + if ( (to_complement ^ isGCB(before, + after, + (U8*) reginfo->strbeg, + (U8*) s, + utf8_target)) && (reginfo->intuit || regtry(reginfo, &s))) { goto got_it; @@ -2363,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; } @@ -2405,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)), @@ -2427,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: @@ -2472,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; @@ -2564,8 +2588,8 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, DEBUG_TRIE_EXECUTE_r( if ( uc <= (U8*)last_start && !BITMAP_TEST(bitmap,*uc) ) { dump_exec_pos( (char *)uc, c, strend, real_start, - (char *)uc, utf8_target ); - PerlIO_printf( Perl_debug_log, + (char *)uc, utf8_target, 0 ); + Perl_re_printf( aTHX_ " Scanning for legal start char...\n"); } ); @@ -2600,9 +2624,9 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, foldbuf, uniflags); DEBUG_TRIE_EXECUTE_r({ dump_exec_pos( (char *)uc, c, strend, - real_start, s, utf8_target); - PerlIO_printf(Perl_debug_log, - " Charid:%3u CP:%4"UVxf" ", + real_start, s, utf8_target, 0); + Perl_re_printf( aTHX_ + " Charid:%3u CP:%4" UVxf " ", charid, uvc); }); } @@ -2621,9 +2645,9 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, DEBUG_TRIE_EXECUTE_r({ if (failed) dump_exec_pos( (char *)uc, c, strend, real_start, - s, utf8_target ); - PerlIO_printf( Perl_debug_log, - "%sState: %4"UVxf", word=%"UVxf, + s, utf8_target, 0 ); + Perl_re_printf( aTHX_ + "%sState: %4" UVxf ", word=%" UVxf, failed ? " Fail transition to " : "", (UV)state, (UV)word); }); @@ -2638,13 +2662,13 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, && (tmp=trie->trans[offset].next)) { DEBUG_TRIE_EXECUTE_r( - PerlIO_printf( Perl_debug_log," - legal\n")); + Perl_re_printf( aTHX_ " - legal\n")); state = tmp; break; } else { DEBUG_TRIE_EXECUTE_r( - PerlIO_printf( Perl_debug_log," - fail\n")); + Perl_re_printf( aTHX_ " - fail\n")); failed = 1; state = aho->fail[state]; } @@ -2652,7 +2676,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, else { /* we must be accepting here */ DEBUG_TRIE_EXECUTE_r( - PerlIO_printf( Perl_debug_log," - accepting\n")); + Perl_re_printf( aTHX_ " - accepting\n")); failed = 1; break; } @@ -2674,8 +2698,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, if (leftmost) { s = (char*)leftmost; DEBUG_TRIE_EXECUTE_r({ - PerlIO_printf( - Perl_debug_log,"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) ); }); @@ -2686,11 +2709,11 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, } s = HOPc(s,1); DEBUG_TRIE_EXECUTE_r({ - PerlIO_printf( Perl_debug_log,"Pattern failed. Looking for new start point...\n"); + Perl_re_printf( aTHX_ "Pattern failed. Looking for new start point...\n"); }); } else { DEBUG_TRIE_EXECUTE_r( - PerlIO_printf( Perl_debug_log,"No match.\n")); + Perl_re_printf( aTHX_ "No match.\n")); break; } } @@ -2722,11 +2745,9 @@ S_reg_set_capture_string(pTHX_ REGEXP * const rx, if (flags & REXEC_COPY_STR) { #ifdef PERL_ANY_COW if (SvCANCOW(sv)) { - if (DEBUG_C_TEST) { - PerlIO_printf(Perl_debug_log, + DEBUG_C(Perl_re_printf( aTHX_ "Copy on write: regexp capture, type %d\n", - (int) SvTYPE(sv)); - } + (int) SvTYPE(sv))); /* Create a new COW SV to share the match string and store * in saved_copy, unless the current COW SV in saved_copy * is valid and suitable for our purpose */ @@ -2922,8 +2943,8 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, ? strbeg + MgBYTEPOS(mg, sv, strbeg, strend-strbeg) : strbeg; /* pos() not defined; use start of string */ - DEBUG_GPOS_r(PerlIO_printf(Perl_debug_log, - "GPOS ganch set to strbeg[%"IVdf"]\n", (IV)(reginfo->ganch - strbeg))); + DEBUG_GPOS_r(Perl_re_printf( aTHX_ + "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: @@ -2941,7 +2962,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, if (!startpos || ((flags & REXEC_FAIL_ON_UNDERFLOW) && startpos < stringarg)) { - DEBUG_r(PerlIO_printf(Perl_debug_log, + DEBUG_r(Perl_re_printf( aTHX_ "fail: ganch-gofs before earliest possible start\n")); return 0; } @@ -2960,7 +2981,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, minlen = prog->minlen; if ((startpos + minlen) > strend || startpos < strbeg) { - DEBUG_r(PerlIO_printf(Perl_debug_log, + DEBUG_r(Perl_re_printf( aTHX_ "Regex match can't succeed, so not even tried\n")); return 0; } @@ -2995,7 +3016,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, { /* this should only be possible under \G */ assert(prog->intflags & PREGf_GPOS_SEEN); - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "matched, but failing for REXEC_FAIL_ON_UNDERFLOW\n")); goto phooey; } @@ -3020,7 +3041,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, multiline = prog->extflags & RXf_PMf_MULTILINE; if (strend - s < (minlen+(prog->check_offset_min<0?prog->check_offset_min:0))) { - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "String too short [regexec_flags]...\n")); goto phooey; } @@ -3117,14 +3138,18 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, swap = prog->offs; /* do we need a save destructor here for eval dies? */ Newxz(prog->offs, (prog->nparens + 1), regexp_paren_pair); - DEBUG_BUFFERS_r(PerlIO_printf(Perl_debug_log, - "rex=0x%"UVxf" saving offs: orig=0x%"UVxf" new=0x%"UVxf"\n", - PTR2UV(prog), + DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ + "rex=0x%" UVxf " saving offs: orig=0x%" UVxf " new=0x%" UVxf "\n", + 0, + PTR2UV(prog), PTR2UV(swap), PTR2UV(prog->offs) )); } + if (prog->recurse_locinput) + Zero(prog->recurse_locinput,prog->nparens + 1, char *); + /* Simplest case: anchored match need be tried only once, or with * MBOL, only at the beginning of each line. * @@ -3225,7 +3250,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, ); } DEBUG_EXECUTE_r(if (!did_match) - PerlIO_printf(Perl_debug_log, + Perl_re_printf( aTHX_ "Did not find anchored character...\n") ); } @@ -3330,7 +3355,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, DEBUG_EXECUTE_r(if (!did_match) { RE_PV_QUOTED_DECL(quoted, utf8_target, PERL_DEBUG_PAD_ZERO(0), SvPVX_const(must), RE_SV_DUMPLEN(must), 30); - PerlIO_printf(Perl_debug_log, "Did not find %s substr %s%s...\n", + Perl_re_printf( aTHX_ "Did not find %s substr %s%s...\n", ((must == prog->anchored_substr || must == prog->anchored_utf8) ? "anchored" : "floating"), quoted, RE_SV_TAIL(must)); @@ -3350,7 +3375,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, { RE_PV_QUOTED_DECL(quoted,utf8_target,PERL_DEBUG_PAD_ZERO(1), s,strend-s,60); - PerlIO_printf(Perl_debug_log, + Perl_re_printf( aTHX_ "Matching stclass %.*s against %s (%d bytes)\n", (int)SvCUR(prop), SvPVX_const(prop), quoted, (int)(strend - s)); @@ -3358,7 +3383,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, }); if (find_byclass(prog, c, s, strend, reginfo)) goto got_it; - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "Contradicts stclass... [regexec_flags]\n")); + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "Contradicts stclass... [regexec_flags]\n")); } else { dontbother = 0; @@ -3397,14 +3422,14 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, * the \n. */ char *checkpos= strend - len; DEBUG_OPTIMISE_r( - PerlIO_printf(Perl_debug_log, + Perl_re_printf( aTHX_ "%sChecking for float_real.%s\n", PL_colors[4], PL_colors[5])); if (checkpos + 1 < strbeg) { /* can't match, even if we remove the trailing \n * string is too short to match */ DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, + Perl_re_printf( aTHX_ "%sString shorter than required trailing substring, cannot match.%s\n", PL_colors[4], PL_colors[5])); goto phooey; @@ -3416,7 +3441,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, /* cant match, string is too short when the "\n" is * included */ DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, + Perl_re_printf( aTHX_ "%sString does not contain required trailing substring, cannot match.%s\n", PL_colors[4], PL_colors[5])); goto phooey; @@ -3427,7 +3452,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, last= checkpos; } else { DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, + Perl_re_printf( aTHX_ "%sString does not contain required trailing substring, cannot match.%s\n", PL_colors[4], PL_colors[5])); goto phooey; @@ -3451,7 +3476,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, * pretty sure it is not anymore, so I have removed the comment * and replaced it with this one. Yves */ DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, + Perl_re_printf( aTHX_ "%sString does not contain required substring, cannot match.%s\n", PL_colors[4], PL_colors[5] )); @@ -3491,16 +3516,17 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, { /* this should only be possible under \G */ assert(prog->intflags & PREGf_GPOS_SEEN); - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "matched, but failing for REXEC_FAIL_ON_UNDERFLOW\n")); goto phooey; } DEBUG_BUFFERS_r( if (swap) - PerlIO_printf(Perl_debug_log, - "rex=0x%"UVxf" freeing offs: 0x%"UVxf"\n", - PTR2UV(prog), + Perl_re_exec_indentf( aTHX_ + "rex=0x%" UVxf " freeing offs: 0x%" UVxf "\n", + 0, + PTR2UV(prog), PTR2UV(swap) ); ); @@ -3524,7 +3550,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, return 1; phooey: - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "%sMatch failed%s\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "%sMatch failed%s\n", PL_colors[4], PL_colors[5])); /* clean up; this will trigger destructors that will free all slabs @@ -3535,9 +3561,10 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, if (swap) { /* we failed :-( roll it back */ - DEBUG_BUFFERS_r(PerlIO_printf(Perl_debug_log, - "rex=0x%"UVxf" rolling back offs: freeing=0x%"UVxf" restoring=0x%"UVxf"\n", - PTR2UV(prog), + DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ + "rex=0x%" UVxf " rolling back offs: freeing=0x%" UVxf " restoring=0x%" UVxf "\n", + 0, + PTR2UV(prog), PTR2UV(prog->offs), PTR2UV(swap) )); @@ -3568,6 +3595,9 @@ S_regtry(pTHX_ regmatch_info *reginfo, char **startposp) REGEXP *const rx = reginfo->prog; regexp *const prog = ReANY(rx); SSize_t result; +#ifdef DEBUGGING + U32 depth = 0; /* used by REGCP_SET */ +#endif RXi_GET_DECL(prog,progi); GET_RE_DEBUG_FLAGS_DECL; @@ -3592,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; @@ -3628,10 +3666,26 @@ S_regtry(pTHX_ regmatch_info *reginfo, char **startposp) sayNO /* this is used to determine how far from the left messages like - 'failed...' are printed. It should be set such that messages - are inline with the regop output that created them. + 'failed...' are printed in regexec.c. It should be set such that + messages are inline with the regop output that created them. */ -#define REPORT_CODE_OFF 32 +#define REPORT_CODE_OFF 29 +#define INDENT_CHARS(depth) ((int)(depth) % 20) +#ifdef DEBUGGING +int +Perl_re_exec_indentf(pTHX_ const char *fmt, U32 depth, ...) +{ + va_list ap; + int result; + 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), "" ); + result = PerlIO_vprintf(f, fmt, ap); + va_end(ap); + return result; +} +#endif /* DEBUGGING */ #define CHRTEST_UNINIT -1001 /* c1/c2 haven't been calculated yet */ @@ -3644,9 +3698,6 @@ S_regtry(pTHX_ regmatch_info *reginfo, char **startposp) 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); @@ -3812,18 +3863,18 @@ regmatch(), slabs allocated since entry are freed. */ -#define DEBUG_STATE_pp(pp) \ - DEBUG_STATE_r({ \ - DUMP_EXEC_POS(locinput, scan, utf8_target); \ - PerlIO_printf(Perl_debug_log, \ - " %*s"pp" %s%s%s%s%s\n", \ - depth*2, "", \ - PL_reg_name[st->resume_state], \ - ((st==yes_state||st==mark_state) ? "[" : ""), \ - ((st==yes_state) ? "Y" : ""), \ - ((st==mark_state) ? "M" : ""), \ - ((st==yes_state||st==mark_state) ? "]" : "") \ - ); \ +#define DEBUG_STATE_pp(pp) \ + DEBUG_STATE_r({ \ + DUMP_EXEC_POS(locinput, scan, utf8_target,depth); \ + Perl_re_printf( aTHX_ \ + "%*s" pp " %s%s%s%s%s\n", \ + INDENT_CHARS(depth), "", \ + PL_reg_name[st->resume_state], \ + ((st==yes_state||st==mark_state) ? "[" : ""), \ + ((st==yes_state) ? "Y" : ""), \ + ((st==mark_state) ? "M" : ""), \ + ((st==yes_state||st==mark_state) ? "]" : "") \ + ); \ }); @@ -3848,12 +3899,12 @@ S_debug_start_match(pTHX_ const REGEXP *prog, const bool utf8_target, RE_PV_QUOTED_DECL(s1, utf8_target, PERL_DEBUG_PAD_ZERO(1), start, end - start, 60); - PerlIO_printf(Perl_debug_log, + Perl_re_printf( aTHX_ "%s%s REx%s %s against %s\n", PL_colors[4], blurb, PL_colors[5], s0, s1); if (utf8_target||utf8_pat) - PerlIO_printf(Perl_debug_log, "UTF-8 %s%s%s...\n", + Perl_re_printf( aTHX_ "UTF-8 %s%s%s...\n", utf8_pat ? "pattern" : "", utf8_pat && utf8_target ? " and " : "", utf8_target ? "string" : "" @@ -3867,7 +3918,9 @@ S_dump_exec_pos(pTHX_ const char *locinput, const char *loc_regeol, const char *loc_bostr, const char *loc_reg_starttry, - const bool utf8_target) + const bool utf8_target, + const U32 depth + ) { const int docolor = *PL_colors[0] || *PL_colors[2] || *PL_colors[4]; const int taill = (docolor ? 10 : 7); /* 3 chars for "> <" */ @@ -3910,15 +3963,16 @@ S_dump_exec_pos(pTHX_ const char *locinput, locinput, loc_regeol - locinput, 10, 0, 1); const STRLEN tlen=len0+len1+len2; - PerlIO_printf(Perl_debug_log, - "%4"IVdf" <%.*s%.*s%s%.*s>%*s|", + Perl_re_printf( aTHX_ + "%4" IVdf " <%.*s%.*s%s%.*s>%*s|%4u| ", (IV)(locinput - loc_bostr), len0, s0, len1, s1, (docolor ? "" : "> <"), len2, s2, (int)(tlen > 19 ? 0 : 19 - tlen), - ""); + "", + depth); } } @@ -4078,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); } @@ -4126,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(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 */ @@ -4262,13 +4317,108 @@ S_setup_EXACTISH_ST_c1_c2(pTHX_ const regnode * const text_node, int *c1p, return TRUE; } -PERL_STATIC_INLINE bool -S_isGCB(const GCB_enum before, const GCB_enum after) +STATIC bool +S_isGCB(pTHX_ const GCB_enum before, const GCB_enum after, const U8 * const strbeg, const U8 * const curpos, const bool utf8_target) { /* returns a boolean indicating if there is a Grapheme Cluster Boundary - * between the inputs. See http://www.unicode.org/reports/tr29/ */ + * between the inputs. See http://www.unicode.org/reports/tr29/. */ + + PERL_ARGS_ASSERT_ISGCB; + + switch (GCB_table[before][after]) { + case GCB_BREAKABLE: + return TRUE; + + case GCB_NOBREAK: + return FALSE; + + case GCB_RI_then_RI: + { + int RI_count = 1; + U8 * temp_pos = (U8 *) curpos; + + /* Do not break within emoji flag sequences. That is, do not + * break between regional indicator (RI) symbols if there is an + * odd number of RI characters before the break point. + * GB12 ^ (RI RI)* RI × RI + * GB13 [^RI] (RI RI)* RI × RI */ + + while (backup_one_GCB(strbeg, + &temp_pos, + utf8_target) == GCB_Regional_Indicator) + { + RI_count++; + } + + return RI_count % 2 != 1; + } + + case GCB_EX_then_EM: + + /* GB10 ( E_Base | E_Base_GAZ ) Extend* × E_Modifier */ + { + U8 * temp_pos = (U8 *) curpos; + GCB_enum prev; + + do { + prev = backup_one_GCB(strbeg, &temp_pos, utf8_target); + } + while (prev == GCB_Extend); + + return prev != GCB_E_Base && prev != GCB_E_Base_GAZ; + } + + default: + break; + } + +#ifdef DEBUGGING + Perl_re_printf( aTHX_ "Unhandled GCB pair: GCB_table[%d, %d] = %d\n", + before, after, GCB_table[before][after]); + assert(0); +#endif + return TRUE; +} + +STATIC GCB_enum +S_backup_one_GCB(pTHX_ const U8 * const strbeg, U8 ** curpos, const bool utf8_target) +{ + GCB_enum gcb; + + PERL_ARGS_ASSERT_BACKUP_ONE_GCB; + + if (*curpos < strbeg) { + return GCB_EDGE; + } + + if (utf8_target) { + U8 * prev_char_pos = reghopmaybe3(*curpos, -1, strbeg); + U8 * prev_prev_char_pos; - return GCB_table[before][after]; + if (! prev_char_pos) { + return GCB_EDGE; + } + + if ((prev_prev_char_pos = reghopmaybe3((U8 *) prev_char_pos, -1, strbeg))) { + gcb = getGCB_VAL_UTF8(prev_prev_char_pos, prev_char_pos); + *curpos = prev_char_pos; + prev_char_pos = prev_prev_char_pos; + } + else { + *curpos = (U8 *) strbeg; + return GCB_EDGE; + } + } + else { + if (*curpos - 2 < strbeg) { + *curpos = (U8 *) strbeg; + return GCB_EDGE; + } + (*curpos)--; + gcb = getGCB_VAL_CP(*(*curpos - 1)); + } + + return gcb; } /* Combining marks attach to most classes that precede them, but this defines @@ -4299,7 +4449,7 @@ S_isLB(pTHX_ LB_enum before, PERL_ARGS_ASSERT_ISLB; - /* Rule numbers in the comments below are as of Unicode 8.0 */ + /* Rule numbers in the comments below are as of Unicode 9.0 */ redo: before = prev; @@ -4393,14 +4543,14 @@ S_isLB(pTHX_ LB_enum before, * that is overriden */ return LB_table[prev][after] != LB_NOBREAK_EVEN_WITH_SP_BETWEEN; - case LB_CM_foo: + case LB_CM_ZWJ_foo: /* We don't know how to treat the CM except by looking at the first - * non-CM character preceding it */ + * non-CM character preceding it. ZWJ is treated as CM */ do { prev = backup_one_LB(strbeg, &temp_pos, utf8_target); } - while (prev == LB_Combining_Mark); + while (prev == LB_Combining_Mark || prev == LB_ZWJ); /* Here, 'prev' is that first earlier non-CM character. If the CM * attatches to it, then it inherits the behavior of 'prev'. If it @@ -4473,12 +4623,34 @@ S_isLB(pTHX_ LB_enum before, return LB_various_then_PO_or_PR; } + case LB_RI_then_RI + LB_NOBREAK: + case LB_RI_then_RI + LB_BREAKABLE: + { + int RI_count = 1; + + /* LB30a Break between two regional indicator symbols if and + * only if there are an even number of regional indicators + * preceding the position of the break. + * + * sot (RI RI)* RI × RI + * [^RI] (RI RI)* RI × RI */ + + while (backup_one_LB(strbeg, + &temp_pos, + utf8_target) == LB_Regional_Indicator) + { + RI_count++; + } + + return RI_count % 2 == 0; + } + default: break; } #ifdef DEBUGGING - PerlIO_printf(Perl_error_log, "Unhandled LB pair: LB_table[%d, %d] = %d\n", + Perl_re_printf( aTHX_ "Unhandled LB pair: LB_table[%d, %d] = %d\n", before, after, LB_table[before][after]); assert(0); #endif @@ -4857,7 +5029,7 @@ S_isWB(pTHX_ WB_enum previous, PERL_ARGS_ASSERT_ISWB; - /* Rule numbers in the comments below are as of Unicode 8.0 */ + /* Rule numbers in the comments below are as of Unicode 9.0 */ redo: before = prev; @@ -4883,11 +5055,11 @@ S_isWB(pTHX_ WB_enum previous, * the beginning of a region of text', the rule is to break before * them, just like any other character. Therefore, the default rule * applies and we don't have to look in more depth. Should this ever - * change, we would have to have 2 'case' statements, like in the - * rules below, and backup a single character (not spacing over the - * extend ones) and then see if that is one of the region-end - * characters and go from there */ - case WB_Ex_or_FO_then_foo: + * change, we would have to have 2 'case' statements, like in the rules + * below, and backup a single character (not spacing over the extend + * ones) and then see if that is one of the region-end characters and + * go from there */ + case WB_Ex_or_FO_or_ZWJ_then_foo: prev = backup_one_WB(&previous, strbeg, &before_pos, utf8_target); goto redo; @@ -4980,12 +5152,36 @@ S_isWB(pTHX_ WB_enum previous, return WB_table[before][after] - WB_NU_then_MB_or_MN_or_SQ == WB_BREAKABLE; + case WB_RI_then_RI + WB_NOBREAK: + case WB_RI_then_RI + WB_BREAKABLE: + { + int RI_count = 1; + + /* Do not break within emoji flag sequences. That is, do not + * break between regional indicator (RI) symbols if there is an + * odd number of RI characters before the potential break + * point. + * + * WB15 ^ (RI RI)* RI × RI + * WB16 [^RI] (RI RI)* RI × RI */ + + while (backup_one_WB(&previous, + strbeg, + &before_pos, + utf8_target) == WB_Regional_Indicator) + { + RI_count++; + } + + return RI_count % 2 != 1; + } + default: break; } #ifdef DEBUGGING - PerlIO_printf(Perl_error_log, "Unhandled WB pair: WB_table[%d, %d] = %d\n", + Perl_re_printf( aTHX_ "Unhandled WB pair: WB_table[%d, %d] = %d\n", before, after, WB_table[before][after]); assert(0); #endif @@ -5060,8 +5256,8 @@ S_backup_one_WB(pTHX_ WB_enum * previous, const U8 * const strbeg, U8 ** curpos, *previous = (*curpos <= strbeg) ? WB_EDGE : WB_UNKNOWN; } - /* And we always back up over these two types */ - if (wb != WB_Extend && wb != WB_Format) { + /* And we always back up over these three types */ + if (wb != WB_Extend && wb != WB_Format && wb != WB_ZWJ) { return wb; } } @@ -5092,7 +5288,7 @@ S_backup_one_WB(pTHX_ WB_enum * previous, const U8 * const strbeg, U8 ** curpos, *curpos = (U8 *) strbeg; return WB_EDGE; } - } while (wb == WB_Extend || wb == WB_Format); + } while (wb == WB_Extend || wb == WB_Format || wb == WB_ZWJ); } else { do { @@ -5108,14 +5304,32 @@ S_backup_one_WB(pTHX_ WB_enum * previous, const U8 * const strbeg, U8 ** curpos, return wb; } +#define EVAL_CLOSE_PAREN_IS(st,expr) \ +( \ + ( ( st ) ) && \ + ( ( st )->u.eval.close_paren ) && \ + ( ( ( st )->u.eval.close_paren ) == ( (expr) + 1 ) ) \ +) + +#define EVAL_CLOSE_PAREN_IS_TRUE(st,expr) \ +( \ + ( ( st ) ) && \ + ( ( st )->u.eval.close_paren ) && \ + ( ( expr ) ) && \ + ( ( ( st )->u.eval.close_paren ) == ( (expr) + 1 ) ) \ +) + + +#define EVAL_CLOSE_PAREN_SET(st,expr) \ + (st)->u.eval.close_paren = ( (expr) + 1 ) + +#define EVAL_CLOSE_PAREN_CLEAR(st) \ + (st)->u.eval.close_paren = 0 + /* returns -1 on failure, $+[0] on success */ 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; @@ -5129,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) ? @@ -5176,13 +5391,19 @@ 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)) +# define SOLARIS_BAD_OPTIMIZER + const U32 *pl_charclass_dup = PL_charclass; +# define PL_charclass pl_charclass_dup +#endif #ifdef DEBUGGING GET_RE_DEBUG_FLAGS_DECL; @@ -5197,30 +5418,19 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) PERL_ARGS_ASSERT_REGMATCH; - DEBUG_OPTIMISE_r( DEBUG_EXECUTE_r({ - PerlIO_printf(Perl_debug_log,"regmatch start\n"); - })); - st = PL_regmatch_state; /* Note that nextchr is a byte even in UTF */ SET_nextchr; scan = prog; + + DEBUG_OPTIMISE_r( DEBUG_EXECUTE_r({ + DUMP_EXEC_POS( locinput, scan, utf8_target, depth ); + Perl_re_printf( aTHX_ "regmatch start\n" ); + })); + while (scan != NULL) { - DEBUG_EXECUTE_r( { - SV * const prop = sv_newmortal(); - regnode *rnext=regnext(scan); - DUMP_EXEC_POS( locinput, scan, utf8_target ); - regprop(rex, prop, scan, reginfo, NULL); - - PerlIO_printf(Perl_debug_log, - "%3"IVdf":%*s%s(%"IVdf")\n", - (IV)(scan - rexi->program), depth*2, "", - SvPVX_const(prop), - (PL_regkind[OP(scan)] == END || !rnext) ? - 0 : (IV)(rnext - rexi->program)); - }); next = scan + NEXT_OFF(scan); if (next == scan) @@ -5228,6 +5438,23 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) state_num = OP(scan); reenter_switch: + DEBUG_EXECUTE_r( + if (state_num <= REGNODE_MAX) { + SV * const prop = sv_newmortal(); + regnode *rnext = regnext(scan); + + DUMP_EXEC_POS( locinput, scan, utf8_target, depth ); + regprop(rex, prop, scan, reginfo, NULL); + Perl_re_printf( aTHX_ + "%*s%" IVdf ":%s(%" IVdf ")\n", + INDENT_CHARS(depth), "", + (IV)(scan - rexi->program), + SvPVX_const(prop), + (PL_regkind[OP(scan)] == END || !rnext) ? + 0 : (IV)(rnext - rexi->program)); + } + ); + to_complement = 0; SET_nextchr; @@ -5257,14 +5484,12 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) st->u.keeper.val = rex->offs[0].start; rex->offs[0].start = locinput - reginfo->strbeg; PUSH_STATE_GOTO(KEEPS_next, next, locinput); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case KEEPS_next_fail: /* rollback the start point change */ rex->offs[0].start = st->u.keeper.val; sayNO_SILENT; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case MEOL: /* /..$/m */ @@ -5303,12 +5528,10 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) */ if(!NEXTCHR_IS_EOS && !ANYOF_BITMAP_TEST(scan, nextchr)) { DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, - "%*s %sfailed to match trie start class...%s\n", - REPORT_CODE_OFF+depth*2, "", PL_colors[4], PL_colors[5]) + Perl_re_exec_indentf( aTHX_ "%sfailed to match trie start class...%s\n", + depth, PL_colors[4], PL_colors[5]) ); sayNO_SILENT; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ } /* FALLTHROUGH */ @@ -5385,17 +5608,15 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) { if (trie->states[ state ].wordnum) { DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, - "%*s %smatched empty string...%s\n", - REPORT_CODE_OFF+depth*2, "", PL_colors[4], PL_colors[5]) + Perl_re_exec_indentf( aTHX_ "%smatched empty string...%s\n", + depth, PL_colors[4], PL_colors[5]) ); if (!trie->jump) break; } else { DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, - "%*s %sfailed to match trie start class...%s\n", - REPORT_CODE_OFF+depth*2, "", PL_colors[4], PL_colors[5]) + Perl_re_exec_indentf( aTHX_ "%sfailed to match trie start class...%s\n", + depth, PL_colors[4], PL_colors[5]) ); sayNO_SILENT; } @@ -5447,10 +5668,11 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) } DEBUG_TRIE_EXECUTE_r({ - DUMP_EXEC_POS( (char *)uc, scan, utf8_target ); - PerlIO_printf( Perl_debug_log, - "%*s %sState: %4"UVxf" Accepted: %c ", - 2+depth * 2, "", PL_colors[4], + DUMP_EXEC_POS( (char *)uc, scan, utf8_target, depth ); + /* HERE */ + PerlIO_printf( Perl_debug_log, + "%*s%sState: %4" UVxf " Accepted: %c ", + INDENT_CHARS(depth), "", PL_colors[4], (UV)state, (accepted ? 'Y' : 'N')); }); @@ -5482,8 +5704,8 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) state = 0; } DEBUG_TRIE_EXECUTE_r( - PerlIO_printf( Perl_debug_log, - "Charid:%3x CP:%4"UVxf" After State: %4"UVxf"%s\n", + Perl_re_printf( aTHX_ + "Charid:%3x CP:%4" UVxf " After State: %4" UVxf "%s\n", charid, uvc, (UV)state, PL_colors[5] ); ); } @@ -5502,28 +5724,30 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) } DEBUG_EXECUTE_r( - PerlIO_printf( Perl_debug_log, - "%*s %sgot %"IVdf" possible matches%s\n", - REPORT_CODE_OFF + depth * 2, "", + Perl_re_exec_indentf( aTHX_ "%sgot %" IVdf " possible matches%s\n", + depth, PL_colors[4], (IV)ST.accepted, PL_colors[5] ); ); goto trie_first_try; /* jump into the fail handler */ }} - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case TRIE_next_fail: /* we failed - try next alternative */ { U8 *uc; - if ( ST.jump) { + 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); } if (!--ST.accepted) { DEBUG_EXECUTE_r({ - PerlIO_printf( Perl_debug_log, - "%*s %sTRIE failed...%s\n", - REPORT_CODE_OFF+depth*2, "", + Perl_re_exec_indentf( aTHX_ "%sTRIE failed...%s\n", + depth, PL_colors[4], PL_colors[5] ); }); @@ -5550,7 +5774,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) no_final = 0; } - if ( ST.jump) { + if ( ST.jump ) { ST.lastparen = rex->lastparen; ST.lastcloseparen = rex->lastcloseparen; REGCP_SET(ST.cp); @@ -5613,18 +5837,16 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) : NEXT_OFF(ST.me)); DEBUG_EXECUTE_r({ - PerlIO_printf( Perl_debug_log, - "%*s %sTRIE matched word #%d, continuing%s\n", - REPORT_CODE_OFF+depth*2, "", + Perl_re_exec_indentf( aTHX_ "%sTRIE matched word #%d, continuing%s\n", + depth, PL_colors[4], ST.nextword, PL_colors[5] ); }); - if (ST.accepted > 1 || has_cutgroup) { + if ( ST.accepted > 1 || has_cutgroup || ST.jump ) { PUSH_STATE_GOTO(TRIE_next, scan, (char*)uc); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ } /* only one choice left - just continue */ @@ -5635,9 +5857,8 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) ? av_fetch(trie_words, ST.nextword - 1, 0) : NULL; SV *sv= tmp ? sv_newmortal() : NULL; - PerlIO_printf( Perl_debug_log, - "%*s %sonly one match left, short-circuiting: #%d <%s>%s\n", - REPORT_CODE_OFF+depth*2, "", PL_colors[4], + Perl_re_exec_indentf( aTHX_ "%sonly one match left, short-circuiting: #%d <%s>%s\n", + depth, PL_colors[4], ST.nextword, tmp ? pv_pretty(sv, SvPV_nolen_const(*tmp), SvCUR(*tmp), 0, PL_colors[0], PL_colors[1], @@ -5853,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) @@ -5932,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; } @@ -5954,7 +6181,10 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) (U8*)(reginfo->strbeg)), (U8*) reginfo->strend), getGCB_VAL_UTF8((U8*) locinput, - (U8*) reginfo->strend)); + (U8*) reginfo->strend), + (U8*) reginfo->strbeg, + (U8*) locinput, + utf8_target); } break; @@ -6144,23 +6374,28 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) if (! (to_complement ^ cBOOL(isFOO_lc(FLAGS(scan), (U8) nextchr)))) { sayNO; } + + locinput++; + break; } - else if (UTF8_IS_DOWNGRADEABLE_START(nextchr)) { - if (! (to_complement ^ cBOOL(isFOO_lc(FLAGS(scan), - EIGHT_BIT_UTF8_TO_NATIVE(nextchr, - *(locinput + 1)))))) - { - sayNO; - } - } - else { /* Here, must be 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; } - /* Here, must be utf8 */ - locinput += UTF8SKIP(locinput); - break; + /* Here is a UTF-8 variant code point below 256 and the target is + * UTF-8 */ + if (! (to_complement ^ cBOOL(isFOO_lc(FLAGS(scan), + EIGHT_BIT_UTF8_TO_NATIVE(nextchr, + *(locinput + 1)))))) + { + sayNO; + } + + goto increment_locinput; case NPOSIXD: /* \W or [:^punct:] etc. under /d */ to_complement = 1; @@ -6231,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)), @@ -6336,7 +6571,10 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) while (locinput < reginfo->strend) { GCB_enum cur_gcb = getGCB_VAL_UTF8((U8*) locinput, (U8*) reginfo->strend); - if (isGCB(prev_gcb, cur_gcb)) { + if (isGCB(prev_gcb, cur_gcb, + (U8*) reginfo->strbeg, (U8*) locinput, + utf8_target)) + { break; } @@ -6441,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; @@ -6458,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; @@ -6473,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 @@ -6492,18 +6731,19 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) #undef ST #define ST st->u.eval +#define CUR_EVAL cur_eval->u.eval + { SV *ret; REGEXP *re_sv; regexp *re; regexp_internal *rei; regnode *startpoint; + U32 arg; - case GOSTART: /* (?R) */ case GOSUB: /* /(...(?1))/ /(...(?&foo))/ */ - if (cur_eval && cur_eval->locinput==locinput) { - if (cur_eval->u.eval.close_paren == (U32)ARG(scan)) - Perl_croak(aTHX_ "Infinite recursion in regex"); + arg= (U32)ARG(scan); + if (cur_eval && cur_eval->locinput == locinput) { if ( ++nochange_depth > max_nochange_depth ) Perl_croak(aTHX_ "Pattern subroutine nesting without pos change" @@ -6514,12 +6754,33 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) re_sv = rex_sv; re = rex; rei = rexi; - if (OP(scan)==GOSUB) { - startpoint = scan + ARG2L(scan); - ST.close_paren = ARG(scan); + startpoint = scan + ARG2L(scan); + EVAL_CLOSE_PAREN_SET( st, arg ); + /* Detect infinite recursion + * + * A pattern like /(?R)foo/ or /(?(?&y)foo)(?(?&x)bar)/ + * or "a"=~/(.(?2))((?<=(?=(?1)).))/ could recurse forever. + * So we track the position in the string we are at each time + * we recurse and if we try to enter the same routine twice from + * the same position we throw an error. + */ + if ( rex->recurse_locinput[arg] == locinput ) { + /* FIXME: we should show the regop that is failing as part + * of the error message. */ + Perl_croak(aTHX_ "Infinite recursion in regex"); } else { - startpoint = rei->program+1; - ST.close_paren = 0; + ST.prev_recurse_locinput= rex->recurse_locinput[arg]; + rex->recurse_locinput[arg]= locinput; + + DEBUG_r({ + GET_RE_DEBUG_FLAGS_DECL; + DEBUG_STACK_r({ + Perl_re_exec_indentf( aTHX_ + "entering GOSUB, prev_recurse_locinput=%p recurse_locinput[%d]=%p\n", + depth, ST.prev_recurse_locinput, arg, rex->recurse_locinput[arg] + ); + }); + }); } /* Save all the positions seen so far. */ @@ -6530,7 +6791,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) 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"); @@ -6548,8 +6809,8 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) CV *newcv; /* save *all* paren positions */ - regcppush(rex, 0, maxopenparen); - REGCP_SET(runops_cp); + regcppush(rex, 0, maxopenparen); + REGCP_SET(ST.lastcp); if (!caller_cv) caller_cv = find_runcv(NULL); @@ -6557,10 +6818,9 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) n = ARG(scan); if (rexi->data->what[n] == 'r') { /* code from an external qr */ - newcv = (ReANY( - (REGEXP*)(rexi->data->data[n]) - ))->qr_anoncv - ; + newcv = (ReANY( + (REGEXP*)(rexi->data->data[n]) + ))->qr_anoncv; nop = (OP*)rexi->data->data[n+1]; } else if (rexi->data->what[n] == 'l') { /* literal code */ @@ -6575,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 { @@ -6640,8 +6937,8 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) } nop = nop->op_next; - DEBUG_STATE_r( PerlIO_printf(Perl_debug_log, - " re EVAL PL_op=0x%"UVxf"\n", PTR2UV(nop)) ); + DEBUG_STATE_r( Perl_re_printf( aTHX_ + " re EVAL PL_op=0x%" UVxf "\n", PTR2UV(nop)) ); rex->offs[0].end = locinput - reginfo->strbeg; if (reginfo->info_aux_eval->pos_magic) @@ -6715,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); - 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 */ @@ -6779,7 +7079,9 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) reginfo->strend, "Matching embedded"); ); startpoint = rei->program + 1; - ST.close_paren = 0; /* only used for GOSUB */ + EVAL_CLOSE_PAREN_CLEAR(st); /* ST.close_paren = 0; + * close_paren only for GOSUB */ + ST.prev_recurse_locinput= NULL; /* only used for GOSUB */ /* Save all the seen positions so far. */ ST.cp = regcppush(rex, 0, maxopenparen); REGCP_SET(ST.lastcp); @@ -6815,13 +7117,31 @@ 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); - /* NOTREACHED */ + PUSH_YES_STATE_GOTO(EVAL_postponed_AB, startpoint, locinput); NOT_REACHED; /* NOTREACHED */ } - case EVAL_AB: /* cleanup after a successful (??{A})B */ - /* note: this is called twice; first after popping B, then A */ + 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", + depth, cur_eval, ST.prev_eval); + }); + +#define SET_RECURSE_LOCINPUT(STR,VAL)\ + if ( cur_eval && CUR_EVAL.close_paren ) {\ + DEBUG_STACK_r({ \ + Perl_re_exec_indentf( aTHX_ STR " GOSUB%d ce=%p recurse_locinput=%p\n",\ + depth, \ + CUR_EVAL.close_paren - 1,\ + cur_eval, \ + VAL); \ + }); \ + rex->recurse_locinput[CUR_EVAL.close_paren - 1] = VAL;\ + } + + SET_RECURSE_LOCINPUT("EVAL_AB[before]", CUR_EVAL.prev_recurse_locinput); + rex_sv = ST.prev_rex; is_utf8_pat = reginfo->is_utf8_pat = cBOOL(RX_UTF8(rex_sv)); SET_reg_curpm(rex_sv); @@ -6842,11 +7162,24 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) reginfo->poscache_maxiter = 0; if ( nochange_depth ) nochange_depth--; + + SET_RECURSE_LOCINPUT("EVAL_AB[after]", cur_eval->locinput); 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", + depth, cur_eval, ST.prev_eval); + }); + + SET_RECURSE_LOCINPUT("EVAL_AB_fail[before]", CUR_EVAL.prev_recurse_locinput); + rex_sv = ST.prev_rex; is_utf8_pat = reginfo->is_utf8_pat = cBOOL(RX_UTF8(rex_sv)); SET_reg_curpm(rex_sv); @@ -6854,14 +7187,17 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) rexi = RXi_GET(rex); REGCP_UNWIND(ST.lastcp); - regcppop(rex, &maxopenparen); + regcppop(rex, &maxopenparen); cur_eval = ST.prev_eval; cur_curlyx = ST.prev_curlyx; + /* Invalidate cache. See "invalidate" comment above. */ reginfo->poscache_maxiter = 0; if ( nochange_depth ) nochange_depth--; - sayNO_SILENT; + + SET_RECURSE_LOCINPUT("EVAL_AB_fail[after]", cur_eval->locinput); + sayNO_SILENT; #undef ST case OPEN: /* ( */ @@ -6869,8 +7205,9 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) rex->offs[n].start_tmp = locinput - reginfo->strbeg; if (n > maxopenparen) maxopenparen = n; - DEBUG_BUFFERS_r(PerlIO_printf(Perl_debug_log, - "rex=0x%"UVxf" offs=0x%"UVxf": \\%"UVuf": set %"IVdf" tmp; maxopenparen=%"UVuf"\n", + DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ + "rex=0x%" UVxf " offs=0x%" UVxf ": \\%" UVuf ": set %" IVdf " tmp; maxopenparen=%" UVuf "\n", + depth, PTR2UV(rex), PTR2UV(rex->offs), (UV)n, @@ -6881,16 +7218,17 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) break; /* XXX really need to log other places start/end are set too */ -#define CLOSE_CAPTURE \ - rex->offs[n].start = rex->offs[n].start_tmp; \ - rex->offs[n].end = locinput - reginfo->strbeg; \ - DEBUG_BUFFERS_r(PerlIO_printf(Perl_debug_log, \ - "rex=0x%"UVxf" offs=0x%"UVxf": \\%"UVuf": set %"IVdf"..%"IVdf"\n", \ - PTR2UV(rex), \ - PTR2UV(rex->offs), \ - (UV)n, \ - (IV)rex->offs[n].start, \ - (IV)rex->offs[n].end \ +#define CLOSE_CAPTURE \ + 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", \ + depth, \ + PTR2UV(rex), \ + PTR2UV(rex->offs), \ + (UV)n, \ + (IV)rex->offs[n].start, \ + (IV)rex->offs[n].end \ )) case CLOSE: /* ) */ @@ -6899,9 +7237,9 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) if (n > rex->lastparen) rex->lastparen = n; rex->lastcloseparen = n; - if (cur_eval && cur_eval->u.eval.close_paren == n) { + if ( EVAL_CLOSE_PAREN_IS( cur_eval, n ) ) goto fake_end; - } + break; case ACCEPT: /* (*ACCEPT) */ @@ -6920,8 +7258,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) if (n > rex->lastparen) rex->lastparen = n; rex->lastcloseparen = n; - if ( n == ARG(scan) || (cur_eval && - cur_eval->u.eval.close_paren == n)) + if ( n == ARG(scan) || EVAL_CLOSE_PAREN_IS(cur_eval, n) ) break; } } @@ -6942,7 +7279,9 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) case INSUBP: /* (?(R)) */ n = ARG(scan); - sw = (cur_eval && (!n || cur_eval->u.eval.close_paren == n)); + /* this does not need to use EVAL_CLOSE_PAREN macros, as the arg + * of SCAN is already set up as matches a eval.close_paren */ + sw = cur_eval && (n == 0 || CUR_EVAL.close_paren == n); break; case DEFINEP: /* (?(DEFINE)) */ @@ -7078,21 +7417,18 @@ NULL ST.lastloc = NULL; /* this will be updated by WHILEM */ PUSH_YES_STATE_GOTO(CURLYX_end, PREVOPER(next), locinput); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ } case CURLYX_end: /* just finished matching all of A*B */ cur_curlyx = ST.prev_curlyx; sayYES; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case CURLYX_end_fail: /* just failed to match all of A*B */ regcpblow(ST.cp); cur_curlyx = ST.prev_curlyx; sayNO; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ @@ -7117,30 +7453,26 @@ NULL ST.cache_mask = 0; - DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log, - "%*s whilem: matched %ld out of %d..%d\n", - REPORT_CODE_OFF+depth*2, "", (long)n, min, max) + DEBUG_EXECUTE_r( Perl_re_exec_indentf( aTHX_ "whilem: matched %ld out of %d..%d\n", + depth, (long)n, min, max) ); /* First just match a string of min A's. */ if (n < min) { - ST.cp = regcppush(rex, cur_curlyx->u.curlyx.parenfloor, - maxopenparen); + 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_pre, A, locinput); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ } /* If degenerate A matches "", assume A done. */ if (locinput == cur_curlyx->u.curlyx.lastloc) { - DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log, - "%*s whilem: empty match detected, trying continuation...\n", - REPORT_CODE_OFF+depth*2, "") + DEBUG_EXECUTE_r( Perl_re_exec_indentf( aTHX_ "whilem: empty match detected, trying continuation...\n", + depth) ); goto do_whilem_B_max; } @@ -7206,7 +7538,7 @@ NULL reginfo->poscache_size = size; Newxz(aux->poscache, size, char); } - DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log, + DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ "%swhilem: Detected a super-linear match, switching on caching%s...\n", PL_colors[4], PL_colors[5]) ); @@ -7223,10 +7555,10 @@ NULL mask = 1 << (offset % 8); offset /= 8; if (reginfo->info_aux->poscache[offset] & mask) { - DEBUG_EXECUTE_r( PerlIO_printf(Perl_debug_log, - "%*s whilem: (cache) already tried at this position...\n", - REPORT_CODE_OFF+depth*2, "") + 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; @@ -7239,36 +7571,29 @@ NULL if (cur_curlyx->u.curlyx.minmod) { ST.save_curlyx = cur_curlyx; cur_curlyx = cur_curlyx->u.curlyx.prev_curlyx; - ST.cp = regcppush(rex, ST.save_curlyx->u.curlyx.parenfloor, - maxopenparen); - REGCP_SET(ST.lastcp); PUSH_YES_STATE_GOTO(WHILEM_B_min, ST.save_curlyx->u.curlyx.B, locinput); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ } /* Prefer A over B for maximal matching. */ if (n < max) { /* More greed allowed? */ - ST.cp = regcppush(rex, cur_curlyx->u.curlyx.parenfloor, + 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); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ } goto do_whilem_B_max; } - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case WHILEM_B_min: /* just matched B in a minimal match */ case WHILEM_B_max: /* just matched B in a maximal match */ cur_curlyx = ST.save_curlyx; sayYES; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case WHILEM_B_max_fail: /* just failed to match B in a maximal match */ @@ -7276,26 +7601,23 @@ NULL cur_curlyx->u.curlyx.lastloc = ST.save_lastloc; cur_curlyx->u.curlyx.count--; CACHEsayNO; - /* NOTREACHED */ 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); - regcppop(rex, &maxopenparen); + 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; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case WHILEM_A_max_fail: /* just failed to match A in a maximal match */ REGCP_UNWIND(ST.lastcp); - regcppop(rex, &maxopenparen); /* Restore some previous $s? */ - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - "%*s whilem: failed, trying continuation...\n", - REPORT_CODE_OFF+depth*2, "") + regcppop(rex, &maxopenparen); /* Restore some previous $s? */ + DEBUG_EXECUTE_r(Perl_re_exec_indentf( aTHX_ "whilem: failed, trying continuation...\n", + depth) ); do_whilem_B_max: if (cur_curlyx->u.curlyx.count >= REG_INFTY @@ -7314,13 +7636,10 @@ NULL cur_curlyx = cur_curlyx->u.curlyx.prev_curlyx; PUSH_YES_STATE_GOTO(WHILEM_B_max, ST.save_curlyx->u.curlyx.B, locinput); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case WHILEM_B_min_fail: /* just failed to match B in a minimal match */ cur_curlyx = ST.save_curlyx; - REGCP_UNWIND(ST.lastcp); - regcppop(rex, &maxopenparen); if (cur_curlyx->u.curlyx.count >= /*max*/ARG2(cur_curlyx->u.curlyx.me)) { /* Maximum greed exceeded */ @@ -7338,18 +7657,13 @@ NULL CACHEsayNO; } - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - "%*s trying longer...\n", REPORT_CODE_OFF+depth*2, "") + DEBUG_EXECUTE_r(Perl_re_exec_indentf( aTHX_ "trying longer...\n", depth) ); /* Try grabbing another A and see if it helps. */ cur_curlyx->u.curlyx.lastloc = locinput; - ST.cp = regcppush(rex, cur_curlyx->u.curlyx.parenfloor, - maxopenparen); - REGCP_SET(ST.lastcp); PUSH_STATE_GOTO(WHILEM_A_min, /*A*/ NEXTOPER(ST.save_curlyx->u.curlyx.me) + EXTRA_STEP_2ARGS, locinput); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ #undef ST @@ -7375,7 +7689,6 @@ NULL } else { PUSH_STATE_GOTO(BRANCH_next, scan, locinput); } - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case CUTGROUP: /* /(*THEN)/ */ @@ -7383,7 +7696,6 @@ NULL ? MUTABLE_SV(rexi->data->data[ ARG( scan ) ]) : NULL; PUSH_STATE_GOTO(CUTGROUP_next, next, locinput); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case CUTGROUP_next_fail: @@ -7392,12 +7704,10 @@ NULL if (st->u.mark.mark_name) sv_commit = st->u.mark.mark_name; sayNO; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case BRANCH_next: sayYES; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case BRANCH_next_fail: /* that branch failed; try the next, if any */ @@ -7411,9 +7721,8 @@ NULL /* no more branches? */ if (!scan || (OP(scan) != BRANCH && OP(scan) != BRANCHJ)) { DEBUG_EXECUTE_r({ - PerlIO_printf( Perl_debug_log, - "%*s %sBRANCH failed...%s\n", - REPORT_CODE_OFF+depth*2, "", + Perl_re_exec_indentf( aTHX_ "%sBRANCH failed...%s\n", + depth, PL_colors[4], PL_colors[5] ); }); @@ -7464,7 +7773,6 @@ NULL curlym_do_A: /* execute the A in /A{m,n}B/ */ PUSH_YES_STATE_GOTO(CURLYM_A, ST.A, locinput); /* match A */ - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case CURLYM_A: /* we've just matched an A */ @@ -7485,14 +7793,11 @@ NULL ST.count = ST.minmod ? ARG1(ST.me) : ARG2(ST.me); } DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, - "%*s CURLYM now matched %"IVdf" times, len=%"IVdf"...\n", - (int)(REPORT_CODE_OFF+(depth*2)), "", - (IV) ST.count, (IV)ST.alen) + Perl_re_exec_indentf( aTHX_ "CURLYM now matched %" IVdf " times, len=%" IVdf "...\n", + depth, (IV) ST.count, (IV)ST.alen) ); - if (cur_eval && cur_eval->u.eval.close_paren && - cur_eval->u.eval.close_paren == (U32)ST.me->flags) + if (EVAL_CLOSE_PAREN_IS_TRUE(cur_eval,(U32)ST.me->flags)) goto fake_end; { @@ -7505,9 +7810,9 @@ NULL case CURLYM_A_fail: /* just failed to match an A */ REGCP_UNWIND(ST.cp); + if (ST.minmod || ST.count < ARG1(ST.me) /* min*/ - || (cur_eval && cur_eval->u.eval.close_paren && - cur_eval->u.eval.close_paren == (U32)ST.me->flags)) + || EVAL_CLOSE_PAREN_IS_TRUE(cur_eval,(U32)ST.me->flags)) sayNO; curlym_do_B: /* execute the B in /A{m,n}B/ */ @@ -7541,10 +7846,8 @@ NULL } DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, - "%*s CURLYM trying tail with matches=%"IVdf"...\n", - (int)(REPORT_CODE_OFF+(depth*2)), - "", (IV)ST.count) + Perl_re_exec_indentf( aTHX_ "CURLYM trying tail with matches=%" IVdf "...\n", + depth, (IV)ST.count) ); if (! NEXTCHR_IS_EOS && ST.c1 != CHRTEST_VOID) { if (! UTF8_IS_INVARIANT(nextchr) && utf8_target) { @@ -7553,9 +7856,8 @@ NULL { /* simulate B failing */ DEBUG_OPTIMISE_r( - PerlIO_printf(Perl_debug_log, - "%*s CURLYM Fast bail next target=0x%"UVXf" c1=0x%"UVXf" c2=0x%"UVXf"\n", - (int)(REPORT_CODE_OFF+(depth*2)),"", + 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), valid_utf8_to_uvchr(ST.c2_utf8, NULL)) @@ -7567,9 +7869,8 @@ NULL else if (nextchr != ST.c1 && nextchr != ST.c2) { /* simulate B failing */ DEBUG_OPTIMISE_r( - PerlIO_printf(Perl_debug_log, - "%*s CURLYM Fast bail next target=0x%X c1=0x%X c2=0x%X\n", - (int)(REPORT_CODE_OFF+(depth*2)),"", + Perl_re_exec_indentf( aTHX_ "CURLYM Fast bail next target=0x%X c1=0x%X c2=0x%X\n", + depth, (int) nextchr, ST.c1, ST.c2) ); state_num = CURLYM_B_fail; @@ -7590,8 +7891,8 @@ NULL } else rex->offs[paren].end = -1; - if (cur_eval && cur_eval->u.eval.close_paren && - cur_eval->u.eval.close_paren == (U32)ST.me->flags) + + if (EVAL_CLOSE_PAREN_IS_TRUE(cur_eval,(U32)ST.me->flags)) { if (ST.count) goto fake_end; @@ -7601,7 +7902,6 @@ NULL } PUSH_STATE_GOTO(CURLYM_B, ST.B, locinput); /* match B */ - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case CURLYM_B_fail: /* just failed to match a B */ @@ -7661,8 +7961,8 @@ NULL maxopenparen = ST.paren; ST.min = ARG1(scan); /* min to match */ ST.max = ARG2(scan); /* max to match */ - if (cur_eval && cur_eval->u.eval.close_paren && - cur_eval->u.eval.close_paren == (U32)ST.paren) { + if (EVAL_CLOSE_PAREN_IS_TRUE(cur_eval,(U32)ST.paren)) + { ST.min=1; ST.max=1; } @@ -7724,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); @@ -7761,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); @@ -7780,7 +8080,6 @@ NULL REGCP_SET(ST.cp); goto curly_try_B_max; } - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case CURLY_B_min_known_fail: @@ -7845,18 +8144,15 @@ 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); } CURLY_SETPAREN(ST.paren, ST.count); - if (cur_eval && cur_eval->u.eval.close_paren && - cur_eval->u.eval.close_paren == (U32)ST.paren) { + if (EVAL_CLOSE_PAREN_IS_TRUE(cur_eval,(U32)ST.paren)) goto fake_end; - } PUSH_STATE_GOTO(CURLY_B_min_known, ST.B, locinput); } - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case CURLY_B_min_fail: @@ -7869,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; @@ -7881,23 +8177,18 @@ NULL { curly_try_B_min: CURLY_SETPAREN(ST.paren, ST.count); - if (cur_eval && cur_eval->u.eval.close_paren && - cur_eval->u.eval.close_paren == (U32)ST.paren) { + if (EVAL_CLOSE_PAREN_IS_TRUE(cur_eval,(U32)ST.paren)) goto fake_end; - } PUSH_STATE_GOTO(CURLY_B_min, ST.B, locinput); } } sayNO; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ curly_try_B_max: /* a successful greedy match: now try to match B */ - if (cur_eval && cur_eval->u.eval.close_paren && - cur_eval->u.eval.close_paren == (U32)ST.paren) { + if (EVAL_CLOSE_PAREN_IS_TRUE(cur_eval,(U32)ST.paren)) goto fake_end; - } { bool could_match = locinput < reginfo->strend; @@ -7920,7 +8211,6 @@ NULL if (ST.c1 == CHRTEST_VOID || could_match) { CURLY_SETPAREN(ST.paren, ST.count); PUSH_STATE_GOTO(CURLY_B_max, ST.B, locinput); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ } } @@ -7945,40 +8235,43 @@ NULL fake_end: if (cur_eval) { /* we've just finished A in /(??{A})B/; now continue with B */ - + SET_RECURSE_LOCINPUT("FAKE-END[before]", CUR_EVAL.prev_recurse_locinput); st->u.eval.prev_rex = rex_sv; /* inner */ /* Save *all* the positions. */ - st->u.eval.cp = regcppush(rex, 0, maxopenparen); - rex_sv = cur_eval->u.eval.prev_rex; + 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); rex = ReANY(rex_sv); rexi = RXi_GET(rex); - cur_curlyx = cur_eval->u.eval.prev_curlyx; + + st->u.eval.prev_curlyx = cur_curlyx; + cur_curlyx = CUR_EVAL.prev_curlyx; REGCP_SET(st->u.eval.lastcp); /* Restore parens of the outer rex without popping the * savestack */ - S_regcp_restore(aTHX_ rex, cur_eval->u.eval.lastcp, - &maxopenparen); + regcp_restore(rex, CUR_EVAL.lastcp, &maxopenparen); st->u.eval.prev_eval = cur_eval; - cur_eval = cur_eval->u.eval.prev_eval; + cur_eval = CUR_EVAL.prev_eval; DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, "%*s EVAL trying tail ... %"UVxf"\n", - REPORT_CODE_OFF+depth*2, "",PTR2UV(cur_eval));); + Perl_re_exec_indentf( aTHX_ "EVAL trying tail ... (cur_eval=%p)\n", + depth, cur_eval);); if ( nochange_depth ) nochange_depth--; - PUSH_YES_STATE_GOTO(EVAL_AB, st->u.eval.prev_eval->u.eval.B, + SET_RECURSE_LOCINPUT("FAKE-END[after]", cur_eval->locinput); + + PUSH_YES_STATE_GOTO(EVAL_postponed_AB, st->u.eval.prev_eval->u.eval.B, locinput); /* match B */ } if (locinput < reginfo->till) { - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, - "%sMatch possible, but length=%ld is smaller than requested=%ld, failing!%s\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + "%sMatch possible, but length=%ld is smaller than requested=%ld, failing!%s\n", PL_colors[4], (long)(locinput - startpos), (long)(reginfo->till - startpos), @@ -7990,9 +8283,8 @@ NULL case SUCCEED: /* successful SUSPEND/UNLESSM/IFMATCH/CURLYM */ DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, - "%*s %ssubpattern success...%s\n", - REPORT_CODE_OFF+depth*2, "", PL_colors[4], PL_colors[5])); + Perl_re_exec_indentf( aTHX_ "%ssubpattern success...%s\n", + depth, PL_colors[4], PL_colors[5])); sayYES; /* Success! */ #undef ST @@ -8040,7 +8332,6 @@ NULL /* execute body of (?...A) */ PUSH_YES_STATE_GOTO(IFMATCH_A, NEXTOPER(NEXTOPER(scan)), newstart); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ } @@ -8081,7 +8372,6 @@ NULL if (scan->flags) sv_yes_mark = sv_commit = MUTABLE_SV(rexi->data->data[ ARG( scan ) ]); PUSH_STATE_GOTO(COMMIT_next, next, locinput); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case COMMIT_next_fail: @@ -8102,7 +8392,6 @@ NULL } else { sayNO; } - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ #define ST st->u.mark @@ -8113,13 +8402,11 @@ NULL mark_state = st; ST.mark_loc = locinput; PUSH_YES_STATE_GOTO(MARKPOINT_next, next, locinput); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case MARKPOINT_next: mark_state = ST.prev_mark; sayYES; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case MARKPOINT_next_fail: @@ -8131,9 +8418,8 @@ NULL sv_commit = ST.mark_name; DEBUG_EXECUTE_r({ - PerlIO_printf(Perl_debug_log, - "%*s %ssetting cutpoint to mark:%"SVf"...%s\n", - REPORT_CODE_OFF+depth*2, "", + Perl_re_exec_indentf( aTHX_ "%ssetting cutpoint to mark:%" SVf "...%s\n", + depth, PL_colors[4], SVfARG(sv_commit), PL_colors[5]); }); } @@ -8141,7 +8427,6 @@ NULL sv_yes_mark = mark_state ? mark_state->u.mark.mark_name : NULL; sayNO; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ case SKIP: /* (*SKIP) */ @@ -8187,7 +8472,6 @@ NULL } no_final = 1; sayNO; - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ #undef ST @@ -8199,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"); @@ -8209,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; } @@ -8237,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;cur--,curd--) { + for (i = 0; i < 3 && i <= depth; cur--,i++) { if (cur < SLAB_FIRST(slab)) { slab = slab->prev; cur = SLAB_LAST(slab); } - PerlIO_printf(Perl_error_log, "%*s#%-3d %-10s %s\n", - REPORT_CODE_OFF + 2 + depth * 2,"", - curd, PL_reg_name[cur->resume_state], + Perl_re_exec_indentf( aTHX_ "%4s #%-3d %-10s %s\n", + depth, + i ? " " : "push", + depth - i, PL_reg_name[cur->resume_state], (curyes == cur) ? "yes" : "" ); if (curyes == cur) @@ -8268,14 +8554,15 @@ NULL /* NOTREACHED */ } } +#ifdef SOLARIS_BAD_OPTIMIZER +# undef PL_charclass +#endif /* * We get here only if there's trouble -- normally "case END" is * the terminating point. */ Perl_croak(aTHX_ "corrupted regexp pointers"); - /* NOTREACHED */ - sayNO; NOT_REACHED; /* NOTREACHED */ yes: @@ -8320,7 +8607,7 @@ NULL goto reenter_switch; } - DEBUG_EXECUTE_r(PerlIO_printf(Perl_debug_log, "%sMatch successful!%s\n", + DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "%sMatch successful!%s\n", PL_colors[4], PL_colors[5])); if (reginfo->info_aux_eval) { @@ -8341,9 +8628,8 @@ NULL no: DEBUG_EXECUTE_r( - PerlIO_printf(Perl_debug_log, - "%*s %sfailed...%s\n", - REPORT_CODE_OFF+depth*2, "", + Perl_re_exec_indentf( aTHX_ "%sfailed...%s\n", + depth, PL_colors[4], PL_colors[5]) ); @@ -8371,6 +8657,7 @@ NULL yes_state = st->u.yes.prev_yes_state; state_num = st->resume_state + 1; /* failure = success + 1 */ + PERL_ASYNC_CHECK(); goto reenter_switch; } result = 0; @@ -8397,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; @@ -8421,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; @@ -8431,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; @@ -8664,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; @@ -8732,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); @@ -8800,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++; @@ -8809,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++; @@ -8818,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++; @@ -8827,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++; @@ -8836,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++; @@ -8862,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)))) @@ -8914,7 +9213,6 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, default: Perl_croak(aTHX_ "panic: regrepeat() called with unrecognized node type %d='%s'", OP(p), PL_reg_name[OP(p)]); - /* NOTREACHED */ NOT_REACHED; /* NOTREACHED */ } @@ -8930,9 +9228,8 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, DEBUG_EXECUTE_r({ SV * const prop = sv_newmortal(); regprop(prog, prop, p, reginfo, NULL); - PerlIO_printf(Perl_debug_log, - "%*s %s can match %"IVdf" times out of %"IVdf"...\n", - REPORT_CODE_OFF + depth*2, "", SvPVX_const(prop),(IV)c,(IV)max); + Perl_re_exec_indentf( aTHX_ "%s can match %" IVdf " times out of %" IVdf "...\n", + depth, SvPVX_const(prop),(IV)c,(IV)max); }); }); @@ -8990,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); } @@ -9133,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); } } @@ -9209,7 +9507,7 @@ S_reghop4(U8 *s, SSize_t off, const U8* llim, const U8* rlim) * char pos */ STATIC U8 * -S_reghopmaybe3(U8* s, SSize_t off, const U8* lim) +S_reghopmaybe3(U8* s, SSize_t off, const U8* const lim) { PERL_ARGS_ASSERT_REGHOPMAYBE3; @@ -9302,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, @@ -9450,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: */