+2004-01-05 Jakub Jelinek <jakub@redhat.com>
+
+ * posix/regcomp.c (regcomp): Fix comment typo.
+ (regfree): Free preg->translate, clear buffer, allocated, fastmap
+ and translate fields.
+
+ * posix/regcomp.c (build_charclass, buld_charclass_op): Change first
+ argument to unsigned RE_TRANSLATE_TYPE.
+ * posix/regex_internal.h (re_string_t): Change trans type to
+ unsigned RE_TRANSLATE_TYPE.
+ * posix/regex_internal.c (re_string_construct_common): Cast
+ trans to unsigned RE_TRANSLATE_TYPE.
+ (re_string_peek_byte_case, re_string_fetch_byte_case): Avoid fast
+ path if pstr->trans. Never translate the character through
+ pstr->trans.
+ * posix/Makefile (tests): Add bug-regex22.
+ (bug-regex22-ENV): Set.
+ * posix/bug-regex22.c: New test.
+
2004-01-02 Paolo Bonzini <bonzini@gnu.org>
* posix/regex_internal.c (re_node_set_add_intersect,
-# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1991-1999, 2000-2003, 2004 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
bug-regex8 bug-regex9 bug-regex10 bug-regex11 bug-regex12 \
bug-regex13 bug-regex14 bug-regex15 bug-regex16 \
bug-regex17 bug-regex18 bug-regex19 bug-regex20 \
- bug-regex21 tst-nice tst-nanosleep transbug tst-rxspencer \
- tst-pcre tst-boost
+ bug-regex21 bug-regex22 tst-nice tst-nanosleep \
+ transbug tst-rxspencer tst-pcre tst-boost
ifeq (yes,$(build-shared))
test-srcs := globtest
tests += wordexp-test tst-exec tst-spawn
bug-regex18-ENV = LOCPATH=$(common-objpfx)localedata
bug-regex19-ENV = LOCPATH=$(common-objpfx)localedata
bug-regex20-ENV = LOCPATH=$(common-objpfx)localedata
+bug-regex22-ENV = LOCPATH=$(common-objpfx)localedata
tst-rxspencer-ARGS = --utf8 rxspencer/tests
tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata
tst-pcre-ARGS = PCRE.tests
--- /dev/null
+/* Test re.translate != NULL.
+ Copyright (C) 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jakub Jelinek <jakub@redhat.com>, 2004.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <ctype.h>
+#include <locale.h>
+#include <regex.h>
+#include <stdio.h>
+#include <string.h>
+
+int
+main (void)
+{
+ struct re_pattern_buffer re;
+ char trans[256];
+ int i, result = 0;
+ const char *s;
+
+ setlocale (LC_ALL, "de_DE.ISO-8859-1");
+
+ for (i = 0; i < 256; ++i)
+ trans[i] = tolower (i);
+
+ re_set_syntax (RE_SYNTAX_POSIX_EGREP);
+
+ memset (&re, 0, sizeof (re));
+ re.translate = trans;
+ s = re_compile_pattern ("\\W", 2, &re);
+
+ if (s != NULL)
+ {
+ printf ("failed to compile pattern \"\\W\": %s\n", s);
+ result = 1;
+ }
+ else
+ {
+ int ret = re_search (&re, "abc.de", 6, 0, 6, NULL);
+ if (ret != 3)
+ {
+ printf ("1st re_search returned %d\n", ret);
+ result = 1;
+ }
+
+ ret = re_search (&re, "\xc4\xd6\xae\xf7", 4, 0, 4, NULL);
+ if (ret != 2)
+ {
+ printf ("2nd re_search returned %d\n", ret);
+ result = 1;
+ }
+ re.translate = NULL;
+ regfree (&re);
+ }
+
+ memset (&re, 0, sizeof (re));
+ re.translate = trans;
+ s = re_compile_pattern ("\\w", 2, &re);
+
+ if (s != NULL)
+ {
+ printf ("failed to compile pattern \"\\w\": %s\n", s);
+ result = 1;
+ }
+ else
+ {
+ int ret = re_search (&re, ".,!abc", 6, 0, 6, NULL);
+ if (ret != 3)
+ {
+ printf ("3rd re_search returned %d\n", ret);
+ result = 1;
+ }
+
+ ret = re_search (&re, "\xae\xf7\xc4\xd6", 4, 0, 4, NULL);
+ if (ret != 2)
+ {
+ printf ("4th re_search returned %d\n", ret);
+ result = 1;
+ }
+ re.translate = NULL;
+ regfree (&re);
+ }
+
+ memset (&re, 0, sizeof (re));
+ re.translate = trans;
+ s = re_compile_pattern ("[[:DIGIT:]]", 2, &re);
+ if (s == NULL)
+ {
+ printf ("compilation of \"[[:DIGIT:]]\" pattern unexpectedly succeeded: %s\n",
+ s);
+ result = 1;
+ }
+
+ return result;
+}
pstr->raw_mbs = (const unsigned char *) str;
pstr->len = len;
pstr->raw_len = len;
- pstr->trans = trans;
+ pstr->trans = (unsigned RE_TRANSLATE_TYPE) trans;
pstr->icase = icase ? 1 : 0;
pstr->mbs_allocated = (trans != NULL || icase);
pstr->mb_cur_max = dfa->mb_cur_max;
int ch, off;
/* Handle the common (easiest) cases first. */
- if (BE (!pstr->icase, 1))
+ if (BE (!pstr->mbs_allocated, 1))
return re_string_peek_byte (pstr, idx);
#ifdef RE_ENABLE_I18N
#endif
ch = pstr->raw_mbs[pstr->raw_mbs_idx + off];
- if (pstr->trans)
- ch = pstr->trans[ch];
#ifdef RE_ENABLE_I18N
/* Ensure that e.g. for tr_TR.UTF-8 BACKSLASH DOTLESS SMALL LETTER I
re_string_fetch_byte_case (pstr)
re_string_t *pstr;
{
- int ch;
-
- if (BE (!pstr->icase, 1))
+ if (BE (!pstr->mbs_allocated, 1))
return re_string_fetch_byte (pstr);
#ifdef RE_ENABLE_I18N
if (pstr->offsets_needed)
{
- int off;
+ int off, ch;
/* For tr_TR.UTF-8 [[:islower:]] there is
[[: CAPITAL LETTER I WITH DOT lower:]] in mbs. Skip
off = pstr->offsets[pstr->cur_idx];
ch = pstr->raw_mbs[pstr->raw_mbs_idx + off];
- if (pstr->trans)
- ch = pstr->trans[ch];
if (! isascii (ch))
return re_string_fetch_byte (pstr);
}
#endif
- ch = pstr->raw_mbs[pstr->raw_mbs_idx + pstr->cur_idx++];
- if (pstr->trans)
- ch = pstr->trans[ch];
- return ch;
+ return pstr->raw_mbs[pstr->raw_mbs_idx + pstr->cur_idx++];
}
static void
the beginning of the input string. */
unsigned int tip_context;
/* The translation passed as a part of an argument of re_compile_pattern. */
- RE_TRANSLATE_TYPE trans;
+ unsigned RE_TRANSLATE_TYPE trans;
/* Copy of re_dfa_t's word_char. */
re_const_bitset_ptr_t word_char;
/* 1 if REG_ICASE. */
projects / platform / upstream / glibc.git / commitdiff