diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-10-22 13:10:30 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-10-22 13:34:00 +0000 |
| commit | 2d4da30fdefbcdb065d4b1f48f2a77d06f69e3c3 (patch) | |
| tree | 3f50180297054aeecd0b478e5f7260366b304c71 /lib/regexec.c | |
| parent | 139ef2d17c98488fc8e5444bf642699f2ad09e08 (diff) | |
| download | guile-2d4da30fdefbcdb065d4b1f48f2a77d06f69e3c3.tar.gz | |
Update Gnulib to v0.1-603-g1d16a7b
Diffstat (limited to 'lib/regexec.c')
| -rw-r--r-- | lib/regexec.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/regexec.c b/lib/regexec.c index 05a8e807e..db50a564a 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -3776,6 +3776,10 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state, one collating element like '.', '[a-z]', opposite to the other nodes can only accept one byte. */ +# ifdef _LIBC +# include <locale/weight.h> +# endif + static int internal_function check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, @@ -3895,8 +3899,6 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, const int32_t *table, *indirect; const unsigned char *weights, *extra; const char *collseqwc; - /* This #include defines a local function! */ -# include <locale/weight.h> /* match with collating_symbol? */ if (cset->ncoll_syms) @@ -3953,7 +3955,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB); indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB); - int32_t idx = findidx (&cp, elem_len); + int32_t idx = findidx (table, indirect, extra, &cp, elem_len); if (idx > 0) for (i = 0; i < cset->nequiv_classes; ++i) { |