diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-07 20:03:32 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-02-07 20:03:32 +0200 |
| commit | 4e35a70613a5b5c0a051efb59a52a28048add092 (patch) | |
| tree | c80b037b9b74dd9c1b72aa109fe6f6d328c28447 /regexec.c | |
| parent | 294d1ffbc998de4c13518cc899c019998f51bd23 (diff) | |
| parent | cb4dfe29b4d374925d3bb9aed48cadf8070afc92 (diff) | |
| download | egawk-4e35a70613a5b5c0a051efb59a52a28048add092.tar.gz egawk-4e35a70613a5b5c0a051efb59a52a28048add092.tar.bz2 egawk-4e35a70613a5b5c0a051efb59a52a28048add092.zip | |
Merge branch 'master' into wasted-byte
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2013 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>. @@ -3762,6 +3762,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, int node_idx, @@ -3883,8 +3887,6 @@ check_node_accept_bytes (const re_dfa_t *dfa, int 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) @@ -3940,7 +3942,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, int 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) { |