summaryrefslogtreecommitdiff
path: root/regexec.c
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2011-03-10 14:42:20 +0000
committerDavid Mitchell <davem@iabyn.com>2011-03-10 14:48:08 +0000
commit63c0bfd59562325fed2ac5a90088ed40960ac2ad (patch)
tree3915d34c257a3b16b092791cda9238f92757f903 /regexec.c
parent57f9c425c249cfe53b33bcbe742b99a3d3357d77 (diff)
downloadperl-63c0bfd59562325fed2ac5a90088ed40960ac2ad.tar.gz
Revert "regexec.c: don't try accessing non-bitmap if doesn't exist"
This reverts commit ac51e94be5daabecdeb0ed734f3ccc059b7b77e3. This commit made many of the re/*.t tests fail, on my build at least. Haven't looked at why, just reverting it for the moment.
Diffstat (limited to 'regexec.c')
-rw-r--r--regexec.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/regexec.c b/regexec.c
index 56b906cf2a..76784ee97f 100644
--- a/regexec.c
+++ b/regexec.c
@@ -6597,12 +6597,11 @@ S_reginclass(pTHX_ const regexp * const prog, register const regnode * const n,
if (utf8_target && (flags & ANYOF_UNICODE_ALL) && c >= 256) {
match = TRUE; /* Everything above 255 matches */
}
- else if (ANYOF_NONBITMAP(n)
- && (flags & ANYOF_NONBITMAP_NON_UTF8)
- || (utf8_target
- && (c >=256
- || (! (flags & ANYOF_LOCALE))
- || (flags & ANYOF_IS_SYNTHETIC))))
+ else if ((flags & ANYOF_NONBITMAP_NON_UTF8
+ || (utf8_target && ANYOF_NONBITMAP(n)
+ && (c >=256
+ || (! (flags & ANYOF_LOCALE))
+ || (flags & ANYOF_IS_SYNTHETIC)))))
{
AV *av;
SV * const sw = regclass_swash(prog, n, TRUE, 0, (SV**)&av);