X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regexec.c;h=e358d63d5f2d5e18fc45aca59ec2d725d460ee8b;hb=76549fefd07754d43beb1146d96596a36d02db09;hp=2420f8d3c98f85bf028d0f031705efd6f0daf68e;hpb=5fcd1c1b5ea5ccb322c2ff87d283f032058dbafe;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/regexec.c b/regexec.c
index 2420f8d..e358d63 100644
--- a/regexec.c
+++ b/regexec.c
@@ -392,7 +392,8 @@ Perl_re_intuit_start(pTHX_ regexp *prog, SV *sv, char *strpos,
 			  && !PL_multiline ) );	/* Check after \n? */
 
 	if (!ml_anch) {
-	  if ( !(prog->reganch & ROPT_ANCH_GPOS) /* Checked by the caller */
+	  if ( !(prog->reganch & (ROPT_ANCH_GPOS /* Checked by the caller */
+				  | ROPT_IMPLICIT)) /* not a real BOL */
 	       /* SvCUR is not set on references: SvRV and SvPVX overlap */
 	       && sv && !SvROK(sv)
 	       && (strpos != strbeg)) {
@@ -950,7 +951,7 @@ S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, char *strend, char *sta
 		else {
 		    U8 *r = reghop3((U8*)s, -1, (U8*)startpos);
 		
-		    tmp = (I32)utf8n_to_uvuni(r, s - (char*)r, 0, 0);
+		    tmp = (I32)utf8n_to_uvchr(r, s - (char*)r, 0, 0);
 		}
 		tmp = ((OP(c) == BOUND ?
 			isALNUM_uni(tmp) : isALNUM_LC_uvchr(UNI_TO_NATIVE(tmp))) != 0);
@@ -993,7 +994,7 @@ S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, char *strend, char *sta
 		else {
 		    U8 *r = reghop3((U8*)s, -1, (U8*)startpos);
 		
-		    tmp = (I32)utf8n_to_uvuni(r, s - (char*)r, 0, 0);
+		    tmp = (I32)utf8n_to_uvchr(r, s - (char*)r, 0, 0);
 		}
 		tmp = ((OP(c) == NBOUND ?
 			isALNUM_uni(tmp) : isALNUM_LC_uvchr(UNI_TO_NATIVE(tmp))) != 0);
@@ -1433,7 +1434,7 @@ Perl_regexec_flags(pTHX_ register regexp *prog, char *stringarg, register char *
     else {
         if (prog->reganch & ROPT_UTF8 && do_utf8) {
 	    U8 *s = reghop3((U8*)stringarg, -1, (U8*)strbeg);
-	    PL_regprev = utf8n_to_uvuni(s, (U8*)stringarg - s, NULL, 0);
+	    PL_regprev = utf8n_to_uvchr(s, (U8*)stringarg - s, NULL, 0);
 	}
 	else
 	    PL_regprev = (U32)stringarg[-1];
@@ -2161,7 +2162,7 @@ S_regmatch(pTHX_ regnode *prog)
 		    if (l >= PL_regeol) {
 			sayNO;
 		    }
-		    if ((UTF ? utf8n_to_uvuni((U8*)s, e - s, 0, 0) : *((U8*)s)) !=
+		    if ((UTF ? utf8n_to_uvchr((U8*)s, e - s, 0, 0) : *((U8*)s)) !=
 			(c1 ? toLOWER_utf8((U8*)l) : toLOWER_LC_utf8((U8*)l)))
 			    sayNO;
 		    s += UTF ? UTF8SKIP(s) : 1;
@@ -2263,7 +2264,7 @@ S_regmatch(pTHX_ regnode *prog)
 		else {
 		    U8 *r = reghop((U8*)locinput, -1);
 		
-		    ln = utf8n_to_uvuni(r, s - (char*)r, 0, 0);
+		    ln = utf8n_to_uvchr(r, s - (char*)r, 0, 0);
 		}
 		if (OP(scan) == BOUND || OP(scan) == NBOUND) {
 		    ln = isALNUM_uni(ln);
@@ -3245,9 +3246,15 @@ S_regmatch(pTHX_ regnode *prog)
 			    c = utf8_to_uvchr((U8*)PL_reginput, NULL);
 			else
 			    c = UCHARAT(PL_reginput);
+			/* If it could work, try it. */
+		        if (c == c1 || c == c2)
+		        {
+			    TRYPAREN(paren, n, PL_reginput);
+			    REGCP_UNWIND(lastcp);
+		        }
 		    }
 		    /* If it could work, try it. */
-		    if (c1 == -1000 || c == c1 || c == c2)
+		    else if (c1 == -1000)
 		    {
 			TRYPAREN(paren, n, PL_reginput);
 			REGCP_UNWIND(lastcp);