From a8067e8f899dc2842aba0780a6943bacb8247c8c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 13 Nov 2003 21:23:11 +0000 Subject: Update. 2003-11-13 Jakub Jelinek * posix/regcomp.c (optimize_utf8): Optimize even if SIMPLE_BRACKET with no bits set for >= 0x80 chars is seen. * posix/bug-regex20.c (tests): Add new tests. Expect [ABC] to be optimized. (main): Run all tests with RE_ICASE as well. --- posix/regcomp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'posix/regcomp.c') diff --git a/posix/regcomp.c b/posix/regcomp.c index a762859f8c..9f56b389df 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -964,7 +964,7 @@ static void optimize_utf8 (dfa) re_dfa_t *dfa; { - int node; + int node, i; for (node = 0; node < dfa->nodes_len; ++node) switch (dfa->nodes[node].type) @@ -999,6 +999,12 @@ optimize_utf8 (dfa) case OP_OPEN_SUBEXP: case OP_CLOSE_SUBEXP: break; + case SIMPLE_BRACKET: + /* Just double check. */ + for (i = 0x80 / UINT_BITS; i < BITSET_UINTS; ++i) + if (dfa->nodes[node].opr.sbcset[i]) + return; + break; default: return; } -- cgit 1.4.1