diff options
| author | DJ Delorie <dj@redhat.com> | 2005-04-13 01:05:22 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2005-04-13 01:05:22 +0000 |
| commit | ea7143ac880002c415df7df1d815c6a57736c0f2 (patch) | |
| tree | 74789179c56f8b98cacdf70e1eb438db4e40e1a1 | |
| parent | 18d89c4cd160121fe7127bc6ce8619c02e6a7572 (diff) | |
| download | gdb-ea7143ac880002c415df7df1d815c6a57736c0f2.zip gdb-ea7143ac880002c415df7df1d815c6a57736c0f2.tar.gz gdb-ea7143ac880002c415df7df1d815c6a57736c0f2.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/regex.c | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index d5e97f3..bdede48 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,5 +1,10 @@ 2005-04-12 Gabriel Dos Reis <gdr@integrable-solutions.net> + * regex.c (wcs_re_match_2_internal, byte_re_match_2_internal): + Replace not with negate. + +2005-04-12 Gabriel Dos Reis <gdr@integrable-solutions.net> + * configure.ac: Check declarations for basename, ffs, asprintf, vasprintf. * configure: Regenerate. diff --git a/libiberty/regex.c b/libiberty/regex.c index 7799982..601bbf1 100644 --- a/libiberty/regex.c +++ b/libiberty/regex.c @@ -6172,7 +6172,7 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp, uint32_t nrules; # endif /* _LIBC */ #endif /* WCHAR */ - boolean not = (re_opcode_t) *(p - 1) == charset_not; + boolean negate = (re_opcode_t) *(p - 1) == charset_not; DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : ""); PREFETCH (); @@ -6541,7 +6541,7 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp, if (c == *workp) goto char_set_matched; - not = !not; + negate = !negate; char_set_matched: if (not) goto fail; @@ -6550,11 +6550,11 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp, bit list is a full 32 bytes long. */ if (c < (unsigned) (*p * BYTEWIDTH) && p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) - not = !not; + negate = !negate; p += 1 + *p; - if (!not) goto fail; + if (!negate) goto fail; #undef WORK_BUFFER_SIZE #endif /* WCHAR */ SET_REGS_MATCHED (); @@ -7044,15 +7044,15 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp, else if ((re_opcode_t) p1[3] == charset || (re_opcode_t) p1[3] == charset_not) { - int not = (re_opcode_t) p1[3] == charset_not; + int negate = (re_opcode_t) p1[3] == charset_not; if (c < (unsigned) (p1[4] * BYTEWIDTH) && p1[5 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH))) - not = !not; + negate = !negate; - /* `not' is equal to 1 if c would match, which means + /* `negate' is equal to 1 if c would match, which means that we can't change to pop_failure_jump. */ - if (!not) + if (!negate) { p[-3] = (unsigned char) pop_failure_jump; DEBUG_PRINT1 (" No match => pop_failure_jump.\n"); |