[asperl] integrate mainline changes (untested)

p4raw-id: //depot/asperl@1010

1 files changed, 8 insertions, 6 deletions

diff --git a/regexec.c b/regexec.c
index 9cac0afc13..17a561b8e4 100644
--- a/regexec.c
+++ b/regexec.c
@@ -74,10 +74,12 @@ static I32 regmatch _((regnode *prog));
 static I32 regrepeat _((regnode *p, I32 max));
 static I32 regrepeat_hard _((regnode *p, I32 max, I32 *lp));
 static I32 regtry _((regexp *prog, char *startpos));
+
 static bool reginclass _((char *p, I32 c));
 static CHECKPOINT regcppush _((I32 parenfloor));
 static char * regcppop _((void));
 #endif
+#define REGINCLASS(p,c)  (*(p) ? reginclass(p,c) : ANYOF_TEST(p,c))
 
 STATIC CHECKPOINT
 regcppush(I32 parenfloor)
@@ -383,7 +385,7 @@ regexec_flags(register regexp *prog, char *stringarg, register char *strend, cha
 	case ANYOF:
 	    Class = (char *) OPERAND(c);
 	    while (s < strend) {
-		if (reginclass(Class, *s)) {
+		if (REGINCLASS(Class, *s)) {
 		    if (tmp && regtry(prog, s))
 			goto got_it;
 		    else
@@ -850,7 +852,7 @@ regmatch(regnode *prog)
 	    s = (char *) OPERAND(scan);
 	    if (nextchr < 0)
 		nextchr = UCHARAT(locinput);
-	    if (!reginclass(s, nextchr))
+	    if (!REGINCLASS(s, nextchar))
 		sayNO;
 	    if (!nextchr && locinput >= regeol)
 		sayNO;
@@ -1623,7 +1625,7 @@ regrepeat(regnode *p, I32 max)
 	    scan++;
 	break;
     case ANYOF:
-	while (scan < loceol && reginclass(opnd, *scan))
+	while (scan < loceol && REGINCLASS(opnd, *scan))
 	    scan++;
 	break;
     case ALNUM:
@@ -1734,7 +1736,7 @@ reginclass(register char *p, register I32 c)
     bool match = FALSE;
 
     c &= 0xFF;
-    if (p[1 + (c >> 3)] & (1 << (c & 7)))
+    if (ANYOF_TEST(p, c))
 	match = TRUE;
     else if (flags & ANYOF_FOLD) {
 	I32 cf;
@@ -1744,7 +1746,7 @@ reginclass(register char *p, register I32 c)
 	}
 	else
 	    cf = fold[c];
-	if (p[1 + (cf >> 3)] & (1 << (cf & 7)))
+	if (ANYOF_TEST(p, cf))
 	    match = TRUE;
     }
 
@@ -1760,7 +1762,7 @@ reginclass(register char *p, register I32 c)
 	}
     }
 
-    return match ^ ((flags & ANYOF_INVERT) != 0);
+    return (flags & ANYOF_INVERT) ? !match : match;
 }