1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
2003-12-21  Jakub Jelinek  <jakub@redhat.com>

	* posix/regcomp.c (duplicate_node, duplicate_node_closure): Revert
	2003-11-24 changes.
	* posix/regexec.c (group_nodes_into_DFAstates): For CHARACTER with
	NEXT_{,NOT}WORD_CONSTRAINT check word_char bit.
	* posix/bug-regex19.c (tests): Add new tests.

	* posix/regexec.c (check_dst_limits_calc_pos): Fix formatting.

	* posix/regcomp.c (parse_dup_op): Return NULL if dup_elem is NULL,
	after checking syntax.  Optimize.
	(calc_first): Fix comment.
	* posix/bug-regex13.c (tests): Add new tests.
This commit is contained in:
Ulrich Drepper
2003-12-22 06:52:35 +00:00
parent 7de661083b
commit 1cef7b3cae
4 changed files with 72 additions and 18 deletions

View File

@ -34,7 +34,33 @@ static struct
} tests[] = {
{RE_BACKSLASH_ESCAPE_IN_LISTS, "[0\\-9]", "1", -1}, /* It should not match. */
{RE_BACKSLASH_ESCAPE_IN_LISTS, "[0\\-9]", "-", 0}, /* It should match. */
{RE_SYNTAX_POSIX_BASIC, "s1\n.*\ns3", "s1\ns2\ns3", 0}
{RE_SYNTAX_POSIX_BASIC, "s1\n.*\ns3", "s1\ns2\ns3", 0},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}c", "ac", 0},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}c", "abc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}c", "abbc", -1},
/* Nested duplication. */
{RE_SYNTAX_POSIX_EXTENDED, "ab{1}{1}c", "ac", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{1}{1}c", "abc", 0},
{RE_SYNTAX_POSIX_EXTENDED, "ab{1}{1}c", "abbc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{2}{2}c", "ac", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{2}{2}c", "abbc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{2}{2}c", "abbbbc", 0},
{RE_SYNTAX_POSIX_EXTENDED, "ab{2}{2}c", "abbbbbc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}{1}c", "ac", 0},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}{1}c", "abc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}{1}c", "abbc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{1}{0}c", "ac", 0},
{RE_SYNTAX_POSIX_EXTENDED, "ab{1}{0}c", "abc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{1}{0}c", "abbc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}*c", "ac", 0},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}*c", "abc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}*c", "abbc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}?c", "ac", 0},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}?c", "abc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}?c", "abbc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}+c", "ac", 0},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}+c", "abc", -1},
{RE_SYNTAX_POSIX_EXTENDED, "ab{0}+c", "abbc", -1},
};
int