Commit 8fb31792 authored by Paul Eggert's avatar Paul Eggert
Browse files

* regex.c (re_match_2_internals): Fix one more "not".

parent abbd1bcf
...@@ -5613,8 +5613,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int ...@@ -5613,8 +5613,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int
if (!not) goto fail; if (!not) goto fail;
d += len; d += len;
break;
} }
break;
/* The beginning of a group is represented by start_memory. /* The beginning of a group is represented by start_memory.
...@@ -6238,8 +6238,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int ...@@ -6238,8 +6238,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int
goto fail; goto fail;
d += len; d += len;
} }
break;
} }
break;
#ifdef emacs #ifdef emacs
case before_dot: case before_dot:
...@@ -6262,18 +6262,21 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int ...@@ -6262,18 +6262,21 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int
case categoryspec: case categoryspec:
case notcategoryspec: case notcategoryspec:
not = (re_opcode_t) *(p - 1) == notcategoryspec;
mcnt = *p++;
DEBUG_PRINT3 ("EXECUTING %scategoryspec %d.\n", not?"not":"", mcnt);
PREFETCH ();
{ {
int len; boolean not = (re_opcode_t) *(p - 1) == notcategoryspec;
re_wchar_t c; mcnt = *p++;
DEBUG_PRINT3 ("EXECUTING %scategoryspec %d.\n",
not?"not":"", mcnt);
PREFETCH ();
GET_CHAR_AFTER (c, d, len); {
if ((!CHAR_HAS_CATEGORY (c, mcnt)) ^ not) int len;
goto fail; re_wchar_t c;
d += len; GET_CHAR_AFTER (c, d, len);
if ((!CHAR_HAS_CATEGORY (c, mcnt)) ^ not)
goto fail;
d += len;
}
} }
break; break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment