aboutsummaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-11-27 05:32:46 +0000
committerUlrich Drepper <drepper@redhat.com>2003-11-27 05:32:46 +0000
commit46bf9de7b17d4539a19b69bd8407d5d2987b034b (patch)
treef6bcb23cd15c8fdd38ad7ed1aa058d2394355f9e /posix
parent5cb48b84921ed301dc1cc6f6e35b8ce8ed72a430 (diff)
downloadglibc-46bf9de7b17d4539a19b69bd8407d5d2987b034b.zip
glibc-46bf9de7b17d4539a19b69bd8407d5d2987b034b.tar.gz
glibc-46bf9de7b17d4539a19b69bd8407d5d2987b034b.tar.bz2
Update.
2003-11-26 Jakub Jelinek <jakub@redhat.com> * posix/regexec.c (check_subexp_limits): Only check close subexpression limitation if one is found. Formatting. (sift_states_backward, check_arrival, check_arrival_add_next_nodes): Formatting. * posix/bug-regex11.c (tests): Enable most #ifdefed out tests. Add new test.
Diffstat (limited to 'posix')
-rw-r--r--posix/bug-regex11.c6
-rw-r--r--posix/regexec.c54
2 files changed, 33 insertions, 27 deletions
diff --git a/posix/bug-regex11.c b/posix/bug-regex11.c
index a9c319e..44b4d92 100644
--- a/posix/bug-regex11.c
+++ b/posix/bug-regex11.c
@@ -63,14 +63,16 @@ struct
{ "()(b)c\\2", "bcb", REG_EXTENDED, 3, { { 0, 3 }, { 0, 0 }, { 0, 1 } } },
{ "a(b)()c\\1", "abcb", REG_EXTENDED, 3, { { 0, 4 }, { 1, 2 }, { 2, 2 } } },
{ "a()(b)c\\2", "abcb", REG_EXTENDED, 3, { { 0, 4 }, { 1, 1 }, { 1, 2 } } },
-#if 0
- /* XXX Not used since they fail so far. */
{ "()(b)\\1c\\2", "bcb", REG_EXTENDED, 3, { { 0, 3 }, { 0, 0 }, { 0, 1 } } },
{ "(b())\\2\\1", "bbbb", REG_EXTENDED, 3, { { 0, 2 }, { 0, 1 }, { 1, 1 } } },
{ "a()(b)\\1c\\2", "abcb", REG_EXTENDED, 3, { { 0, 4 }, { 1, 1 }, { 1, 2 } } },
{ "a()d(b)\\1c\\2", "adbcb", REG_EXTENDED, 3, { { 0, 5 }, { 1, 1 }, { 2, 3 } } },
{ "a(b())\\2\\1", "abbbb", REG_EXTENDED, 3, { { 0, 3 }, { 1, 2 }, { 2, 2 } } },
{ "(bb())\\2\\1", "bbbb", REG_EXTENDED, 3, { { 0, 4 }, { 0, 2 }, { 2, 2 } } },
+ { "^(.?)(.?)(.?)(.?)(.?).?\\5\\4\\3\\2\\1$",
+ "level", REG_NOSUB | REG_EXTENDED, 0, { { -1, -1 } } },
+#if 0
+ /* XXX Not used since they fail so far. */
{ "^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?).?\\9\\8\\7\\6\\5\\4\\3\\2\\1$",
"level", REG_NOSUB | REG_EXTENDED, 0, { { -1, -1 } } },
#endif
diff --git a/posix/regexec.c b/posix/regexec.c
index 9720879..53f49ea 100644
--- a/posix/regexec.c
+++ b/posix/regexec.c
@@ -1439,7 +1439,7 @@ sift_states_backward (preg, mctx, sctx)
int naccepted = 0;
re_token_type_t type = dfa->nodes[prev_node].type;
- if (IS_EPSILON_NODE(type))
+ if (IS_EPSILON_NODE (type))
continue;
#ifdef RE_ENABLE_I18N
/* If the node may accept `multi byte'. */
@@ -1836,7 +1836,7 @@ check_subexp_limits (dfa, dest_nodes, candidates, limits, bkref_ents, str_idx)
for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
{
int node = dest_nodes->elems[node_idx];
- re_token_type_t type= dfa->nodes[node].type;
+ re_token_type_t type = dfa->nodes[node].type;
if (type == OP_OPEN_SUBEXP
&& subexp_idx == dfa->nodes[node].opr.idx)
ops_node = node;
@@ -1849,34 +1849,38 @@ check_subexp_limits (dfa, dest_nodes, candidates, limits, bkref_ents, str_idx)
/* Note that (ent->subexp_to = str_idx != ent->subexp_from). */
if (ops_node >= 0)
{
- err = sub_epsilon_src_nodes(dfa, ops_node, dest_nodes,
- candidates);
+ err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes,
+ candidates);
if (BE (err != REG_NOERROR, 0))
return err;
}
+
/* Check the limitation of the close subexpression. */
- for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
- {
- int node = dest_nodes->elems[node_idx];
- if (!re_node_set_contains (dfa->inveclosures + node, cls_node)
- && !re_node_set_contains (dfa->eclosures + node, cls_node))
- {
- /* It is against this limitation.
- Remove it form the current sifted state. */
- err = sub_epsilon_src_nodes(dfa, node, dest_nodes,
- candidates);
- if (BE (err != REG_NOERROR, 0))
- return err;
- --node_idx;
- }
- }
+ if (cls_node >= 0)
+ for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
+ {
+ int node = dest_nodes->elems[node_idx];
+ if (!re_node_set_contains (dfa->inveclosures + node,
+ cls_node)
+ && !re_node_set_contains (dfa->eclosures + node,
+ cls_node))
+ {
+ /* It is against this limitation.
+ Remove it form the current sifted state. */
+ err = sub_epsilon_src_nodes (dfa, node, dest_nodes,
+ candidates);
+ if (BE (err != REG_NOERROR, 0))
+ return err;
+ --node_idx;
+ }
+ }
}
else /* (ent->subexp_to != str_idx) */
{
for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
{
int node = dest_nodes->elems[node_idx];
- re_token_type_t type= dfa->nodes[node].type;
+ re_token_type_t type = dfa->nodes[node].type;
if (type == OP_CLOSE_SUBEXP || type == OP_OPEN_SUBEXP)
{
if (subexp_idx != dfa->nodes[node].opr.idx)
@@ -1886,8 +1890,8 @@ check_subexp_limits (dfa, dest_nodes, candidates, limits, bkref_ents, str_idx)
{
/* It is against this limitation.
Remove it form the current sifted state. */
- err = sub_epsilon_src_nodes(dfa, node, dest_nodes,
- candidates);
+ err = sub_epsilon_src_nodes (dfa, node, dest_nodes,
+ candidates);
if (BE (err != REG_NOERROR, 0))
return err;
}
@@ -2756,8 +2760,8 @@ check_arrival (preg, mctx, path, top_node, top_str, last_node, last_str,
}
if (cur_state)
{
- err = check_arrival_add_next_nodes(preg, dfa, mctx, str_idx,
- &cur_state->nodes, &next_nodes);
+ err = check_arrival_add_next_nodes (preg, dfa, mctx, str_idx,
+ &cur_state->nodes, &next_nodes);
if (BE (err != REG_NOERROR, 0))
{
re_node_set_free (&next_nodes);
@@ -2835,7 +2839,7 @@ check_arrival_add_next_nodes (preg, dfa, mctx, str_idx, cur_nodes, next_nodes)
int naccepted = 0;
int cur_node = cur_nodes->elems[cur_idx];
re_token_type_t type = dfa->nodes[cur_node].type;
- if (IS_EPSILON_NODE(type))
+ if (IS_EPSILON_NODE (type))
continue;
#ifdef RE_ENABLE_I18N
/* If the node may accept `multi byte'. */