summaryrefslogtreecommitdiff
path: root/regexec.c
diff options
context:
space:
mode:
authorKarl Williamson <public@khwilliamson.com>2011-02-09 10:34:02 -0700
committerKarl Williamson <public@khwilliamson.com>2011-02-14 08:41:37 -0700
commitb1e3e569b09fd7f24fa3e311cdf8e3d3d8ca931a (patch)
treec0a6339a31d292362692d5efeb8804fb4dd06018 /regexec.c
parent4e8910e0d628df764d87388af5830fb98b646135 (diff)
downloadperl-b1e3e569b09fd7f24fa3e311cdf8e3d3d8ca931a.tar.gz
regexec.c: Give context for ANYOFV call
This converts one case where ANYOFV is now usable to allow it to match more than one character.
Diffstat (limited to 'regexec.c')
-rw-r--r--regexec.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/regexec.c b/regexec.c
index 8886c25712..58fc358ab8 100644
--- a/regexec.c
+++ b/regexec.c
@@ -1465,10 +1465,9 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s,
case ANYOFV:
case ANYOF:
if (utf8_target || OP(c) == ANYOFV) {
- REXEC_FBC_UTF8_CLASS_SCAN((ANYOF_FLAGS(c) & ANYOF_NONBITMAP) ||
- !UTF8_IS_INVARIANT((U8)s[0]) ?
- reginclass(prog, c, (U8*)s, 0, utf8_target) :
- REGINCLASS(prog, c, (U8*)s));
+ STRLEN inclasslen = strend - s;
+ REXEC_FBC_UTF8_CLASS_SCAN(
+ reginclass(prog, c, (U8*)s, &inclasslen, utf8_target));
}
else {
while (s < strend) {