Mercurial > hg > octave-lojdl > gnulib-hg
changeset 17240:551d91bcca65
regex: simplify based on Gawk version
* lib/regex_internal.c (re_dfa_add_node): Simplify.
Reported by Aharon Robbins in
<http://sourceware.org/ml/libc-alpha/2012-12/msg00456.html>.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sun, 30 Dec 2012 14:28:55 -0800 |
| parents | 7f224c8f6c75 |
| children | f21c2ecfb7d1 |
| files | ChangeLog lib/regex_internal.c |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-12-30 Paul Eggert <eggert@cs.ucla.edu> + + regex: simplify based on Gawk version + * lib/regex_internal.c (re_dfa_add_node): Simplify. + Reported by Aharon Robbins in + <http://sourceware.org/ml/libc-alpha/2012-12/msg00456.html>. + 2012-12-29 Paul Eggert <eggert@cs.ucla.edu> regex: check that pattern char is single-byte
--- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1443,11 +1443,9 @@ dfa->nodes[dfa->nodes_len] = token; dfa->nodes[dfa->nodes_len].constraint = 0; #ifdef RE_ENABLE_I18N - { - int type = token.type; dfa->nodes[dfa->nodes_len].accept_mb = - (type == OP_PERIOD && dfa->mb_cur_max > 1) || type == COMPLEX_BRACKET; - } + ((token.type == OP_PERIOD && dfa->mb_cur_max > 1) + || token.type == COMPLEX_BRACKET); #endif dfa->nexts[dfa->nodes_len] = REG_MISSING; re_node_set_init_empty (dfa->edests + dfa->nodes_len);