diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-11-18 23:57:34 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-11-18 23:57:34 +0000 |
| commit | c06a6956a40a878fdbe319e4688196e7c990bf7a (patch) | |
| tree | fee7b24f6276363e8b1f0e977231b413f9eb2fbf /posix/regex_internal.h | |
| parent | 1b1d36792e9d9c4ad9a67ad8bfc1a3be8f2104c1 (diff) | |
| download | glibc-c06a6956a40a878fdbe319e4688196e7c990bf7a.zip glibc-c06a6956a40a878fdbe319e4688196e7c990bf7a.tar.gz glibc-c06a6956a40a878fdbe319e4688196e7c990bf7a.tar.bz2 | |
[BZ #544]
Update.
2004-11-18 Jakub Jelinek <jakub@redhat.com>
[BZ #544]
* posix/regex.h (RE_NO_SUB): New define.
* posix/regex_internal.h (OP_DELETED_SUBEXP): New.
(re_dfa_t): Add subexp_map.
* posix/regcomp.c (struct subexp_optimize): New type.
(optimize_subexps): New routine.
(re_compile_internal): Call it.
(re_compile_pattern): Set preg->no_sub to 1 if RE_NO_SUB.
(free_dfa_content): Free subexp_map.
(calc_inveclosure, calc_eclosure): Skip OP_DELETED_SUBEXP
nodes.
* posix/regexec.c (re_search_internal): If subexp_map
is not NULL, duplicate registers as needed.
* posix/Makefile: Add rules to build and run tst-regex2.
* posix/tst-regex2.c: New test.
* posix/rxspencer/tests: Fix last two tests (\0 -> \1).
Add some new tests for nested subexpressions.
Diffstat (limited to 'posix/regex_internal.h')
| -rw-r--r-- | posix/regex_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/posix/regex_internal.h b/posix/regex_internal.h index 14d95a5..a778032 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -189,6 +189,7 @@ typedef enum OP_DUP_PLUS = EPSILON_BIT | 4, OP_DUP_QUESTION = EPSILON_BIT | 5, ANCHOR = EPSILON_BIT | 6, + OP_DELETED_SUBEXP = EPSILON_BIT | 7, /* Tree type, these are used only by tree. */ CONCAT = 16, @@ -644,6 +645,7 @@ struct re_dfa_t int mb_cur_max; bitset word_char; reg_syntax_t syntax; + int *subexp_map; #ifdef DEBUG char* re_str; #endif |