qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(parse_dup_op): Return NULL if dup_elem is NULL, after checking syntax. Optimize. (calc_first): Fix comment. 

(duplicate_node, duplicate_node_closure): Revert 2003-11-24 changes.
This commit is contained in:
Ulrich Drepper 2003-12-22 06:45:04 +00:00
parent f5708cb059
commit 7de661083b
1 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
posix/regcomp.c
View File

@ -1157,7 +1157,7 @@ calc_first (dfa, node)
case OP_CLOSE_EQUIV_CLASS: case OP_CLOSE_EQUIV_CLASS:
case OP_OPEN_CHAR_CLASS: case OP_OPEN_CHAR_CLASS:
case OP_CLOSE_CHAR_CLASS: case OP_CLOSE_CHAR_CLASS:
/* These must not be appeared here. */ /* These must not appear here. */
assert (0); assert (0);
#endif #endif
case END_OF_RE: case END_OF_RE:
@ -1336,8 +1336,6 @@ duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
if (BE (err != REG_NOERROR, 0)) if (BE (err != REG_NOERROR, 0))
return err; return err;
dfa->nexts[clone_node] = dfa->nexts[org_node]; dfa->nexts[clone_node] = dfa->nexts[org_node];
if (clone_dest == -1)
break;
ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
if (BE (ret < 0, 0)) if (BE (ret < 0, 0))
return REG_ESPACE; return REG_ESPACE;
@ -1375,8 +1373,6 @@ duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
err = duplicate_node (&clone_dest, dfa, org_dest, constraint); err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
if (BE (err != REG_NOERROR, 0)) if (BE (err != REG_NOERROR, 0))
return err; return err;
if (clone_dest == -1)
break;
ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
if (BE (ret < 0, 0)) if (BE (ret < 0, 0))
return REG_ESPACE; return REG_ESPACE;
@ -1395,16 +1391,13 @@ duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
err = duplicate_node (&clone_dest, dfa, org_dest, constraint); err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
if (BE (err != REG_NOERROR, 0)) if (BE (err != REG_NOERROR, 0))
return err; return err;
if (clone_dest != -1) ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
{ if (BE (ret < 0, 0))
ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); return REG_ESPACE;
if (BE (ret < 0, 0)) err = duplicate_node_closure (dfa, org_dest, clone_dest,
return REG_ESPACE; root_node, constraint);
err = duplicate_node_closure (dfa, org_dest, clone_dest, if (BE (err != REG_NOERROR, 0))
root_node, constraint); return err;
if (BE (err != REG_NOERROR, 0))
return err;
}
} }
else else
{ {
@ -1419,8 +1412,6 @@ duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
err = duplicate_node (&clone_dest, dfa, org_dest, constraint); err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
if (BE (err != REG_NOERROR, 0)) if (BE (err != REG_NOERROR, 0))
return err; return err;
if (clone_dest == -1)
break;
ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
if (BE (ret < 0, 0)) if (BE (ret < 0, 0))
return REG_ESPACE; return REG_ESPACE;
@ -1460,21 +1451,7 @@ duplicate_node (new_idx, dfa, org_idx, constraint)
int *new_idx, org_idx; int *new_idx, org_idx;
unsigned int constraint; unsigned int constraint;
{ {
int dup_idx; int dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx], 1);
if (dfa->nodes[org_idx].type == CHARACTER
&& (((constraint & NEXT_WORD_CONSTRAINT)
&& !dfa->nodes[org_idx].word_char)
|| ((constraint & NEXT_NOTWORD_CONSTRAINT)
&& dfa->nodes[org_idx].word_char)))
{
/* \<!, \>W etc. can never match. Don't duplicate them, instead
tell the caller they shouldn't be added to edests. */
*new_idx = -1;
return REG_NOERROR;
}
dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx], 1);
if (BE (dup_idx == -1, 0)) if (BE (dup_idx == -1, 0))
return REG_ESPACE; return REG_ESPACE;
dfa->nodes[dup_idx].constraint = constraint; dfa->nodes[dup_idx].constraint = constraint;
@ -2443,23 +2420,23 @@ parse_dup_op (dup_elem, regexp, dfa, token, syntax, err)
else else
goto parse_dup_op_ebrace; goto parse_dup_op_ebrace;
} }
if (BE (start == 0 && end == 0, 0)) if (BE ((start == 0 && end == 0) || tree == NULL, 0))
{ {
/* We treat "<re>{0}" and "<re>{0,0}" as null string. */ /* We treat "<re>{0}" and "<re>{0,0}" as null string.
Similarly "<re>{0}{m,n}". */
fetch_token (token, regexp, syntax); fetch_token (token, regexp, syntax);
return NULL; return NULL;
} }
/* Extract "<re>{n,m}" to "<re><re>...<re><re>{0,<m-n>}". */ /* Extract "<re>{n,m}" to "<re><re>...<re><re>{0,<m-n>}". */
elem = tree; elem = tree;
for (i = 0; i < start; ++i) for (i = 1; i < start; ++i)
if (i != 0) {
{ work_tree = duplicate_tree (elem, dfa);
work_tree = duplicate_tree (elem, dfa); tree = create_tree (dfa, tree, work_tree, CONCAT, 0);
tree = create_tree (dfa, tree, work_tree, CONCAT, 0); if (BE (work_tree == NULL || tree == NULL, 0))
if (BE (work_tree == NULL || tree == NULL, 0)) goto parse_dup_op_espace;
goto parse_dup_op_espace; }
}
if (end == -1) if (end == -1)
{ {
@ -2516,6 +2493,9 @@ parse_dup_op (dup_elem, regexp, dfa, token, syntax, err)
} }
} }
} }
/* Treat "<re>{0}*" etc. as "<re>{0}". */
else if (tree == NULL)
;
else else
{ {
tree = re_dfa_add_tree_node (dfa, tree, NULL, token); tree = re_dfa_add_tree_node (dfa, tree, NULL, token);