gnulib: lib/regcomp.c annotate

annotate lib/regcomp.c @ 6726:af9abbcedfbd

Merge regex changes from libc, removing some of our POSIX-conformance changes that were rejected and redoing them in a less-intrusive way. * lib/regcomp.c (re_compile_internal, init_dfa): Length arg is now size_t, not Idx. All uses changed. (peek_token): Forward decl now says internal_function. (__re_error_msgid, __re_error_msgid_idx): Now static rather than extern with attribute_hidden. (re_compile_pattern) [!defined _LIBC]: Use K&R-style defn. For some reason libc prefers K&R style defns for external functions. (regerror) [!defined _LIBC]: Likewise. (re_set_syntax, re_compile_fastmap, regcomp, regfree, re_comp): (seek_collating_symbol_entry, lookup_collation_sequence_value): (build_range_exp, build_collating_symbol): Use K&R-style defn. (re_compile_fastmap): Use '\0' to memset, not 0. (utf8_sb_map): Make the calculations more obvious. (init_dfa, parse_bracket_exp, build_charclass_op): Call calloc and cast result, as glibc does. (init_word_char, fetch_token, peek_token, peek_token_bracket): (build_range_exp, build_collating_symbol): Now internal functions. * lib/regex.c [!defined _LIBC]: Allow compiling with C++ compilers. * lib/regex.h (__USE_GNU_REGEX): New macro. Don't depend on _REGEX_SOURCE any more; depend on _GNU_SOURCE instead. Don't depend on VMS; depend on __VMS instead, for POSIX namespace cleanness. (regoff_t): Define to ssize_t, not long int. Remove the REG_ macros named below. Instead, make the old names (e.g., RE_BACKSLASH_ESCAPE_IN_LISTS) visible only if __USE_GNU_REGEX. (REG_BACKSLASH_ESCAPE_IN_LISTS): (REG_BK_PLUS_QM, REG_CHAR_CLASSES, REG_CONTEXT_INDEP_ANCHORS): (REG_CONTEXT_INDEP_OPS, REG_CONTEXT_INVALID_OPS): (REG_DOT_NEWLINE, REG_DOT_NOT_NULL, REG_HAT_LISTS_NOT_NEWLINE): (REG_INTERVALS, REG_LIMITED_OPS, REG_NEWLINE_ALT): (REG_NO_BK_BRACES, REG_NO_BK_PARENS, REG_NO_BK_REFS): (REG_NO_BK_VBAR, REG_NO_EMPTY_RANGES): (REG_UNMATCHED_RIGHT_PAREN_ORD, REG_NO_POSIX_BACKTRACKING): (REG_NO_GNU_OPS, REG_DEBUG, REG_INVALID_INTERVAL_ORD): (REG_IGNORE_CASE, REG_CARET_ANCHORS_HERE): (REG_CONTEXT_INVALID_DUP, REG_NO_SUB, REG_SYNTAX_EMACS): (REG_SYNTAX_AWK, REG_SYNTAX_GNU_AWK, REG_SYNTAX_POSIX_AWK): (REG_SYNTAX_GREP, REG_SYNTAX_EGREP, REG_SYNTAX_POSIX_EGREP): (REG_SYNTAX_ED, REG_SYNTAX_SED, _REG_SYNTAX_POSIX_COMMON): (REG_SYNTAX_POSIX_BASIC, REG_SYNTAX_POSIX_MINIMAL_BASIC): (REG_SYNTAX_POSIX_EXTENDED, REG_SYNTAX_POSIX_MINIMAL_EXTENDED): (REG_DUP_MAX, REG_UNALLOCATED, REG_REALLOCATE, REG_FIXED): (REG_NREGS): Remove. All uses replaced by the old RE_* names. (RE_BACKSLASH_ESCAPE_IN_LISTS): (RE_BK_PLUS_QM, RE_CHAR_CLASSES, RE_CONTEXT_INDEP_ANCHORS): (RE_CONTEXT_INDEP_OPS, RE_CONTEXT_INVALID_OPS): (RE_DOT_NEWLINE, RE_DOT_NOT_NULL, RE_HAT_LISTS_NOT_NEWLINE): (RE_INTERVALS, RE_LIMITED_OPS, RE_NEWLINE_ALT): (RE_NO_BK_BRACES, RE_NO_BK_PARENS, RE_NO_BK_REFS): (RE_NO_BK_VBAR, RE_NO_EMPTY_RANGES): (RE_UNMATCHED_RIGHT_PAREN_ORD, RE_NO_POSIX_BACKTRACKING): (RE_NO_GNU_OPS, RE_DEBUG, RE_INVALID_INTERVAL_ORD): (RE_IGNORE_CASE, RE_CARET_ANCHORS_HERE): (RE_CONTEXT_INVALID_DUP, RE_NO_SUB): Don't bother having these macros be independent of each others' values, since they no longer exist in the POSIX name space. Rename the following member names back to their old names, unless !__USE_GNU_REGEX. All uses changed back. (buffer): Renamed from re_buffer. (allocated): Renamed from re_allocated. (used): Renamed from re_used. (syntax): Renamed from re_syntax. (fastmap): Renamed from re_fastmap. (translate): Renamed from re_translate. (can_be_null): Renamed from re_can_be_null. (regs_allocated): Renamed from re_regs_allocated. (fastmap_accurate): Renamed from re_fastmap_accurate. (no_sub): Renamed from re_no_sub. (not_bol): Renamed from re_not_bol. (not_eol): Renamed from re_not_eol. (newline_anchor): Renamed from re_newline_anchor. (num_regs): Renamed from rm_num_regs. (start): Renamed from rm_start. (end): Renamed from rm_end. (free_state): Move up a bit. * lib/regex_internal.h (inline) [__GNUC__ < 3 && defined _LIBC]: #define to be empty. (ASCII_CHARS): New macro, replacing all uses of 0x80 and/or SBC_MAX / 2 when that is what is intended. (SBC_MAX): Define to UCHAR_MAX + 1, not 256. (__re_error_msgid, __re_error_msgid_idx): Remove decls; not needed. (MAX): New macro. (re_xmalloc, re_calloc, re_xrealloc, re_x2realloc): Remove. All uses changed back to re_malloc, etc. It's now the caller's responsibility to check for overflow; all callers changed. (re_alloc_oversized, re_x2alloc_oversized, re_xnmalloc, re_xnrealloc): (re_x2nrealloc): Remove. (free_state): Remove decl. * lib/regexc.c (regexec, re_match, re_search, re_match_2, re_search_2): (re_set_registers, re_exec): Use K&R-style defn. 2006-01-31 Roland McGrath <roland@redhat.com> * lib/regcomp.c (calc_eclosure_iter): Remove dead variables. Reported by Mike Frysinger <vapier@gentoo.org>. 2006-01-15 Andreas Jaeger <aj@suse.de> [BZ #1950] * lib/regex_internal.c (re_string_reconstruct): Adjust for build_wcs_upper_buffer change. (build_wcs_upper_buffer): Change return type. 2005-12-10 Ulrich Drepper <drepper@redhat.com> * lib/regex_internal.h: Include <stdint.h> if available. 2005-12-06 Paolo Bonzini <bonzini@gnu.org> * lib/regex_internal.h (SIZE_MAX): Provide a default definition. 2005-10-14 Ulrich Drepper <drepper@redhat.com> * lib/regcomp.c: Adjust for changed secondary hash function. 2005-09-30 Ulrich Drepper <drepper@redhat.com> * lib/regex.h: Pretty printing. Clean up namespace a bit. 2005-09-30 Jakub Jelinek <jakub@redhat.com> * lib/regexec.c (update_cur_sifted_state, check_arrival, check_arrival_add_next_nodes): Avoid using uninitialized variable. 2005-09-06 Paul Eggert <eggert@cs.ucla.edu> Ulrich Drepper <drepper@redhat.com> [BZ #1302] * lib/regex_internal.h (bitset_t): Renamed from bitset. All uses changed. (bitset_word_t): Renamed from bitset_word. All uses changed. 2005-09-22 Ulrich Drepper <drepper@redhat.com> [BZ #281] * lib/regex.h: Define RE_TRANSLATE_TYPE as unsigned char *. * lib/regcomp.c: Remove unnecessary uses of unsigned RE_TRANSLATE_TYPE. * lib/regex_internal.h: Likewise. * lib/regex_internal.c: Likewise. * lib/regexec.c: Likewise. Based on a patch by Stepan Kasal <kasal@ucw.cz>. 2005-09-07 Ulrich Drepper <drepper@redhat.com> * lib/regexec.c (find_recover_state): Remove unnecessary initialization. (transit_state_bkref): Make DFA a const pointer. (get_subexp): Likewise. (check_arrival): Likewise. (update_cur_sifted_state): Likewise. (re_search_internal): Likewise. (prune_impossible_nodes): Likewise. (acquire_init_state_context): Likewise. (proceed_next_node): Likewise. (set_regs): Likewise. (free_fail_stack_return): Likewise. (check_arrival_expand_ecl): Mark DFA parameter as const. (check_arrival_expand_ecl_sub): Likewise. (check_subexp_limits): Likewise. (sub_epsilon_src_nodes): Likewise. (add_epsilon_src_nodes): Likewise. (merge_state_array): Likewise. (update_regs): Likewise. (build_trtable): Likewise. (sift_states_backward): Mark MCTX parameter as const. (build_sifted_states): Likewise. (update_cur_sifted_state): Likewise. (sift_states_mkref): Likewise. (check_arrival_expand_ecl): Mark eclosure as const. (check_dst_limits_calc_pos_1): Likewise. * lib/regex_internal.h (re_match_context_t): Make dfa a const pointer. 2005-09-06 Ulrich Drepper <drepper@redhat.com> * lib/regexec.c (merge_state_with_log): Define dfa as const pointer. (transit_state_sb): Likewise. (transit_state_mb): Likewise. (sift_states_iter_mb): Likewise. (check_arrival_add_next_nodes): Likewise. (check_node_accept_bytes): Change first parameter to pointer-to-const. [_LIBC] (re_search_2_stub): Use mempcpy. * lib/regex_internal.c (re_string_reconstruct): Avoid calling mbrtowc for very simple UTF-8 case. * lib/regex_internal.c (re_acquire_state): Make DFA pointer arg a pointer-to-const. (re_acquire_state_context): Likewise. * lib/regex_internal.h: Adjust prototypes. * lib/regex.c: Prevent using C++ compilers. * lib/regex_internal.c (re_acquire_state): Minor code rearrangement. (re_acquire_state_context): Likewise.

author	Paul Eggert <eggert@cs.ucla.edu>
date	Mon, 10 Apr 2006 06:43:33 +0000
parents	2643bd68eb2b
children	c5495b5c3f32

rev	line source
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1 /* Extended regular expression matching and search library.
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2 Copyright (C) 2002,2003,2004,2005,2006 Free Software Foundation, Inc.
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3 This file is part of the GNU C Library.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4 Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	5
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	6 This program is free software; you can redistribute it and/or modify
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	7 it under the terms of the GNU General Public License as published by
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	8 the Free Software Foundation; either version 2, or (at your option)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	9 any later version.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	10
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	11 This program is distributed in the hope that it will be useful,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	12 but WITHOUT ANY WARRANTY; without even the implied warranty of
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	14 GNU General Public License for more details.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	15
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	16 You should have received a copy of the GNU General Public License along
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	17 with this program; if not, write to the Free Software Foundation,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	18 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	19
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	20 static reg_errcode_t re_compile_internal (regex_t preg, const char pattern,
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	21 size_t length, reg_syntax_t syntax);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	22 static void re_compile_fastmap_iter (regex_t *bufp,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	23 const re_dfastate_t *init_state,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	24 char *fastmap);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	25 static reg_errcode_t init_dfa (re_dfa_t *dfa, size_t pat_len);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	26 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	27 static void free_charset (re_charset_t *cset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	28 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	29 static void free_workarea_compile (regex_t *preg);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	30 static reg_errcode_t create_initial_state (re_dfa_t *dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	31 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	32 static void optimize_utf8 (re_dfa_t *dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	33 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	34 static reg_errcode_t analyze (regex_t *preg);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	35 static reg_errcode_t preorder (bin_tree_t *root,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	36 reg_errcode_t (fn (void , bin_tree_t )),
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	37 void *extra);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	38 static reg_errcode_t postorder (bin_tree_t *root,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	39 reg_errcode_t (fn (void , bin_tree_t )),
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	40 void *extra);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	41 static reg_errcode_t optimize_subexps (void extra, bin_tree_t node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	42 static reg_errcode_t lower_subexps (void extra, bin_tree_t node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	43 static bin_tree_t lower_subexp (reg_errcode_t err, regex_t *preg,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	44 bin_tree_t *node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	45 static reg_errcode_t calc_first (void extra, bin_tree_t node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	46 static reg_errcode_t calc_next (void extra, bin_tree_t node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	47 static reg_errcode_t link_nfa_nodes (void extra, bin_tree_t node);
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	48 static Idx duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint);
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	49 static Idx search_duplicated_node (const re_dfa_t *dfa, Idx org_node,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	50 unsigned int constraint);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	51 static reg_errcode_t calc_eclosure (re_dfa_t *dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	52 static reg_errcode_t calc_eclosure_iter (re_node_set new_set, re_dfa_t dfa,
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	53 Idx node, bool root);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	54 static reg_errcode_t calc_inveclosure (re_dfa_t *dfa);
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	55 static Idx fetch_number (re_string_t input, re_token_t token,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	56 reg_syntax_t syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	57 static int peek_token (re_token_t token, re_string_t input,
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	58 reg_syntax_t syntax) internal_function;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	59 static bin_tree_t parse (re_string_t regexp, regex_t *preg,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	60 reg_syntax_t syntax, reg_errcode_t *err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	61 static bin_tree_t parse_reg_exp (re_string_t regexp, regex_t *preg,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	62 re_token_t *token, reg_syntax_t syntax,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	63 Idx nest, reg_errcode_t *err);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	64 static bin_tree_t parse_branch (re_string_t regexp, regex_t *preg,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	65 re_token_t *token, reg_syntax_t syntax,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	66 Idx nest, reg_errcode_t *err);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	67 static bin_tree_t parse_expression (re_string_t regexp, regex_t *preg,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	68 re_token_t *token, reg_syntax_t syntax,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	69 Idx nest, reg_errcode_t *err);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	70 static bin_tree_t parse_sub_exp (re_string_t regexp, regex_t *preg,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	71 re_token_t *token, reg_syntax_t syntax,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	72 Idx nest, reg_errcode_t *err);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	73 static bin_tree_t parse_dup_op (bin_tree_t dup_elem, re_string_t *regexp,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	74 re_dfa_t dfa, re_token_t token,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	75 reg_syntax_t syntax, reg_errcode_t *err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	76 static bin_tree_t parse_bracket_exp (re_string_t regexp, re_dfa_t *dfa,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	77 re_token_t *token, reg_syntax_t syntax,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	78 reg_errcode_t *err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	79 static reg_errcode_t parse_bracket_element (bracket_elem_t *elem,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	80 re_string_t *regexp,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	81 re_token_t *token, int token_len,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	82 re_dfa_t *dfa,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	83 reg_syntax_t syntax,
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	84 bool accept_hyphen);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	85 static reg_errcode_t parse_bracket_symbol (bracket_elem_t *elem,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	86 re_string_t *regexp,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	87 re_token_t *token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	88 #ifdef RE_ENABLE_I18N
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	89 static reg_errcode_t build_equiv_class (bitset_t sbcset,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	90 re_charset_t *mbcset,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	91 Idx *equiv_class_alloc,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	92 const unsigned char *name);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	93 static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	94 bitset_t sbcset,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	95 re_charset_t *mbcset,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	96 Idx *char_class_alloc,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	97 const unsigned char *class_name,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	98 reg_syntax_t syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	99 #else /* not RE_ENABLE_I18N */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	100 static reg_errcode_t build_equiv_class (bitset_t sbcset,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	101 const unsigned char *name);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	102 static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	103 bitset_t sbcset,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	104 const unsigned char *class_name,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	105 reg_syntax_t syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	106 #endif /* not RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	107 static bin_tree_t build_charclass_op (re_dfa_t dfa,
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	108 RE_TRANSLATE_TYPE trans,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	109 const unsigned char *class_name,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	110 const unsigned char *extra,
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	111 bool non_match, reg_errcode_t *err);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	112 static bin_tree_t create_tree (re_dfa_t dfa,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	113 bin_tree_t left, bin_tree_t right,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	114 re_token_type_t type);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	115 static bin_tree_t create_token_tree (re_dfa_t dfa,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	116 bin_tree_t left, bin_tree_t right,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	117 const re_token_t *token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	118 static bin_tree_t duplicate_tree (const bin_tree_t src, re_dfa_t *dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	119 static void free_token (re_token_t *node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	120 static reg_errcode_t free_tree (void extra, bin_tree_t node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	121 static reg_errcode_t mark_opt_subexp (void extra, bin_tree_t node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	122
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	123 /* This table gives an error message for each of the error codes listed
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	124 in regex.h. Obviously the order here has to be same as there.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	125 POSIX doesn't require that we do anything for REG_NOERROR,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	126 but why not be nice? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	127
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	128 static const char __re_error_msgid[] =
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	129 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	130 #define REG_NOERROR_IDX 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	131 gettext_noop ("Success") /* REG_NOERROR */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	132 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	133 #define REG_NOMATCH_IDX (REG_NOERROR_IDX + sizeof "Success")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	134 gettext_noop ("No match") /* REG_NOMATCH */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	135 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	136 #define REG_BADPAT_IDX (REG_NOMATCH_IDX + sizeof "No match")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	137 gettext_noop ("Invalid regular expression") /* REG_BADPAT */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	138 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	139 #define REG_ECOLLATE_IDX (REG_BADPAT_IDX + sizeof "Invalid regular expression")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	140 gettext_noop ("Invalid collation character") /* REG_ECOLLATE */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	141 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	142 #define REG_ECTYPE_IDX (REG_ECOLLATE_IDX + sizeof "Invalid collation character")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	143 gettext_noop ("Invalid character class name") /* REG_ECTYPE */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	144 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	145 #define REG_EESCAPE_IDX (REG_ECTYPE_IDX + sizeof "Invalid character class name")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	146 gettext_noop ("Trailing backslash") /* REG_EESCAPE */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	147 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	148 #define REG_ESUBREG_IDX (REG_EESCAPE_IDX + sizeof "Trailing backslash")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	149 gettext_noop ("Invalid back reference") /* REG_ESUBREG */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	150 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	151 #define REG_EBRACK_IDX (REG_ESUBREG_IDX + sizeof "Invalid back reference")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	152 gettext_noop ("Unmatched [ or [^") /* REG_EBRACK */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	153 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	154 #define REG_EPAREN_IDX (REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	155 gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	156 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	157 #define REG_EBRACE_IDX (REG_EPAREN_IDX + sizeof "Unmatched ( or \\(")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	158 gettext_noop ("Unmatched \\{") /* REG_EBRACE */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	159 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	160 #define REG_BADBR_IDX (REG_EBRACE_IDX + sizeof "Unmatched \\{")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	161 gettext_noop ("Invalid content of \\{\\}") /* REG_BADBR */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	162 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	163 #define REG_ERANGE_IDX (REG_BADBR_IDX + sizeof "Invalid content of \\{\\}")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	164 gettext_noop ("Invalid range end") /* REG_ERANGE */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	165 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	166 #define REG_ESPACE_IDX (REG_ERANGE_IDX + sizeof "Invalid range end")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	167 gettext_noop ("Memory exhausted") /* REG_ESPACE */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	168 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	169 #define REG_BADRPT_IDX (REG_ESPACE_IDX + sizeof "Memory exhausted")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	170 gettext_noop ("Invalid preceding regular expression") /* REG_BADRPT */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	171 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	172 #define REG_EEND_IDX (REG_BADRPT_IDX + sizeof "Invalid preceding regular expression")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	173 gettext_noop ("Premature end of regular expression") /* REG_EEND */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	174 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	175 #define REG_ESIZE_IDX (REG_EEND_IDX + sizeof "Premature end of regular expression")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	176 gettext_noop ("Regular expression too big") /* REG_ESIZE */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	177 "\0"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	178 #define REG_ERPAREN_IDX (REG_ESIZE_IDX + sizeof "Regular expression too big")
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	179 gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	180 };
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	181
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	182 static const size_t __re_error_msgid_idx[] =
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	183 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	184 REG_NOERROR_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	185 REG_NOMATCH_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	186 REG_BADPAT_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	187 REG_ECOLLATE_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	188 REG_ECTYPE_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	189 REG_EESCAPE_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	190 REG_ESUBREG_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	191 REG_EBRACK_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	192 REG_EPAREN_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	193 REG_EBRACE_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	194 REG_BADBR_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	195 REG_ERANGE_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	196 REG_ESPACE_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	197 REG_BADRPT_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	198 REG_EEND_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	199 REG_ESIZE_IDX,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	200 REG_ERPAREN_IDX
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	201 };
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	202
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	203 /* Entry points for GNU code. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	204
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	205 /* re_compile_pattern is the GNU regular expression compiler: it
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	206 compiles PATTERN (of length LENGTH) and puts the result in BUFP.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	207 Returns 0 if the pattern was valid, otherwise an error string.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	208
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	209 Assumes the `allocated' (and perhaps `buffer') and `translate' fields
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	210 are set in BUFP on entry. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	211
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	212 #ifdef _LIBC
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	213 const char *
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	214 re_compile_pattern (pattern, length, bufp)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	215 const char *pattern;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	216 size_t length;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	217 struct re_pattern_buffer *bufp;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	218 #else /* size_t might promote */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	219 const char *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	220 re_compile_pattern (const char *pattern, size_t length,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	221 struct re_pattern_buffer *bufp)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	222 #endif
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	223 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	224 reg_errcode_t ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	225
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	226 /* And GNU code determines whether or not to get register information
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	227 by passing null for the REGS argument to re_match, etc., not by
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	228 setting no_sub, unless RE_NO_SUB is set. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	229 bufp->no_sub = !!(re_syntax_options & RE_NO_SUB);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	230
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	231 /* Match anchors at newline. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	232 bufp->newline_anchor = 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	233
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	234 ret = re_compile_internal (bufp, pattern, length, re_syntax_options);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	235
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	236 if (!ret)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	237 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	238 return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	239 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	240 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	241 weak_alias (__re_compile_pattern, re_compile_pattern)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	242 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	243
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	244 /* Set by `re_set_syntax' to the current regexp syntax to recognize. Can
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	245 also be assigned to arbitrarily: each pattern buffer stores its own
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	246 syntax, so it can be changed between regex compilations. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	247 /* This has no initializer because initialized variables in Emacs
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	248 become read-only after dumping. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	249 reg_syntax_t re_syntax_options;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	250
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	251
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	252 /* Specify the precise syntax of regexps for compilation. This provides
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	253 for compatibility for various utilities which historically have
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	254 different, incompatible syntaxes.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	255
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	256 The argument SYNTAX is a bit mask comprised of the various bits
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	257 defined in regex.h. We return the old syntax. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	258
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	259 reg_syntax_t
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	260 re_set_syntax (syntax)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	261 reg_syntax_t syntax;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	262 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	263 reg_syntax_t ret = re_syntax_options;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	264
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	265 re_syntax_options = syntax;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	266 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	267 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	268 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	269 weak_alias (__re_set_syntax, re_set_syntax)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	270 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	271
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	272 int
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	273 re_compile_fastmap (bufp)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	274 struct re_pattern_buffer *bufp;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	275 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	276 re_dfa_t dfa = (re_dfa_t ) bufp->buffer;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	277 char *fastmap = bufp->fastmap;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	278
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	279 memset (fastmap, '\0', sizeof (char) * SBC_MAX);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	280 re_compile_fastmap_iter (bufp, dfa->init_state, fastmap);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	281 if (dfa->init_state != dfa->init_state_word)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	282 re_compile_fastmap_iter (bufp, dfa->init_state_word, fastmap);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	283 if (dfa->init_state != dfa->init_state_nl)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	284 re_compile_fastmap_iter (bufp, dfa->init_state_nl, fastmap);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	285 if (dfa->init_state != dfa->init_state_begbuf)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	286 re_compile_fastmap_iter (bufp, dfa->init_state_begbuf, fastmap);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	287 bufp->fastmap_accurate = 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	288 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	289 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	290 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	291 weak_alias (__re_compile_fastmap, re_compile_fastmap)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	292 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	293
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	294 static inline void
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	295 __attribute ((always_inline))
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	296 re_set_fastmap (char *fastmap, bool icase, int ch)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	297 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	298 fastmap[ch] = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	299 if (icase)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	300 fastmap[tolower (ch)] = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	301 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	302
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	303 /* Helper function for re_compile_fastmap.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	304 Compile fastmap for the initial_state INIT_STATE. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	305
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	306 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	307 re_compile_fastmap_iter (regex_t bufp, const re_dfastate_t init_state,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	308 char *fastmap)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	309 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	310 re_dfa_t dfa = (re_dfa_t ) bufp->buffer;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	311 Idx node_cnt;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	312 bool icase = (dfa->mb_cur_max == 1 && (bufp->syntax & RE_ICASE));
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	313 for (node_cnt = 0; node_cnt < init_state->nodes.nelem; ++node_cnt)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	314 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	315 Idx node = init_state->nodes.elems[node_cnt];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	316 re_token_type_t type = dfa->nodes[node].type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	317
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	318 if (type == CHARACTER)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	319 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	320 re_set_fastmap (fastmap, icase, dfa->nodes[node].opr.c);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	321 #ifdef RE_ENABLE_I18N
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	322 if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	323 {
6119 c3bf2ea44695 Make regex safe for g++. This fixes one real bug (an "err" Paul Eggert <eggert@cs.ucla.edu> parents: 6104 diff changeset	324 unsigned char buf[MB_LEN_MAX];
c3bf2ea44695 Make regex safe for g++. This fixes one real bug (an "err" Paul Eggert <eggert@cs.ucla.edu> parents: 6104 diff changeset	325 unsigned char *p;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	326 wchar_t wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	327 mbstate_t state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	328
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	329 p = buf;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	330 *p++ = dfa->nodes[node].opr.c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	331 while (++node < dfa->nodes_len
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	332 && dfa->nodes[node].type == CHARACTER
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	333 && dfa->nodes[node].mb_partial)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	334 *p++ = dfa->nodes[node].opr.c;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	335 memset (&state, '\0', sizeof (state));
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	336 if (mbrtowc (&wc, (const char *) buf, p - buf,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	337 &state) == p - buf
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	338 && (__wcrtomb ((char *) buf, towlower (wc), &state)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	339 != (size_t) -1))
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	340 re_set_fastmap (fastmap, false, buf[0]);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	341 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	342 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	343 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	344 else if (type == SIMPLE_BRACKET)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	345 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	346 int i, ch;
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	347 for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	348 {
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	349 int j;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	350 bitset_word_t w = dfa->nodes[node].opr.sbcset[i];
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	351 for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	352 if (w & ((bitset_word_t) 1 << j))
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	353 re_set_fastmap (fastmap, icase, ch);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	354 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	355 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	356 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	357 else if (type == COMPLEX_BRACKET)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	358 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	359 Idx i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	360 re_charset_t *cset = dfa->nodes[node].opr.mbcset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	361 if (cset->non_match \|\| cset->ncoll_syms \|\| cset->nequiv_classes
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	362 \|\| cset->nranges \|\| cset->nchar_classes)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	363 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	364 # ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	365 if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	366 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	367 /* In this case we want to catch the bytes which are
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	368 the first byte of any collation elements.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	369 e.g. In da_DK, we want to catch 'a' since "aa"
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	370 is a valid collation element, and don't catch
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	371 'b' since 'b' is the only collation element
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	372 which starts from 'b'. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	373 const int32_t table = (const int32_t )
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	374 _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	375 for (i = 0; i < SBC_MAX; ++i)
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	376 if (table[i] < 0)
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	377 re_set_fastmap (fastmap, icase, i);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	378 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	379 # else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	380 if (dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	381 for (i = 0; i < SBC_MAX; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	382 if (__btowc (i) == WEOF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	383 re_set_fastmap (fastmap, icase, i);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	384 # endif /* not _LIBC */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	385 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	386 for (i = 0; i < cset->nmbchars; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	387 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	388 char buf[256];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	389 mbstate_t state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	390 memset (&state, '\0', sizeof (state));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	391 if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	392 re_set_fastmap (fastmap, icase, (unsigned char ) buf);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	393 if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	394 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	395 if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	396 != (size_t) -1)
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	397 re_set_fastmap (fastmap, false, (unsigned char ) buf);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	398 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	399 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	400 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	401 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	402 else if (type == OP_PERIOD
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	403 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	404 \|\| type == OP_UTF8_PERIOD
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	405 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	406 \|\| type == END_OF_RE)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	407 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	408 memset (fastmap, '\1', sizeof (char) * SBC_MAX);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	409 if (type == END_OF_RE)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	410 bufp->can_be_null = 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	411 return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	412 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	413 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	414 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	415
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	416 /* Entry point for POSIX code. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	417 /* regcomp takes a regular expression as a string and compiles it.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	418
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	419 PREG is a regex_t *. We do not expect any fields to be initialized,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	420 since POSIX says we shouldn't. Thus, we set
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	421
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	422 `buffer' to the compiled pattern;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	423 `used' to the length of the compiled pattern;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	424 `syntax' to RE_SYNTAX_POSIX_EXTENDED if the
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	425 REG_EXTENDED bit in CFLAGS is set; otherwise, to
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	426 RE_SYNTAX_POSIX_BASIC;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	427 `newline_anchor' to REG_NEWLINE being set in CFLAGS;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	428 `fastmap' to an allocated space for the fastmap;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	429 `fastmap_accurate' to zero;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	430 `re_nsub' to the number of subexpressions in PATTERN.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	431
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	432 PATTERN is the address of the pattern string.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	433
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	434 CFLAGS is a series of bits which affect compilation.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	435
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	436 If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	437 use POSIX basic syntax.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	438
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	439 If REG_NEWLINE is set, then . and [^...] don't match newline.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	440 Also, regexec will try a match beginning after every newline.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	441
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	442 If REG_ICASE is set, then we considers upper- and lowercase
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	443 versions of letters to be equivalent when matching.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	444
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	445 If REG_NOSUB is set, then when PREG is passed to regexec, that
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	446 routine will report only success or failure, and nothing about the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	447 registers.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	448
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	449 It returns 0 if it succeeds, nonzero if it doesn't. (See regex.h for
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	450 the return codes and their meanings.) */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	451
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	452 int
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	453 regcomp (preg, pattern, cflags)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	454 regex_t *__restrict preg;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	455 const char *__restrict pattern;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	456 int cflags;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	457 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	458 reg_errcode_t ret;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	459 reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	460 : RE_SYNTAX_POSIX_BASIC);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	461
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	462 preg->buffer = NULL;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	463 preg->allocated = 0;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	464 preg->used = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	465
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	466 /* Try to allocate space for the fastmap. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	467 preg->fastmap = re_malloc (char, SBC_MAX);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	468 if (BE (preg->fastmap == NULL, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	469 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	470
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	471 syntax \|= (cflags & REG_ICASE) ? RE_ICASE : 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	472
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	473 /* If REG_NEWLINE is set, newlines are treated differently. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	474 if (cflags & REG_NEWLINE)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	475 { /* REG_NEWLINE implies neither . nor [^...] match newline. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	476 syntax &= ~RE_DOT_NEWLINE;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	477 syntax \|= RE_HAT_LISTS_NOT_NEWLINE;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	478 /* It also changes the matching behavior. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	479 preg->newline_anchor = 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	480 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	481 else
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	482 preg->newline_anchor = 0;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	483 preg->no_sub = !!(cflags & REG_NOSUB);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	484 preg->translate = NULL;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	485
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	486 ret = re_compile_internal (preg, pattern, strlen (pattern), syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	487
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	488 /* POSIX doesn't distinguish between an unmatched open-group and an
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	489 unmatched close-group: both are REG_EPAREN. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	490 if (ret == REG_ERPAREN)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	491 ret = REG_EPAREN;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	492
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	493 /* We have already checked preg->fastmap != NULL. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	494 if (BE (ret == REG_NOERROR, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	495 /* Compute the fastmap now, since regexec cannot modify the pattern
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	496 buffer. This function never fails in this implementation. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	497 (void) re_compile_fastmap (preg);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	498 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	499 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	500 /* Some error occurred while compiling the expression. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	501 re_free (preg->fastmap);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	502 preg->fastmap = NULL;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	503 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	504
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	505 return (int) ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	506 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	507 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	508 weak_alias (__regcomp, regcomp)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	509 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	510
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	511 /* Returns a message corresponding to an error code, ERRCODE, returned
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	512 from either regcomp or regexec. We don't use PREG here. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	513
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	514 #ifdef _LIBC
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	515 size_t
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	516 regerror (errcode, preg, errbuf, errbuf_size)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	517 int errcode;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	518 const regex_t *__restrict preg;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	519 char *__restrict errbuf;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	520 size_t errbuf_size;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	521 #else /* size_t might promote */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	522 size_t
6104 1e308ce32c4c * config/srclist.txt: Add glibc bug 1240. Paul Eggert <eggert@cs.ucla.edu> parents: 6101 diff changeset	523 regerror (int errcode, const regex_t *__restrict preg,
1e308ce32c4c * config/srclist.txt: Add glibc bug 1240. Paul Eggert <eggert@cs.ucla.edu> parents: 6101 diff changeset	524 char *__restrict errbuf, size_t errbuf_size)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	525 #endif
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	526 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	527 const char *msg;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	528 size_t msg_size;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	529
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	530 if (BE (errcode < 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	531 \|\| errcode >= (int) (sizeof (__re_error_msgid_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	532 / sizeof (__re_error_msgid_idx[0])), 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	533 /* Only error codes returned by the rest of the code should be passed
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	534 to this routine. If we are given anything else, or if other regex
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	535 code generates an invalid error code, then the program has a bug.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	536 Dump core so we can fix it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	537 abort ();
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	538
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	539 msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	540
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	541 msg_size = strlen (msg) + 1; /* Includes the null. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	542
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	543 if (BE (errbuf_size != 0, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	544 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	545 if (BE (msg_size > errbuf_size, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	546 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	547 #if defined HAVE_MEMPCPY \|\| defined _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	548 ((char ) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	549 #else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	550 memcpy (errbuf, msg, errbuf_size - 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	551 errbuf[errbuf_size - 1] = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	552 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	553 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	554 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	555 memcpy (errbuf, msg, msg_size);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	556 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	557
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	558 return msg_size;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	559 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	560 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	561 weak_alias (__regerror, regerror)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	562 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	563
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	564
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	565 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	566 /* This static array is used for the map to single-byte characters when
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	567 UTF-8 is used. Otherwise we would allocate memory just to initialize
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	568 it the same all the time. UTF-8 is the preferred encoding so this is
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	569 a worthwhile optimization. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	570 static const bitset_t utf8_sb_map =
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	571 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	572 /* Set the first 128 bits. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	573 # if 4 * BITSET_WORD_BITS < ASCII_CHARS
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	574 # error "bitset_word_t is narrower than 32 bits"
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	575 # elif 3 * BITSET_WORD_BITS < ASCII_CHARS
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	576 BITSET_WORD_MAX, BITSET_WORD_MAX, BITSET_WORD_MAX,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	577 # elif 2 * BITSET_WORD_BITS < ASCII_CHARS
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	578 BITSET_WORD_MAX, BITSET_WORD_MAX,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	579 # elif 1 * BITSET_WORD_BITS < ASCII_CHARS
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	580 BITSET_WORD_MAX,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	581 # endif
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	582 (BITSET_WORD_MAX
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	583 >> (SBC_MAX % BITSET_WORD_BITS == 0
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	584 ? 0
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	585 : BITSET_WORD_BITS - SBC_MAX % BITSET_WORD_BITS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	586 };
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	587 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	588
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	589
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	590 static void
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	591 free_dfa_content (re_dfa_t *dfa)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	592 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	593 Idx i, j;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	594
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	595 if (dfa->nodes)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	596 for (i = 0; i < dfa->nodes_len; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	597 free_token (dfa->nodes + i);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	598 re_free (dfa->nexts);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	599 for (i = 0; i < dfa->nodes_len; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	600 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	601 if (dfa->eclosures != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	602 re_node_set_free (dfa->eclosures + i);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	603 if (dfa->inveclosures != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	604 re_node_set_free (dfa->inveclosures + i);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	605 if (dfa->edests != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	606 re_node_set_free (dfa->edests + i);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	607 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	608 re_free (dfa->edests);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	609 re_free (dfa->eclosures);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	610 re_free (dfa->inveclosures);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	611 re_free (dfa->nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	612
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	613 if (dfa->state_table)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	614 for (i = 0; i <= dfa->state_hash_mask; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	615 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	616 struct re_state_table_entry *entry = dfa->state_table + i;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	617 for (j = 0; j < entry->num; ++j)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	618 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	619 re_dfastate_t *state = entry->array[j];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	620 free_state (state);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	621 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	622 re_free (entry->array);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	623 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	624 re_free (dfa->state_table);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	625 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	626 if (dfa->sb_char != utf8_sb_map)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	627 re_free (dfa->sb_char);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	628 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	629 re_free (dfa->subexp_map);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	630 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	631 re_free (dfa->re_str);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	632 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	633
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	634 re_free (dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	635 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	636
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	637
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	638 /* Free dynamically allocated space used by PREG. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	639
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	640 void
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	641 regfree (preg)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	642 regex_t *preg;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	643 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	644 re_dfa_t dfa = (re_dfa_t ) preg->buffer;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	645 if (BE (dfa != NULL, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	646 free_dfa_content (dfa);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	647 preg->buffer = NULL;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	648 preg->allocated = 0;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	649
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	650 re_free (preg->fastmap);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	651 preg->fastmap = NULL;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	652
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	653 re_free (preg->translate);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	654 preg->translate = NULL;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	655 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	656 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	657 weak_alias (__regfree, regfree)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	658 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	659
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	660 /* Entry points compatible with 4.2 BSD regex library. We don't define
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	661 them unless specifically requested. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	662
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	663 #if defined _REGEX_RE_COMP \|\| defined _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	664
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	665 /* BSD has one and only one pattern buffer. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	666 static struct re_pattern_buffer re_comp_buf;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	667
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	668 char *
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	669 # ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	670 /* Make these definitions weak in libc, so POSIX programs can redefine
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	671 these names if they don't use our functions, and still use
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	672 regcomp/regexec above without link errors. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	673 weak_function
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	674 # endif
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	675 re_comp (s)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	676 const char *s;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	677 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	678 reg_errcode_t ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	679 char *fastmap;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	680
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	681 if (!s)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	682 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	683 if (!re_comp_buf.buffer)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	684 return gettext ("No previous regular expression");
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	685 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	686 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	687
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	688 if (re_comp_buf.buffer)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	689 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	690 fastmap = re_comp_buf.fastmap;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	691 re_comp_buf.fastmap = NULL;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	692 __regfree (&re_comp_buf);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	693 memset (&re_comp_buf, '\0', sizeof (re_comp_buf));
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	694 re_comp_buf.fastmap = fastmap;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	695 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	696
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	697 if (re_comp_buf.fastmap == NULL)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	698 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	699 re_comp_buf.fastmap = (char *) malloc (SBC_MAX);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	700 if (re_comp_buf.fastmap == NULL)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	701 return (char *) gettext (__re_error_msgid
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	702 + __re_error_msgid_idx[(int) REG_ESPACE]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	703 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	704
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	705 /* Since `re_exec' always passes NULL for the `regs' argument, we
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	706 don't need to initialize the pattern buffer fields which affect it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	707
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	708 /* Match anchors at newlines. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	709 re_comp_buf.newline_anchor = 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	710
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	711 ret = re_compile_internal (&re_comp_buf, s, strlen (s), re_syntax_options);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	712
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	713 if (!ret)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	714 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	715
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	716 /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	717 return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	718 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	719
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	720 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	721 libc_freeres_fn (free_mem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	722 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	723 __regfree (&re_comp_buf);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	724 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	725 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	726
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	727 #endif /* _REGEX_RE_COMP */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	728
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	729 /* Internal entry point.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	730 Compile the regular expression PATTERN, whose length is LENGTH.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	731 SYNTAX indicate regular expression's syntax. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	732
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	733 static reg_errcode_t
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	734 re_compile_internal (regex_t preg, const char pattern, size_t length,
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	735 reg_syntax_t syntax)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	736 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	737 reg_errcode_t err = REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	738 re_dfa_t *dfa;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	739 re_string_t regexp;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	740
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	741 /* Initialize the pattern buffer. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	742 preg->fastmap_accurate = 0;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	743 preg->syntax = syntax;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	744 preg->not_bol = preg->not_eol = 0;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	745 preg->used = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	746 preg->re_nsub = 0;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	747 preg->can_be_null = 0;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	748 preg->regs_allocated = REGS_UNALLOCATED;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	749
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	750 /* Initialize the dfa. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	751 dfa = (re_dfa_t *) preg->buffer;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	752 if (BE (preg->allocated < sizeof (re_dfa_t), 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	753 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	754 /* If zero allocated, but buffer is non-null, try to realloc
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	755 enough space. This loses if buffer's address is bogus, but
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	756 that is the user's responsibility. If ->buffer is NULL this
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	757 is a simple allocation. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	758 dfa = re_realloc (preg->buffer, re_dfa_t, 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	759 if (dfa == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	760 return REG_ESPACE;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	761 preg->allocated = sizeof (re_dfa_t);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	762 preg->buffer = (unsigned char *) dfa;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	763 }
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	764 preg->used = sizeof (re_dfa_t);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	765
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	766 err = init_dfa (dfa, length);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	767 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	768 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	769 free_dfa_content (dfa);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	770 preg->buffer = NULL;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	771 preg->allocated = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	772 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	773 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	774 #ifdef DEBUG
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	775 /* Note: length+1 will not overflow since it is checked in init_dfa. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	776 dfa->re_str = re_malloc (char, length + 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	777 strncpy (dfa->re_str, pattern, length + 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	778 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	779
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	780 __libc_lock_init (dfa->lock);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	781
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	782 err = re_string_construct (&regexp, pattern, length, preg->translate,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	783 syntax & RE_ICASE, dfa);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	784 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	785 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	786 re_compile_internal_free_return:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	787 free_workarea_compile (preg);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	788 re_string_destruct (&regexp);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	789 free_dfa_content (dfa);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	790 preg->buffer = NULL;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	791 preg->allocated = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	792 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	793 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	794
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	795 /* Parse the regular expression, and build a structure tree. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	796 preg->re_nsub = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	797 dfa->str_tree = parse (&regexp, preg, syntax, &err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	798 if (BE (dfa->str_tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	799 goto re_compile_internal_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	800
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	801 /* Analyze the tree and create the nfa. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	802 err = analyze (preg);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	803 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	804 goto re_compile_internal_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	805
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	806 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	807 /* If possible, do searching in single byte encoding to speed things up. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	808 if (dfa->is_utf8 && !(syntax & RE_ICASE) && preg->translate == NULL)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	809 optimize_utf8 (dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	810 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	811
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	812 /* Then create the initial state of the dfa. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	813 err = create_initial_state (dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	814
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	815 /* Release work areas. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	816 free_workarea_compile (preg);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	817 re_string_destruct (&regexp);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	818
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	819 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	820 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	821 free_dfa_content (dfa);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	822 preg->buffer = NULL;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	823 preg->allocated = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	824 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	825
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	826 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	827 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	828
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	829 /* Initialize DFA. We use the length of the regular expression PAT_LEN
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	830 as the initial length of some arrays. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	831
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	832 static reg_errcode_t
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	833 init_dfa (re_dfa_t *dfa, size_t pat_len)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	834 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	835 __re_size_t table_size;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	836 #ifndef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	837 char *codeset_name;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	838 #endif
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	839 size_t max_object_size =
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	840 MAX (sizeof (struct re_state_table_entry),
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	841 MAX (sizeof (re_token_t),
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	842 MAX (sizeof (re_node_set),
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	843 MAX (sizeof (regmatch_t),
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	844 MAX (sizeof (regoff_t),
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	845 MAX (sizeof (wchar_t),
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	846 MAX (sizeof (wctype_t),
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	847 sizeof (Idx))))))));
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	848
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	849 memset (dfa, '\0', sizeof (re_dfa_t));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	850
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	851 /* Force allocation of str_tree_storage the first time. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	852 dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	853
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	854 /* Avoid overflows. The extra "/ 2" is for the table_size doubling
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	855 calculation below, and for similar doubling calculations
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	856 elsewhere. And it's <= rather than <, because some of the
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	857 doubling calculations add 1 afterwards. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	858 if (BE (SIZE_MAX / max_object_size / 2 <= pat_len, 0))
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	859 return REG_ESPACE;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	860
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	861 dfa->nodes_alloc = pat_len + 1;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	862 dfa->nodes = re_malloc (re_token_t, dfa->nodes_alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	863
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	864 /* table_size = 2 ^ ceil(log pat_len) */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	865 for (table_size = 1; ; table_size <<= 1)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	866 if (table_size > pat_len)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	867 break;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	868
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	869 dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	870 dfa->state_hash_mask = table_size - 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	871
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	872 dfa->mb_cur_max = MB_CUR_MAX;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	873 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	874 if (dfa->mb_cur_max == 6
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	875 && strcmp (_NL_CURRENT (LC_CTYPE, _NL_CTYPE_CODESET_NAME), "UTF-8") == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	876 dfa->is_utf8 = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	877 dfa->map_notascii = (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_TO_NONASCII)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	878 != 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	879 #else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	880 # ifdef HAVE_LANGINFO_CODESET
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	881 codeset_name = nl_langinfo (CODESET);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	882 # else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	883 codeset_name = getenv ("LC_ALL");
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	884 if (codeset_name == NULL \|\| codeset_name[0] == '\0')
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	885 codeset_name = getenv ("LC_CTYPE");
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	886 if (codeset_name == NULL \|\| codeset_name[0] == '\0')
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	887 codeset_name = getenv ("LANG");
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	888 if (codeset_name == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	889 codeset_name = "";
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	890 else if (strchr (codeset_name, '.') != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	891 codeset_name = strchr (codeset_name, '.') + 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	892 # endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	893
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	894 if (strcasecmp (codeset_name, "UTF-8") == 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	895 \|\| strcasecmp (codeset_name, "UTF8") == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	896 dfa->is_utf8 = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	897
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	898 /* We check exhaustively in the loop below if this charset is a
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	899 superset of ASCII. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	900 dfa->map_notascii = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	901 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	902
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	903 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	904 if (dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	905 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	906 if (dfa->is_utf8)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	907 dfa->sb_char = (re_bitset_ptr_t) utf8_sb_map;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	908 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	909 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	910 int i, j, ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	911
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	912 dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	913 if (BE (dfa->sb_char == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	914 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	915
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	916 /* Set the bits corresponding to single byte chars. */
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	917 for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	918 for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	919 {
5972 aa260da0bbbe * config/srclist.txt: Comment out regcomp.c, since we have a porting fix Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	920 wint_t wch = __btowc (ch);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	921 if (wch != WEOF)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	922 dfa->sb_char[i] \|= (bitset_word_t) 1 << j;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	923 # ifndef _LIBC
5972 aa260da0bbbe * config/srclist.txt: Comment out regcomp.c, since we have a porting fix Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	924 if (isascii (ch) && wch != ch)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	925 dfa->map_notascii = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	926 # endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	927 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	928 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	929 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	930 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	931
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	932 if (BE (dfa->nodes == NULL \|\| dfa->state_table == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	933 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	934 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	935 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	936
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	937 /* Initialize WORD_CHAR table, which indicate which character is
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	938 "word". In this case "word" means that it is the word construction
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	939 character used by some operators like "\<", "\>", etc. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	940
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	941 static void
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	942 internal_function
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	943 init_word_char (re_dfa_t *dfa)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	944 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	945 int i, j, ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	946 dfa->word_ops_used = 1;
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	947 for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	948 for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	949 if (isalnum (ch) \|\| ch == '_')
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	950 dfa->word_char[i] \|= (bitset_word_t) 1 << j;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	951 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	952
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	953 /* Free the work area which are only used while compiling. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	954
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	955 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	956 free_workarea_compile (regex_t *preg)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	957 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	958 re_dfa_t dfa = (re_dfa_t ) preg->buffer;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	959 bin_tree_storage_t storage, next;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	960 for (storage = dfa->str_tree_storage; storage; storage = next)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	961 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	962 next = storage->next;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	963 re_free (storage);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	964 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	965 dfa->str_tree_storage = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	966 dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	967 dfa->str_tree = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	968 re_free (dfa->org_indices);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	969 dfa->org_indices = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	970 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	971
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	972 /* Create initial states for all contexts. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	973
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	974 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	975 create_initial_state (re_dfa_t *dfa)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	976 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	977 Idx first, i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	978 reg_errcode_t err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	979 re_node_set init_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	980
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	981 /* Initial states have the epsilon closure of the node which is
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	982 the first node of the regular expression. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	983 first = dfa->str_tree->first->node_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	984 dfa->init_node = first;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	985 err = re_node_set_init_copy (&init_nodes, dfa->eclosures + first);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	986 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	987 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	988
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	989 /* The back-references which are in initial states can epsilon transit,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	990 since in this case all of the subexpressions can be null.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	991 Then we add epsilon closures of the nodes which are the next nodes of
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	992 the back-references. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	993 if (dfa->nbackref > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	994 for (i = 0; i < init_nodes.nelem; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	995 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	996 Idx node_idx = init_nodes.elems[i];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	997 re_token_type_t type = dfa->nodes[node_idx].type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	998
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	999 Idx clexp_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1000 if (type != OP_BACK_REF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1001 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1002 for (clexp_idx = 0; clexp_idx < init_nodes.nelem; ++clexp_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1003 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1004 re_token_t *clexp_node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1005 clexp_node = dfa->nodes + init_nodes.elems[clexp_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1006 if (clexp_node->type == OP_CLOSE_SUBEXP
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1007 && clexp_node->opr.idx == dfa->nodes[node_idx].opr.idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1008 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1009 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1010 if (clexp_idx == init_nodes.nelem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1011 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1012
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1013 if (type == OP_BACK_REF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1014 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1015 Idx dest_idx = dfa->edests[node_idx].elems[0];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1016 if (!re_node_set_contains (&init_nodes, dest_idx))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1017 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1018 re_node_set_merge (&init_nodes, dfa->eclosures + dest_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1019 i = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1020 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1021 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1022 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1023
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1024 /* It must be the first time to invoke acquire_state. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1025 dfa->init_state = re_acquire_state_context (&err, dfa, &init_nodes, 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1026 /* We don't check ERR here, since the initial state must not be NULL. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1027 if (BE (dfa->init_state == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1028 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1029 if (dfa->init_state->has_constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1030 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1031 dfa->init_state_word = re_acquire_state_context (&err, dfa, &init_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1032 CONTEXT_WORD);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1033 dfa->init_state_nl = re_acquire_state_context (&err, dfa, &init_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1034 CONTEXT_NEWLINE);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1035 dfa->init_state_begbuf = re_acquire_state_context (&err, dfa,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1036 &init_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1037 CONTEXT_NEWLINE
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1038 \| CONTEXT_BEGBUF);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1039 if (BE (dfa->init_state_word == NULL \|\| dfa->init_state_nl == NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1040 \|\| dfa->init_state_begbuf == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1041 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1042 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1043 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1044 dfa->init_state_word = dfa->init_state_nl
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1045 = dfa->init_state_begbuf = dfa->init_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1046
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1047 re_node_set_free (&init_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1048 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1049 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1050
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1051 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1052 /* If it is possible to do searching in single byte encoding instead of UTF-8
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1053 to speed things up, set dfa->mb_cur_max to 1, clear is_utf8 and change
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1054 DFA nodes where needed. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1055
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1056 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1057 optimize_utf8 (re_dfa_t *dfa)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1058 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1059 Idx node;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1060 int i;
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1061 bool mb_chars = false;
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1062 bool has_period = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1063
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1064 for (node = 0; node < dfa->nodes_len; ++node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1065 switch (dfa->nodes[node].type)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1066 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1067 case CHARACTER:
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1068 if (dfa->nodes[node].opr.c >= ASCII_CHARS)
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1069 mb_chars = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1070 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1071 case ANCHOR:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1072 switch (dfa->nodes[node].opr.idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1073 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1074 case LINE_FIRST:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1075 case LINE_LAST:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1076 case BUF_FIRST:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1077 case BUF_LAST:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1078 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1079 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1080 /* Word anchors etc. cannot be handled. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1081 return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1082 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1083 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1084 case OP_PERIOD:
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1085 has_period = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1086 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1087 case OP_BACK_REF:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1088 case OP_ALT:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1089 case END_OF_RE:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1090 case OP_DUP_ASTERISK:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1091 case OP_OPEN_SUBEXP:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1092 case OP_CLOSE_SUBEXP:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1093 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1094 case COMPLEX_BRACKET:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1095 return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1096 case SIMPLE_BRACKET:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1097 /* Just double check. */
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1098 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1099 int rshift = (ASCII_CHARS % BITSET_WORD_BITS == 0
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1100 ? 0
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1101 : BITSET_WORD_BITS - ASCII_CHARS % BITSET_WORD_BITS);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1102 for (i = ASCII_CHARS / BITSET_WORD_BITS; i < BITSET_WORDS; ++i)
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1103 {
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1104 if (dfa->nodes[node].opr.sbcset[i] >> rshift != 0)
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1105 return;
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1106 rshift = 0;
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1107 }
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1108 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1109 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1110 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1111 abort ();
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1112 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1113
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1114 if (mb_chars \|\| has_period)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1115 for (node = 0; node < dfa->nodes_len; ++node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1116 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1117 if (dfa->nodes[node].type == CHARACTER
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1118 && dfa->nodes[node].opr.c >= ASCII_CHARS)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1119 dfa->nodes[node].mb_partial = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1120 else if (dfa->nodes[node].type == OP_PERIOD)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1121 dfa->nodes[node].type = OP_UTF8_PERIOD;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1122 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1123
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1124 /* The search can be in single byte locale. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1125 dfa->mb_cur_max = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1126 dfa->is_utf8 = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1127 dfa->has_mb_node = dfa->nbackref > 0 \|\| has_period;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1128 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1129 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1130
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1131 /* Analyze the structure tree, and calculate "first", "next", "edest",
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1132 "eclosure", and "inveclosure". */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1133
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1134 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1135 analyze (regex_t *preg)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1136 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1137 re_dfa_t dfa = (re_dfa_t ) preg->buffer;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1138 reg_errcode_t ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1139
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1140 /* Allocate arrays. */
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1141 dfa->nexts = re_malloc (Idx, dfa->nodes_alloc);
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1142 dfa->org_indices = re_malloc (Idx, dfa->nodes_alloc);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1143 dfa->edests = re_malloc (re_node_set, dfa->nodes_alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1144 dfa->eclosures = re_malloc (re_node_set, dfa->nodes_alloc);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1145 if (BE (dfa->nexts == NULL \|\| dfa->org_indices == NULL \|\| dfa->edests == NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1146 \|\| dfa->eclosures == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1147 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1148
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1149 dfa->subexp_map = re_malloc (Idx, preg->re_nsub);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1150 if (dfa->subexp_map != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1151 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1152 Idx i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1153 for (i = 0; i < preg->re_nsub; i++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1154 dfa->subexp_map[i] = i;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1155 preorder (dfa->str_tree, optimize_subexps, dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1156 for (i = 0; i < preg->re_nsub; i++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1157 if (dfa->subexp_map[i] != i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1158 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1159 if (i == preg->re_nsub)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1160 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1161 free (dfa->subexp_map);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1162 dfa->subexp_map = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1163 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1164 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1165
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1166 ret = postorder (dfa->str_tree, lower_subexps, preg);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1167 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1168 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1169 ret = postorder (dfa->str_tree, calc_first, dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1170 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1171 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1172 preorder (dfa->str_tree, calc_next, dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1173 ret = preorder (dfa->str_tree, link_nfa_nodes, dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1174 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1175 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1176 ret = calc_eclosure (dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1177 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1178 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1179
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1180 /* We only need this during the prune_impossible_nodes pass in regexec.c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1181 skip it if p_i_n will not run, as calc_inveclosure can be quadratic. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1182 if ((!preg->no_sub && preg->re_nsub > 0 && dfa->has_plural_match)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1183 \|\| dfa->nbackref)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1184 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1185 dfa->inveclosures = re_malloc (re_node_set, dfa->nodes_len);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1186 if (BE (dfa->inveclosures == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1187 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1188 ret = calc_inveclosure (dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1189 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1190
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1191 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1192 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1193
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1194 /* Our parse trees are very unbalanced, so we cannot use a stack to
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1195 implement parse tree visits. Instead, we use parent pointers and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1196 some hairy code in these two functions. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1197 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1198 postorder (bin_tree_t root, reg_errcode_t (fn (void , bin_tree_t *)),
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1199 void *extra)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1200 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1201 bin_tree_t node, prev;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1202
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1203 for (node = root; ; )
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1204 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1205 /* Descend down the tree, preferably to the left (or to the right
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1206 if that's the only child). */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1207 while (node->left \|\| node->right)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1208 if (node->left)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1209 node = node->left;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1210 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1211 node = node->right;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1212
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1213 do
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1214 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1215 reg_errcode_t err = fn (extra, node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1216 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1217 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1218 if (node->parent == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1219 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1220 prev = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1221 node = node->parent;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1222 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1223 /* Go up while we have a node that is reached from the right. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1224 while (node->right == prev \|\| node->right == NULL);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1225 node = node->right;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1226 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1227 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1228
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1229 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1230 preorder (bin_tree_t root, reg_errcode_t (fn (void , bin_tree_t *)),
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1231 void *extra)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1232 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1233 bin_tree_t *node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1234
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1235 for (node = root; ; )
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1236 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1237 reg_errcode_t err = fn (extra, node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1238 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1239 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1240
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1241 /* Go to the left node, or up and to the right. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1242 if (node->left)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1243 node = node->left;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1244 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1245 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1246 bin_tree_t *prev = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1247 while (node->right == prev \|\| node->right == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1248 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1249 prev = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1250 node = node->parent;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1251 if (!node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1252 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1253 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1254 node = node->right;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1255 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1256 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1257 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1258
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1259 /* Optimization pass: if a SUBEXP is entirely contained, strip it and tell
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1260 re_search_internal to map the inner one's opr.idx to this one's. Adjust
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1261 backreferences as well. Requires a preorder visit. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1262 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1263 optimize_subexps (void extra, bin_tree_t node)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1264 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1265 re_dfa_t dfa = (re_dfa_t ) extra;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1266
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1267 if (node->token.type == OP_BACK_REF && dfa->subexp_map)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1268 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1269 int idx = node->token.opr.idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1270 node->token.opr.idx = dfa->subexp_map[idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1271 dfa->used_bkref_map \|= 1 << node->token.opr.idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1272 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1273
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1274 else if (node->token.type == SUBEXP
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1275 && node->left && node->left->token.type == SUBEXP)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1276 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1277 Idx other_idx = node->left->token.opr.idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1278
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1279 node->left = node->left->left;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1280 if (node->left)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1281 node->left->parent = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1282
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1283 dfa->subexp_map[other_idx] = dfa->subexp_map[node->token.opr.idx];
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1284 if (other_idx < BITSET_WORD_BITS)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1285 dfa->used_bkref_map &= ~((bitset_word_t) 1 << other_idx);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1286 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1287
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1288 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1289 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1290
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1291 /* Lowering pass: Turn each SUBEXP node into the appropriate concatenation
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1292 of OP_OPEN_SUBEXP, the body of the SUBEXP (if any) and OP_CLOSE_SUBEXP. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1293 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1294 lower_subexps (void extra, bin_tree_t node)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1295 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1296 regex_t preg = (regex_t ) extra;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1297 reg_errcode_t err = REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1298
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1299 if (node->left && node->left->token.type == SUBEXP)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1300 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1301 node->left = lower_subexp (&err, preg, node->left);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1302 if (node->left)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1303 node->left->parent = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1304 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1305 if (node->right && node->right->token.type == SUBEXP)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1306 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1307 node->right = lower_subexp (&err, preg, node->right);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1308 if (node->right)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1309 node->right->parent = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1310 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1311
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1312 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1313 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1314
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1315 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1316 lower_subexp (reg_errcode_t err, regex_t preg, bin_tree_t *node)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1317 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1318 re_dfa_t dfa = (re_dfa_t ) preg->buffer;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1319 bin_tree_t *body = node->left;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1320 bin_tree_t op, cls, tree1, tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1321
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1322 if (preg->no_sub
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1323 /* We do not optimize empty subexpressions, because otherwise we may
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1324 have bad CONCAT nodes with NULL children. This is obviously not
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1325 very common, so we do not lose much. An example that triggers
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1326 this case is the sed "script" //x. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1327 && node->left != NULL
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1328 && (node->token.opr.idx >= BITSET_WORD_BITS
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1329 \|\| !(dfa->used_bkref_map
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1330 & ((bitset_word_t) 1 << node->token.opr.idx))))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1331 return node->left;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1332
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1333 /* Convert the SUBEXP node to the concatenation of an
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1334 OP_OPEN_SUBEXP, the contents, and an OP_CLOSE_SUBEXP. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1335 op = create_tree (dfa, NULL, NULL, OP_OPEN_SUBEXP);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1336 cls = create_tree (dfa, NULL, NULL, OP_CLOSE_SUBEXP);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1337 tree1 = body ? create_tree (dfa, body, cls, CONCAT) : cls;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1338 tree = create_tree (dfa, op, tree1, CONCAT);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1339 if (BE (tree == NULL \|\| tree1 == NULL \|\| op == NULL \|\| cls == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1340 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1341 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1342 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1343 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1344
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1345 op->token.opr.idx = cls->token.opr.idx = node->token.opr.idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1346 op->token.opt_subexp = cls->token.opt_subexp = node->token.opt_subexp;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1347 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1348 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1349
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1350 /* Pass 1 in building the NFA: compute FIRST and create unlinked automaton
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1351 nodes. Requires a postorder visit. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1352 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1353 calc_first (void extra, bin_tree_t node)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1354 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1355 re_dfa_t dfa = (re_dfa_t ) extra;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1356 if (node->token.type == CONCAT)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1357 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1358 node->first = node->left->first;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1359 node->node_idx = node->left->node_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1360 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1361 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1362 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1363 node->first = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1364 node->node_idx = re_dfa_add_node (dfa, node->token);
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1365 if (BE (node->node_idx == REG_MISSING, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1366 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1367 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1368 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1369 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1370
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1371 /* Pass 2: compute NEXT on the tree. Preorder visit. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1372 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1373 calc_next (void extra, bin_tree_t node)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1374 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1375 switch (node->token.type)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1376 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1377 case OP_DUP_ASTERISK:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1378 node->left->next = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1379 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1380 case CONCAT:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1381 node->left->next = node->right->first;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1382 node->right->next = node->next;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1383 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1384 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1385 if (node->left)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1386 node->left->next = node->next;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1387 if (node->right)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1388 node->right->next = node->next;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1389 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1390 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1391 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1392 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1393
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1394 /* Pass 3: link all DFA nodes to their NEXT node (any order will do). */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1395 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1396 link_nfa_nodes (void extra, bin_tree_t node)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1397 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1398 re_dfa_t dfa = (re_dfa_t ) extra;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1399 Idx idx = node->node_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1400 reg_errcode_t err = REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1401
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1402 switch (node->token.type)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1403 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1404 case CONCAT:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1405 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1406
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1407 case END_OF_RE:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1408 assert (node->next == NULL);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1409 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1410
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1411 case OP_DUP_ASTERISK:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1412 case OP_ALT:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1413 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1414 Idx left, right;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1415 dfa->has_plural_match = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1416 if (node->left != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1417 left = node->left->first->node_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1418 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1419 left = node->next->node_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1420 if (node->right != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1421 right = node->right->first->node_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1422 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1423 right = node->next->node_idx;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1424 assert (REG_VALID_INDEX (left));
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1425 assert (REG_VALID_INDEX (right));
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1426 err = re_node_set_init_2 (dfa->edests + idx, left, right);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1427 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1428 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1429
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1430 case ANCHOR:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1431 case OP_OPEN_SUBEXP:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1432 case OP_CLOSE_SUBEXP:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1433 err = re_node_set_init_1 (dfa->edests + idx, node->next->node_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1434 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1435
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1436 case OP_BACK_REF:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1437 dfa->nexts[idx] = node->next->node_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1438 if (node->token.type == OP_BACK_REF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1439 re_node_set_init_1 (dfa->edests + idx, dfa->nexts[idx]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1440 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1441
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1442 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1443 assert (!IS_EPSILON_NODE (node->token.type));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1444 dfa->nexts[idx] = node->next->node_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1445 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1446 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1447
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1448 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1449 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1450
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1451 /* Duplicate the epsilon closure of the node ROOT_NODE.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1452 Note that duplicated nodes have constraint INIT_CONSTRAINT in addition
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1453 to their own constraint. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1454
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1455 static reg_errcode_t
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1456 internal_function
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1457 duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1458 Idx root_node, unsigned int init_constraint)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1459 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1460 Idx org_node, clone_node;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1461 bool ok;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1462 unsigned int constraint = init_constraint;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1463 for (org_node = top_org_node, clone_node = top_clone_node;;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1464 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1465 Idx org_dest, clone_dest;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1466 if (dfa->nodes[org_node].type == OP_BACK_REF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1467 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1468 /* If the back reference epsilon-transit, its destination must
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1469 also have the constraint. Then duplicate the epsilon closure
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1470 of the destination of the back reference, and store it in
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1471 edests of the back reference. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1472 org_dest = dfa->nexts[org_node];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1473 re_node_set_empty (dfa->edests + clone_node);
6071 c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1474 clone_dest = duplicate_node (dfa, org_dest, constraint);
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1475 if (BE (clone_dest == REG_MISSING, 0))
6071 c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1476 return REG_ESPACE;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1477 dfa->nexts[clone_node] = dfa->nexts[org_node];
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1478 ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1479 if (BE (! ok, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1480 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1481 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1482 else if (dfa->edests[org_node].nelem == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1483 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1484 /* In case of the node can't epsilon-transit, don't duplicate the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1485 destination and store the original destination as the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1486 destination of the node. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1487 dfa->nexts[clone_node] = dfa->nexts[org_node];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1488 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1489 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1490 else if (dfa->edests[org_node].nelem == 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1491 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1492 /* In case of the node can epsilon-transit, and it has only one
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1493 destination. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1494 org_dest = dfa->edests[org_node].elems[0];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1495 re_node_set_empty (dfa->edests + clone_node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1496 if (dfa->nodes[org_node].type == ANCHOR)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1497 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1498 /* In case of the node has another constraint, append it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1499 if (org_node == root_node && clone_node != org_node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1500 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1501 /* ...but if the node is root_node itself, it means the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1502 epsilon closure have a loop, then tie it to the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1503 destination of the root_node. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1504 ok = re_node_set_insert (dfa->edests + clone_node, org_dest);
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1505 if (BE (! ok, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1506 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1507 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1508 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1509 constraint \|= dfa->nodes[org_node].opr.ctx_type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1510 }
6071 c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1511 clone_dest = duplicate_node (dfa, org_dest, constraint);
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1512 if (BE (clone_dest == REG_MISSING, 0))
6071 c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1513 return REG_ESPACE;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1514 ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1515 if (BE (! ok, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1516 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1517 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1518 else /* dfa->edests[org_node].nelem == 2 */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1519 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1520 /* In case of the node can epsilon-transit, and it has two
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1521 destinations. In the bin_tree_t and DFA, that's '\|' and ''. /
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1522 org_dest = dfa->edests[org_node].elems[0];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1523 re_node_set_empty (dfa->edests + clone_node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1524 /* Search for a duplicated node which satisfies the constraint. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1525 clone_dest = search_duplicated_node (dfa, org_dest, constraint);
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1526 if (clone_dest == REG_MISSING)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1527 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1528 /* There are no such a duplicated node, create a new one. */
6071 c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1529 reg_errcode_t err;
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1530 clone_dest = duplicate_node (dfa, org_dest, constraint);
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1531 if (BE (clone_dest == REG_MISSING, 0))
6071 c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1532 return REG_ESPACE;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1533 ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1534 if (BE (! ok, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1535 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1536 err = duplicate_node_closure (dfa, org_dest, clone_dest,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1537 root_node, constraint);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1538 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1539 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1540 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1541 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1542 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1543 /* There are a duplicated node which satisfy the constraint,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1544 use it to avoid infinite loop. */
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1545 ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1546 if (BE (! ok, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1547 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1548 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1549
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1550 org_dest = dfa->edests[org_node].elems[1];
6071 c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1551 clone_dest = duplicate_node (dfa, org_dest, constraint);
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1552 if (BE (clone_dest == REG_MISSING, 0))
6071 c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1553 return REG_ESPACE;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1554 ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1555 if (BE (! ok, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1556 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1557 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1558 org_node = org_dest;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1559 clone_node = clone_dest;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1560 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1561 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1562 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1563
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1564 /* Search for a node which is duplicated from the node ORG_NODE, and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1565 satisfies the constraint CONSTRAINT. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1566
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1567 static Idx
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	1568 search_duplicated_node (const re_dfa_t *dfa, Idx org_node,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1569 unsigned int constraint)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1570 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1571 Idx idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1572 for (idx = dfa->nodes_len - 1; dfa->nodes[idx].duplicated && idx > 0; --idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1573 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1574 if (org_node == dfa->org_indices[idx]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1575 && constraint == dfa->nodes[idx].constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1576 return idx; /* Found. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1577 }
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1578 return REG_MISSING; /* Not found. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1579 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1580
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1581 /* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT.
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1582 Return the index of the new node, or REG_MISSING if insufficient storage is
6071 c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1583 available. */
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1584
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1585 static Idx
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1586 duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1587 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1588 Idx dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]);
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1589 if (BE (dup_idx != REG_MISSING, 1))
6071 c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1590 {
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1591 dfa->nodes[dup_idx].constraint = constraint;
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1592 if (dfa->nodes[org_idx].type == ANCHOR)
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1593 dfa->nodes[dup_idx].constraint \|= dfa->nodes[org_idx].opr.ctx_type;
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1594 dfa->nodes[dup_idx].duplicated = 1;
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1595
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1596 /* Store the index of the original node. */
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1597 dfa->org_indices[dup_idx] = org_idx;
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1598 }
c1760162e42f (duplicate_node): Return new index, not an error code, Paul Eggert <eggert@cs.ucla.edu> parents: 5972 diff changeset	1599 return dup_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1600 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1601
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1602 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1603 calc_inveclosure (re_dfa_t *dfa)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1604 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1605 Idx src, idx;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1606 bool ok;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1607 for (idx = 0; idx < dfa->nodes_len; ++idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1608 re_node_set_init_empty (dfa->inveclosures + idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1609
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1610 for (src = 0; src < dfa->nodes_len; ++src)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1611 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1612 Idx *elems = dfa->eclosures[src].elems;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1613 for (idx = 0; idx < dfa->eclosures[src].nelem; ++idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1614 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1615 ok = re_node_set_insert_last (dfa->inveclosures + elems[idx], src);
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1616 if (BE (! ok, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1617 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1618 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1619 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1620
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1621 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1622 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1623
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1624 /* Calculate "eclosure" for all the node in DFA. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1625
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1626 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1627 calc_eclosure (re_dfa_t *dfa)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1628 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1629 Idx node_idx;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1630 bool incomplete;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1631 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1632 assert (dfa->nodes_len > 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1633 #endif
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1634 incomplete = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1635 /* For each nodes, calculate epsilon closure. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1636 for (node_idx = 0; ; ++node_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1637 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1638 reg_errcode_t err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1639 re_node_set eclosure_elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1640 if (node_idx == dfa->nodes_len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1641 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1642 if (!incomplete)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1643 break;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1644 incomplete = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1645 node_idx = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1646 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1647
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1648 #ifdef DEBUG
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1649 assert (dfa->eclosures[node_idx].nelem != REG_MISSING);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1650 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1651
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1652 /* If we have already calculated, skip it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1653 if (dfa->eclosures[node_idx].nelem != 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1654 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1655 /* Calculate epsilon closure of `node_idx'. */
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1656 err = calc_eclosure_iter (&eclosure_elem, dfa, node_idx, true);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1657 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1658 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1659
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1660 if (dfa->eclosures[node_idx].nelem == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1661 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1662 incomplete = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1663 re_node_set_free (&eclosure_elem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1664 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1665 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1666 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1667 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1668
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1669 /* Calculate epsilon closure of NODE. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1670
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1671 static reg_errcode_t
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1672 calc_eclosure_iter (re_node_set new_set, re_dfa_t dfa, Idx node, bool root)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1673 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1674 reg_errcode_t err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1675 unsigned int constraint;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1676 Idx i;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1677 bool incomplete;
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1678 bool ok;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1679 re_node_set eclosure;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1680 incomplete = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1681 err = re_node_set_alloc (&eclosure, dfa->edests[node].nelem + 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1682 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1683 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1684
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1685 /* This indicates that we are calculating this node now.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1686 We reference this value to avoid infinite loop. */
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1687 dfa->eclosures[node].nelem = REG_MISSING;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1688
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1689 constraint = ((dfa->nodes[node].type == ANCHOR)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1690 ? dfa->nodes[node].opr.ctx_type : 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1691 /* If the current node has constraints, duplicate all nodes.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1692 Since they must inherit the constraints. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1693 if (constraint
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1694 && dfa->edests[node].nelem
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1695 && !dfa->nodes[dfa->edests[node].elems[0]].duplicated)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1696 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1697 err = duplicate_node_closure (dfa, node, node, node, constraint);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1698 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1699 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1700 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1701
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1702 /* Expand each epsilon destination nodes. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1703 if (IS_EPSILON_NODE(dfa->nodes[node].type))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1704 for (i = 0; i < dfa->edests[node].nelem; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1705 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1706 re_node_set eclosure_elem;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1707 Idx edest = dfa->edests[node].elems[i];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1708 /* If calculating the epsilon closure of `edest' is in progress,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1709 return intermediate result. */
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	1710 if (dfa->eclosures[edest].nelem == REG_MISSING)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1711 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1712 incomplete = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1713 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1714 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1715 /* If we haven't calculated the epsilon closure of `edest' yet,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1716 calculate now. Otherwise use calculated epsilon closure. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1717 if (dfa->eclosures[edest].nelem == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1718 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1719 err = calc_eclosure_iter (&eclosure_elem, dfa, edest, false);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1720 if (BE (err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1721 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1722 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1723 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1724 eclosure_elem = dfa->eclosures[edest];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1725 /* Merge the epsilon closure of `edest'. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1726 re_node_set_merge (&eclosure, &eclosure_elem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1727 /* If the epsilon closure of `edest' is incomplete,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1728 the epsilon closure of this node is also incomplete. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1729 if (dfa->eclosures[edest].nelem == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1730 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1731 incomplete = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1732 re_node_set_free (&eclosure_elem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1733 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1734 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1735
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1736 /* Epsilon closures include itself. */
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1737 ok = re_node_set_insert (&eclosure, node);
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1738 if (BE (! ok, 0))
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	1739 return REG_ESPACE;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1740 if (incomplete && !root)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1741 dfa->eclosures[node].nelem = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1742 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1743 dfa->eclosures[node] = eclosure;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1744 *new_set = eclosure;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1745 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1746 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1747
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1748 /* Functions for token which are used in the parser. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1749
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1750 /* Fetch a token from INPUT.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1751 We must not use this function inside bracket expressions. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1752
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1753 static void
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1754 internal_function
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1755 fetch_token (re_token_t result, re_string_t input, reg_syntax_t syntax)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1756 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1757 re_string_skip_bytes (input, peek_token (result, input, syntax));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1758 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1759
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1760 /* Peek a token from INPUT, and return the length of the token.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1761 We must not use this function inside bracket expressions. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1762
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1763 static int
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1764 internal_function
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	1765 peek_token (re_token_t token, re_string_t input, reg_syntax_t syntax)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1766 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1767 unsigned char c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1768
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1769 if (re_string_eoi (input))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1770 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1771 token->type = END_OF_RE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1772 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1773 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1774
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1775 c = re_string_peek_byte (input, 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1776 token->opr.c = c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1777
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1778 token->word_char = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1779 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1780 token->mb_partial = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1781 if (input->mb_cur_max > 1 &&
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1782 !re_string_first_byte (input, re_string_cur_idx (input)))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1783 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1784 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1785 token->mb_partial = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1786 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1787 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1788 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1789 if (c == '\\')
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1790 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1791 unsigned char c2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1792 if (re_string_cur_idx (input) + 1 >= re_string_length (input))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1793 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1794 token->type = BACK_SLASH;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1795 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1796 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1797
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1798 c2 = re_string_peek_byte_case (input, 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1799 token->opr.c = c2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1800 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1801 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1802 if (input->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1803 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1804 wint_t wc = re_string_wchar_at (input,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1805 re_string_cur_idx (input) + 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1806 token->word_char = IS_WIDE_WORD_CHAR (wc) != 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1807 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1808 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1809 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1810 token->word_char = IS_WORD_CHAR (c2) != 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1811
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1812 switch (c2)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1813 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1814 case '\|':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1815 if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_NO_BK_VBAR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1816 token->type = OP_ALT;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1817 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1818 case '1': case '2': case '3': case '4': case '5':
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1819 case '6': case '7': case '8': case '9':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1820 if (!(syntax & RE_NO_BK_REFS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1821 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1822 token->type = OP_BACK_REF;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1823 token->opr.idx = c2 - '1';
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1824 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1825 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1826 case '<':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1827 if (!(syntax & RE_NO_GNU_OPS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1828 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1829 token->type = ANCHOR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1830 token->opr.ctx_type = WORD_FIRST;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1831 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1832 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1833 case '>':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1834 if (!(syntax & RE_NO_GNU_OPS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1835 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1836 token->type = ANCHOR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1837 token->opr.ctx_type = WORD_LAST;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1838 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1839 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1840 case 'b':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1841 if (!(syntax & RE_NO_GNU_OPS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1842 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1843 token->type = ANCHOR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1844 token->opr.ctx_type = WORD_DELIM;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1845 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1846 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1847 case 'B':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1848 if (!(syntax & RE_NO_GNU_OPS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1849 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1850 token->type = ANCHOR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1851 token->opr.ctx_type = NOT_WORD_DELIM;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1852 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1853 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1854 case 'w':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1855 if (!(syntax & RE_NO_GNU_OPS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1856 token->type = OP_WORD;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1857 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1858 case 'W':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1859 if (!(syntax & RE_NO_GNU_OPS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1860 token->type = OP_NOTWORD;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1861 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1862 case 's':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1863 if (!(syntax & RE_NO_GNU_OPS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1864 token->type = OP_SPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1865 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1866 case 'S':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1867 if (!(syntax & RE_NO_GNU_OPS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1868 token->type = OP_NOTSPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1869 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1870 case '`':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1871 if (!(syntax & RE_NO_GNU_OPS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1872 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1873 token->type = ANCHOR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1874 token->opr.ctx_type = BUF_FIRST;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1875 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1876 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1877 case '\'':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1878 if (!(syntax & RE_NO_GNU_OPS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1879 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1880 token->type = ANCHOR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1881 token->opr.ctx_type = BUF_LAST;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1882 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1883 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1884 case '(':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1885 if (!(syntax & RE_NO_BK_PARENS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1886 token->type = OP_OPEN_SUBEXP;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1887 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1888 case ')':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1889 if (!(syntax & RE_NO_BK_PARENS))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1890 token->type = OP_CLOSE_SUBEXP;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1891 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1892 case '+':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1893 if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_BK_PLUS_QM))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1894 token->type = OP_DUP_PLUS;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1895 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1896 case '?':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1897 if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_BK_PLUS_QM))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1898 token->type = OP_DUP_QUESTION;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1899 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1900 case '{':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1901 if ((syntax & RE_INTERVALS) && (!(syntax & RE_NO_BK_BRACES)))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1902 token->type = OP_OPEN_DUP_NUM;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1903 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1904 case '}':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1905 if ((syntax & RE_INTERVALS) && (!(syntax & RE_NO_BK_BRACES)))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1906 token->type = OP_CLOSE_DUP_NUM;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1907 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1908 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1909 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1910 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1911 return 2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1912 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1913
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1914 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1915 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1916 if (input->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1917 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1918 wint_t wc = re_string_wchar_at (input, re_string_cur_idx (input));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1919 token->word_char = IS_WIDE_WORD_CHAR (wc) != 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1920 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1921 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1922 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1923 token->word_char = IS_WORD_CHAR (token->opr.c);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1924
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1925 switch (c)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1926 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1927 case '\n':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1928 if (syntax & RE_NEWLINE_ALT)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1929 token->type = OP_ALT;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1930 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1931 case '\|':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1932 if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_NO_BK_VBAR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1933 token->type = OP_ALT;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1934 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1935 case '*':
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1936 token->type = OP_DUP_ASTERISK;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1937 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1938 case '+':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1939 if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_BK_PLUS_QM))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1940 token->type = OP_DUP_PLUS;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1941 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1942 case '?':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1943 if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_BK_PLUS_QM))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1944 token->type = OP_DUP_QUESTION;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1945 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1946 case '{':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1947 if ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1948 token->type = OP_OPEN_DUP_NUM;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1949 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1950 case '}':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1951 if ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1952 token->type = OP_CLOSE_DUP_NUM;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1953 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1954 case '(':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1955 if (syntax & RE_NO_BK_PARENS)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1956 token->type = OP_OPEN_SUBEXP;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1957 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1958 case ')':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1959 if (syntax & RE_NO_BK_PARENS)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1960 token->type = OP_CLOSE_SUBEXP;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1961 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1962 case '[':
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1963 token->type = OP_OPEN_BRACKET;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1964 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1965 case '.':
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1966 token->type = OP_PERIOD;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1967 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1968 case '^':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1969 if (!(syntax & (RE_CONTEXT_INDEP_ANCHORS \| RE_CARET_ANCHORS_HERE)) &&
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1970 re_string_cur_idx (input) != 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1971 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1972 char prev = re_string_peek_byte (input, -1);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1973 if (!(syntax & RE_NEWLINE_ALT) \|\| prev != '\n')
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1974 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1975 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1976 token->type = ANCHOR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1977 token->opr.ctx_type = LINE_FIRST;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1978 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1979 case '$':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1980 if (!(syntax & RE_CONTEXT_INDEP_ANCHORS) &&
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1981 re_string_cur_idx (input) + 1 != re_string_length (input))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1982 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1983 re_token_t next;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1984 re_string_skip_bytes (input, 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1985 peek_token (&next, input, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1986 re_string_skip_bytes (input, -1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1987 if (next.type != OP_ALT && next.type != OP_CLOSE_SUBEXP)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1988 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1989 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1990 token->type = ANCHOR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1991 token->opr.ctx_type = LINE_LAST;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1992 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1993 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1994 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1995 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1996 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1997 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1998
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1999 /* Peek a token from INPUT, and return the length of the token.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2000 We must not use this function out of bracket expressions. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2001
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2002 static int
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2003 internal_function
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2004 peek_token_bracket (re_token_t token, re_string_t input, reg_syntax_t syntax)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2005 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2006 unsigned char c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2007 if (re_string_eoi (input))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2008 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2009 token->type = END_OF_RE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2010 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2011 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2012 c = re_string_peek_byte (input, 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2013 token->opr.c = c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2014
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2015 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2016 if (input->mb_cur_max > 1 &&
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2017 !re_string_first_byte (input, re_string_cur_idx (input)))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2018 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2019 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2020 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2021 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2022 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2023
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2024 if (c == '\\' && (syntax & RE_BACKSLASH_ESCAPE_IN_LISTS)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2025 && re_string_cur_idx (input) + 1 < re_string_length (input))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2026 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2027 /* In this case, '\' escape a character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2028 unsigned char c2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2029 re_string_skip_bytes (input, 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2030 c2 = re_string_peek_byte (input, 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2031 token->opr.c = c2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2032 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2033 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2034 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2035 if (c == '[') /* '[' is a special char in a bracket exps. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2036 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2037 unsigned char c2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2038 int token_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2039 if (re_string_cur_idx (input) + 1 < re_string_length (input))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2040 c2 = re_string_peek_byte (input, 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2041 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2042 c2 = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2043 token->opr.c = c2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2044 token_len = 2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2045 switch (c2)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2046 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2047 case '.':
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2048 token->type = OP_OPEN_COLL_ELEM;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2049 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2050 case '=':
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2051 token->type = OP_OPEN_EQUIV_CLASS;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2052 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2053 case ':':
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2054 if (syntax & RE_CHAR_CLASSES)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2055 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2056 token->type = OP_OPEN_CHAR_CLASS;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2057 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2058 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2059 /* else fall through. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2060 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2061 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2062 token->opr.c = c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2063 token_len = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2064 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2065 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2066 return token_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2067 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2068 switch (c)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2069 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2070 case '-':
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2071 token->type = OP_CHARSET_RANGE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2072 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2073 case ']':
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2074 token->type = OP_CLOSE_BRACKET;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2075 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2076 case '^':
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2077 token->type = OP_NON_MATCH_LIST;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2078 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2079 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2080 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2081 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2082 return 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2083 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2084
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2085 /* Functions for parser. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2086
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2087 /* Entry point of the parser.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2088 Parse the regular expression REGEXP and return the structure tree.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2089 If an error is occured, ERR is set by error code, and return NULL.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2090 This function build the following tree, from regular expression <reg_exp>:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2091 CAT
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2092 / \
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2093 / \
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2094 <reg_exp> EOR
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2095
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2096 CAT means concatenation.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2097 EOR means end of regular expression. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2098
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2099 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2100 parse (re_string_t regexp, regex_t preg, reg_syntax_t syntax,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2101 reg_errcode_t *err)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2102 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2103 re_dfa_t dfa = (re_dfa_t ) preg->buffer;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2104 bin_tree_t tree, eor, *root;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2105 re_token_t current_token;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2106 dfa->syntax = syntax;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2107 fetch_token (&current_token, regexp, syntax \| RE_CARET_ANCHORS_HERE);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2108 tree = parse_reg_exp (regexp, preg, &current_token, syntax, 0, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2109 if (BE (*err != REG_NOERROR && tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2110 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2111 eor = create_tree (dfa, NULL, NULL, END_OF_RE);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2112 if (tree != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2113 root = create_tree (dfa, tree, eor, CONCAT);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2114 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2115 root = eor;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2116 if (BE (eor == NULL \|\| root == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2117 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2118 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2119 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2120 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2121 return root;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2122 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2123
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2124 /* This function build the following tree, from regular expression
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2125 <branch1>\|<branch2>:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2126 ALT
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2127 / \
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2128 / \
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2129 <branch1> <branch2>
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2130
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2131 ALT means alternative, which represents the operator `\|'. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2132
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2133 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2134 parse_reg_exp (re_string_t regexp, regex_t preg, re_token_t *token,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2135 reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2136 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2137 re_dfa_t dfa = (re_dfa_t ) preg->buffer;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2138 bin_tree_t tree, branch = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2139 tree = parse_branch (regexp, preg, token, syntax, nest, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2140 if (BE (*err != REG_NOERROR && tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2141 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2142
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2143 while (token->type == OP_ALT)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2144 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2145 fetch_token (token, regexp, syntax \| RE_CARET_ANCHORS_HERE);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2146 if (token->type != OP_ALT && token->type != END_OF_RE
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2147 && (nest == 0 \|\| token->type != OP_CLOSE_SUBEXP))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2148 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2149 branch = parse_branch (regexp, preg, token, syntax, nest, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2150 if (BE (*err != REG_NOERROR && branch == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2151 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2152 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2153 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2154 branch = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2155 tree = create_tree (dfa, tree, branch, OP_ALT);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2156 if (BE (tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2157 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2158 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2159 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2160 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2161 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2162 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2163 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2164
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2165 /* This function build the following tree, from regular expression
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2166 <exp1><exp2>:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2167 CAT
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2168 / \
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2169 / \
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2170 <exp1> <exp2>
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2171
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2172 CAT means concatenation. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2173
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2174 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2175 parse_branch (re_string_t regexp, regex_t preg, re_token_t *token,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2176 reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2177 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2178 bin_tree_t tree, exp;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2179 re_dfa_t dfa = (re_dfa_t ) preg->buffer;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2180 tree = parse_expression (regexp, preg, token, syntax, nest, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2181 if (BE (*err != REG_NOERROR && tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2182 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2183
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2184 while (token->type != OP_ALT && token->type != END_OF_RE
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2185 && (nest == 0 \|\| token->type != OP_CLOSE_SUBEXP))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2186 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2187 exp = parse_expression (regexp, preg, token, syntax, nest, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2188 if (BE (*err != REG_NOERROR && exp == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2189 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2190 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2191 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2192 if (tree != NULL && exp != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2193 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2194 tree = create_tree (dfa, tree, exp, CONCAT);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2195 if (tree == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2196 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2197 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2198 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2199 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2200 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2201 else if (tree == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2202 tree = exp;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2203 /* Otherwise exp == NULL, we don't need to create new tree. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2204 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2205 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2206 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2207
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2208 /* This function build the following tree, from regular expression a*:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2209 *
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2210 \|
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2211 a
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2212 */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2213
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2214 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2215 parse_expression (re_string_t regexp, regex_t preg, re_token_t *token,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2216 reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2217 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2218 re_dfa_t dfa = (re_dfa_t ) preg->buffer;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2219 bin_tree_t *tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2220 switch (token->type)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2221 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2222 case CHARACTER:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2223 tree = create_token_tree (dfa, NULL, NULL, token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2224 if (BE (tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2225 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2226 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2227 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2228 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2229 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2230 if (dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2231 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2232 while (!re_string_eoi (regexp)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2233 && !re_string_first_byte (regexp, re_string_cur_idx (regexp)))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2234 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2235 bin_tree_t *mbc_remain;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2236 fetch_token (token, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2237 mbc_remain = create_token_tree (dfa, NULL, NULL, token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2238 tree = create_tree (dfa, tree, mbc_remain, CONCAT);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2239 if (BE (mbc_remain == NULL \|\| tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2240 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2241 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2242 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2243 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2244 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2245 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2246 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2247 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2248 case OP_OPEN_SUBEXP:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2249 tree = parse_sub_exp (regexp, preg, token, syntax, nest + 1, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2250 if (BE (*err != REG_NOERROR && tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2251 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2252 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2253 case OP_OPEN_BRACKET:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2254 tree = parse_bracket_exp (regexp, dfa, token, syntax, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2255 if (BE (*err != REG_NOERROR && tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2256 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2257 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2258 case OP_BACK_REF:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2259 if (!BE (dfa->completed_bkref_map & (1 << token->opr.idx), 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2260 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2261 *err = REG_ESUBREG;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2262 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2263 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2264 dfa->used_bkref_map \|= 1 << token->opr.idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2265 tree = create_token_tree (dfa, NULL, NULL, token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2266 if (BE (tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2267 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2268 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2269 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2270 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2271 ++dfa->nbackref;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2272 dfa->has_mb_node = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2273 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2274 case OP_OPEN_DUP_NUM:
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2275 if (syntax & RE_CONTEXT_INVALID_DUP)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2276 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2277 *err = REG_BADRPT;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2278 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2279 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2280 /* FALLTHROUGH */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2281 case OP_DUP_ASTERISK:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2282 case OP_DUP_PLUS:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2283 case OP_DUP_QUESTION:
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2284 if (syntax & RE_CONTEXT_INVALID_OPS)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2285 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2286 *err = REG_BADRPT;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2287 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2288 }
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2289 else if (syntax & RE_CONTEXT_INDEP_OPS)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2290 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2291 fetch_token (token, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2292 return parse_expression (regexp, preg, token, syntax, nest, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2293 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2294 /* else fall through */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2295 case OP_CLOSE_SUBEXP:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2296 if ((token->type == OP_CLOSE_SUBEXP) &&
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2297 !(syntax & RE_UNMATCHED_RIGHT_PAREN_ORD))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2298 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2299 *err = REG_ERPAREN;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2300 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2301 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2302 /* else fall through */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2303 case OP_CLOSE_DUP_NUM:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2304 /* We treat it as a normal character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2305
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2306 /* Then we can these characters as normal characters. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2307 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2308 /* mb_partial and word_char bits should be initialized already
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2309 by peek_token. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2310 tree = create_token_tree (dfa, NULL, NULL, token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2311 if (BE (tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2312 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2313 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2314 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2315 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2316 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2317 case ANCHOR:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2318 if ((token->opr.ctx_type
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2319 & (WORD_DELIM \| NOT_WORD_DELIM \| WORD_FIRST \| WORD_LAST))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2320 && dfa->word_ops_used == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2321 init_word_char (dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2322 if (token->opr.ctx_type == WORD_DELIM
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2323 \|\| token->opr.ctx_type == NOT_WORD_DELIM)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2324 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2325 bin_tree_t tree_first, tree_last;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2326 if (token->opr.ctx_type == WORD_DELIM)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2327 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2328 token->opr.ctx_type = WORD_FIRST;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2329 tree_first = create_token_tree (dfa, NULL, NULL, token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2330 token->opr.ctx_type = WORD_LAST;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2331 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2332 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2333 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2334 token->opr.ctx_type = INSIDE_WORD;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2335 tree_first = create_token_tree (dfa, NULL, NULL, token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2336 token->opr.ctx_type = INSIDE_NOTWORD;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2337 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2338 tree_last = create_token_tree (dfa, NULL, NULL, token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2339 tree = create_tree (dfa, tree_first, tree_last, OP_ALT);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2340 if (BE (tree_first == NULL \|\| tree_last == NULL \|\| tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2341 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2342 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2343 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2344 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2345 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2346 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2347 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2348 tree = create_token_tree (dfa, NULL, NULL, token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2349 if (BE (tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2350 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2351 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2352 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2353 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2354 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2355 /* We must return here, since ANCHORs can't be followed
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2356 by repetition operators.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2357 eg. RE"^" is invalid or "<ANCHOR(^)><CHAR()>",
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2358 it must not be "<ANCHOR(^)><REPEAT()>". /
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2359 fetch_token (token, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2360 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2361 case OP_PERIOD:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2362 tree = create_token_tree (dfa, NULL, NULL, token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2363 if (BE (tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2364 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2365 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2366 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2367 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2368 if (dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2369 dfa->has_mb_node = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2370 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2371 case OP_WORD:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2372 case OP_NOTWORD:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2373 tree = build_charclass_op (dfa, regexp->trans,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2374 (const unsigned char *) "alnum",
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2375 (const unsigned char *) "_",
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2376 token->type == OP_NOTWORD, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2377 if (BE (*err != REG_NOERROR && tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2378 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2379 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2380 case OP_SPACE:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2381 case OP_NOTSPACE:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2382 tree = build_charclass_op (dfa, regexp->trans,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2383 (const unsigned char *) "space",
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2384 (const unsigned char *) "",
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2385 token->type == OP_NOTSPACE, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2386 if (BE (*err != REG_NOERROR && tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2387 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2388 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2389 case OP_ALT:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2390 case END_OF_RE:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2391 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2392 case BACK_SLASH:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2393 *err = REG_EESCAPE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2394 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2395 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2396 /* Must not happen? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2397 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2398 assert (0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2399 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2400 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2401 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2402 fetch_token (token, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2403
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2404 while (token->type == OP_DUP_ASTERISK \|\| token->type == OP_DUP_PLUS
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2405 \|\| token->type == OP_DUP_QUESTION \|\| token->type == OP_OPEN_DUP_NUM)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2406 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2407 tree = parse_dup_op (tree, regexp, dfa, token, syntax, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2408 if (BE (*err != REG_NOERROR && tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2409 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2410 /* In BRE consecutive duplications are not allowed. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2411 if ((syntax & RE_CONTEXT_INVALID_DUP)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2412 && (token->type == OP_DUP_ASTERISK
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2413 \|\| token->type == OP_OPEN_DUP_NUM))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2414 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2415 *err = REG_BADRPT;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2416 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2417 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2418 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2419
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2420 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2421 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2422
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2423 /* This function build the following tree, from regular expression
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2424 (<reg_exp>):
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2425 SUBEXP
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2426 \|
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2427 <reg_exp>
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2428 */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2429
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2430 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2431 parse_sub_exp (re_string_t regexp, regex_t preg, re_token_t *token,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2432 reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2433 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2434 re_dfa_t dfa = (re_dfa_t ) preg->buffer;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2435 bin_tree_t *tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2436 size_t cur_nsub;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2437 cur_nsub = preg->re_nsub++;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2438
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2439 fetch_token (token, regexp, syntax \| RE_CARET_ANCHORS_HERE);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2440
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2441 /* The subexpression may be a null string. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2442 if (token->type == OP_CLOSE_SUBEXP)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2443 tree = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2444 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2445 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2446 tree = parse_reg_exp (regexp, preg, token, syntax, nest, err);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2447 if (BE (*err == REG_NOERROR && token->type != OP_CLOSE_SUBEXP, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2448 *err = REG_EPAREN;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2449 if (BE (*err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2450 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2451 }
6171 5862ee08bfc1 * lib/regcomp.c (re_compile_fastmap_iter, init_dfa, init_word_char): Paul Eggert <eggert@cs.ucla.edu> parents: 6170 diff changeset	2452
5862ee08bfc1 * lib/regcomp.c (re_compile_fastmap_iter, init_dfa, init_word_char): Paul Eggert <eggert@cs.ucla.edu> parents: 6170 diff changeset	2453 if (cur_nsub <= '9' - '1')
5862ee08bfc1 * lib/regcomp.c (re_compile_fastmap_iter, init_dfa, init_word_char): Paul Eggert <eggert@cs.ucla.edu> parents: 6170 diff changeset	2454 dfa->completed_bkref_map \|= 1 << cur_nsub;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2455
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2456 tree = create_tree (dfa, tree, NULL, SUBEXP);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2457 if (BE (tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2458 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2459 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2460 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2461 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2462 tree->token.opr.idx = cur_nsub;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2463 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2464 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2465
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2466 /* This function parse repetition operators like "", "+", "{1,3}" etc. /
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2467
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2468 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2469 parse_dup_op (bin_tree_t elem, re_string_t regexp, re_dfa_t *dfa,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2470 re_token_t token, reg_syntax_t syntax, reg_errcode_t err)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2471 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2472 bin_tree_t tree = NULL, old_tree = NULL;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2473 Idx i, start, end, start_idx = re_string_cur_idx (regexp);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2474 re_token_t start_token = *token;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2475
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2476 if (token->type == OP_OPEN_DUP_NUM)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2477 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2478 end = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2479 start = fetch_number (regexp, token, syntax);
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2480 if (start == REG_MISSING)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2481 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2482 if (token->type == CHARACTER && token->opr.c == ',')
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2483 start = 0; /* We treat "{,m}" as "{0,m}". */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2484 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2485 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2486 err = REG_BADBR; / <re>{} is invalid. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2487 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2488 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2489 }
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2490 if (BE (start != REG_ERROR, 1))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2491 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2492 /* We treat "{n}" as "{n,n}". */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2493 end = ((token->type == OP_CLOSE_DUP_NUM) ? start
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2494 : ((token->type == CHARACTER && token->opr.c == ',')
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2495 ? fetch_number (regexp, token, syntax) : REG_ERROR));
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2496 }
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2497 if (BE (start == REG_ERROR \|\| end == REG_ERROR, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2498 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2499 /* Invalid sequence. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2500 if (BE (!(syntax & RE_INVALID_INTERVAL_ORD), 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2501 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2502 if (token->type == END_OF_RE)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2503 *err = REG_EBRACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2504 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2505 *err = REG_BADBR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2506
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2507 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2508 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2509
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2510 /* If the syntax bit is set, rollback. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2511 re_string_set_index (regexp, start_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2512 *token = start_token;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2513 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2514 /* mb_partial and word_char bits should be already initialized by
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2515 peek_token. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2516 return elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2517 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2518
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2519 if (BE (end != REG_MISSING && start > end, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2520 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2521 /* First number greater than second. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2522 *err = REG_BADBR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2523 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2524 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2525 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2526 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2527 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2528 start = (token->type == OP_DUP_PLUS) ? 1 : 0;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2529 end = (token->type == OP_DUP_QUESTION) ? 1 : REG_MISSING;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2530 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2531
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2532 fetch_token (token, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2533
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2534 if (BE (elem == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2535 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2536 if (BE (start == 0 && end == 0, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2537 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2538 postorder (elem, free_tree, NULL);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2539 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2540 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2541
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2542 /* Extract "<re>{n,m}" to "<re><re>...<re><re>{0,<m-n>}". */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2543 if (BE (start > 0, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2544 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2545 tree = elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2546 for (i = 2; i <= start; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2547 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2548 elem = duplicate_tree (elem, dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2549 tree = create_tree (dfa, tree, elem, CONCAT);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2550 if (BE (elem == NULL \|\| tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2551 goto parse_dup_op_espace;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2552 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2553
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2554 if (start == end)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2555 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2556
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2557 /* Duplicate ELEM before it is marked optional. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2558 elem = duplicate_tree (elem, dfa);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2559 old_tree = tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2560 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2561 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2562 old_tree = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2563
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2564 if (elem->token.type == SUBEXP)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2565 postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2566
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2567 tree = create_tree (dfa, elem, NULL,
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2568 (end == REG_MISSING ? OP_DUP_ASTERISK : OP_ALT));
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2569 if (BE (tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2570 goto parse_dup_op_espace;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2571
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2572 /* This loop is actually executed only when end != REG_MISSING,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2573 to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?... We have
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2574 already created the start+1-th copy. */
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2575 if ((Idx) -1 < 0 \|\| end != REG_MISSING)
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2576 for (i = start + 2; i <= end; ++i)
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2577 {
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2578 elem = duplicate_tree (elem, dfa);
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2579 tree = create_tree (dfa, tree, elem, CONCAT);
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2580 if (BE (elem == NULL \|\| tree == NULL, 0))
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2581 goto parse_dup_op_espace;
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2582
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2583 tree = create_tree (dfa, tree, NULL, OP_ALT);
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2584 if (BE (tree == NULL, 0))
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2585 goto parse_dup_op_espace;
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2586 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2587
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2588 if (old_tree)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2589 tree = create_tree (dfa, old_tree, tree, CONCAT);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2590
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2591 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2592
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2593 parse_dup_op_espace:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2594 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2595 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2596 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2597
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2598 /* Size of the names for collating symbol/equivalence_class/character_class.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2599 I'm not sure, but maybe enough. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2600 #define BRACKET_NAME_BUF_SIZE 32
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2601
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2602 #ifndef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2603 /* Local function for parse_bracket_exp only used in case of NOT _LIBC.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2604 Build the range expression which starts from START_ELEM, and ends
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2605 at END_ELEM. The result are written to MBCSET and SBCSET.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2606 RANGE_ALLOC is the allocated size of mbcset->range_starts, and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2607 mbcset->range_ends, is a pointer argument sinse we may
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2608 update it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2609
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2610 static reg_errcode_t
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2611 internal_function
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2612 # ifdef RE_ENABLE_I18N
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2613 build_range_exp (bitset_t sbcset, re_charset_t mbcset, Idx range_alloc,
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2614 bracket_elem_t start_elem, bracket_elem_t end_elem)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2615 # else /* not RE_ENABLE_I18N */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2616 build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2617 bracket_elem_t *end_elem)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2618 # endif /* not RE_ENABLE_I18N */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2619 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2620 unsigned int start_ch, end_ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2621 /* Equivalence Classes and Character Classes can't be a range start/end. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2622 if (BE (start_elem->type == EQUIV_CLASS \|\| start_elem->type == CHAR_CLASS
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2623 \|\| end_elem->type == EQUIV_CLASS \|\| end_elem->type == CHAR_CLASS,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2624 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2625 return REG_ERANGE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2626
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2627 /* We can handle no multi character collating elements without libc
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2628 support. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2629 if (BE ((start_elem->type == COLL_SYM
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2630 && strlen ((char *) start_elem->opr.name) > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2631 \|\| (end_elem->type == COLL_SYM
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2632 && strlen ((char *) end_elem->opr.name) > 1), 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2633 return REG_ECOLLATE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2634
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2635 # ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2636 {
5972 aa260da0bbbe * config/srclist.txt: Comment out regcomp.c, since we have a porting fix Paul Eggert <eggert@cs.ucla.edu> parents: 5968 diff changeset	2637 wchar_t wc;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2638 wint_t start_wc;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2639 wint_t end_wc;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2640 wchar_t cmp_buf[6] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'};
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2641
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2642 start_ch = ((start_elem->type == SB_CHAR) ? start_elem->opr.ch
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2643 : ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2644 : 0));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2645 end_ch = ((end_elem->type == SB_CHAR) ? end_elem->opr.ch
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2646 : ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2647 : 0));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2648 start_wc = ((start_elem->type == SB_CHAR \|\| start_elem->type == COLL_SYM)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2649 ? __btowc (start_ch) : start_elem->opr.wch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2650 end_wc = ((end_elem->type == SB_CHAR \|\| end_elem->type == COLL_SYM)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2651 ? __btowc (end_ch) : end_elem->opr.wch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2652 if (start_wc == WEOF \|\| end_wc == WEOF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2653 return REG_ECOLLATE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2654 cmp_buf[0] = start_wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2655 cmp_buf[4] = end_wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2656 if (wcscoll (cmp_buf, cmp_buf + 4) > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2657 return REG_ERANGE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2658
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2659 /* Got valid collation sequence values, add them as a new entry.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2660 However, for !_LIBC we have no collation elements: if the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2661 character set is single byte, the single byte character set
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2662 that we build below suffices. parse_bracket_exp passes
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2663 no MBCSET if dfa->mb_cur_max == 1. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2664 if (mbcset)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2665 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2666 /* Check the space of the arrays. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2667 if (BE (*range_alloc == mbcset->nranges, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2668 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2669 /* There is not enough space, need realloc. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2670 wchar_t new_array_start, new_array_end;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2671 Idx new_nranges;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2672
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2673 /* +1 in case of mbcset->nranges is 0. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2674 new_nranges = 2 * mbcset->nranges + 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2675 /* Use realloc since mbcset->range_starts and mbcset->range_ends
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2676 are NULL if range_alloc == 0. /
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2677 new_array_start = re_realloc (mbcset->range_starts, wchar_t,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2678 new_nranges);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2679 new_array_end = re_realloc (mbcset->range_ends, wchar_t,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2680 new_nranges);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2681
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2682 if (BE (new_array_start == NULL \|\| new_array_end == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2683 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2684
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2685 mbcset->range_starts = new_array_start;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2686 mbcset->range_ends = new_array_end;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2687 *range_alloc = new_nranges;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2688 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2689
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2690 mbcset->range_starts[mbcset->nranges] = start_wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2691 mbcset->range_ends[mbcset->nranges++] = end_wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2692 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2693
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2694 /* Build the table for single byte characters. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2695 for (wc = 0; wc < SBC_MAX; ++wc)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2696 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2697 cmp_buf[2] = wc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2698 if (wcscoll (cmp_buf, cmp_buf + 2) <= 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2699 && wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2700 bitset_set (sbcset, wc);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2701 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2702 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2703 # else /* not RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2704 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2705 unsigned int ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2706 start_ch = ((start_elem->type == SB_CHAR ) ? start_elem->opr.ch
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2707 : ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2708 : 0));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2709 end_ch = ((end_elem->type == SB_CHAR ) ? end_elem->opr.ch
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2710 : ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2711 : 0));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2712 if (start_ch > end_ch)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2713 return REG_ERANGE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2714 /* Build the table for single byte characters. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2715 for (ch = 0; ch < SBC_MAX; ++ch)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2716 if (start_ch <= ch && ch <= end_ch)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2717 bitset_set (sbcset, ch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2718 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2719 # endif /* not RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2720 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2721 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2722 #endif /* not _LIBC */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2723
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2724 #ifndef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2725 /* Helper function for parse_bracket_exp only used in case of NOT _LIBC..
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2726 Build the collating element which is represented by NAME.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2727 The result are written to MBCSET and SBCSET.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2728 COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2729 pointer argument since we may update it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2730
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2731 static reg_errcode_t
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2732 internal_function
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2733 build_collating_symbol (bitset_t sbcset,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2734 # ifdef RE_ENABLE_I18N
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2735 re_charset_t mbcset, Idx coll_sym_alloc,
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2736 # endif
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2737 const unsigned char *name)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2738 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2739 size_t name_len = strlen ((const char *) name);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2740 if (BE (name_len != 1, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2741 return REG_ECOLLATE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2742 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2743 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2744 bitset_set (sbcset, name[0]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2745 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2746 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2747 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2748 #endif /* not _LIBC */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2749
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2750 /* This function parse bracket expression like "[abc]", "[a-c]",
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2751 "[[.a-a.]]" etc. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2752
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2753 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2754 parse_bracket_exp (re_string_t regexp, re_dfa_t dfa, re_token_t *token,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	2755 reg_syntax_t syntax, reg_errcode_t *err)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2756 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2757 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2758 const unsigned char *collseqmb;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2759 const char *collseqwc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2760 uint32_t nrules;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2761 int32_t table_size;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2762 const int32_t *symb_table;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2763 const unsigned char *extra;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2764
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2765 /* Local function for parse_bracket_exp used in _LIBC environement.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2766 Seek the collating symbol entry correspondings to NAME.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2767 Return the index of the symbol in the SYMB_TABLE. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2768
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2769 auto inline int32_t
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2770 __attribute ((always_inline))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2771 seek_collating_symbol_entry (name, name_len)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2772 const unsigned char *name;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2773 size_t name_len;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2774 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2775 int32_t hash = elem_hash ((const char *) name, name_len);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2776 int32_t elem = hash % table_size;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2777 if (symb_table[2 * elem] != 0)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2778 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2779 int32_t second = hash % (table_size - 2) + 1;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2780
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2781 do
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2782 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2783 /* First compare the hashing value. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2784 if (symb_table[2 * elem] == hash
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2785 /* Compare the length of the name. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2786 && name_len == extra[symb_table[2 * elem + 1]]
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2787 /* Compare the name. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2788 && memcmp (name, &extra[symb_table[2 * elem + 1] + 1],
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2789 name_len) == 0)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2790 {
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2791 /* Yep, this is the entry. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2792 break;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2793 }
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2794
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2795 /* Next entry. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2796 elem += second;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2797 }
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2798 while (symb_table[2 * elem] != 0);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2799 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2800 return elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2801 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2802
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2803 /* Local function for parse_bracket_exp used in _LIBC environement.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2804 Look up the collation sequence value of BR_ELEM.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2805 Return the value if succeeded, UINT_MAX otherwise. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2806
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2807 auto inline unsigned int
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2808 __attribute ((always_inline))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2809 lookup_collation_sequence_value (br_elem)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2810 bracket_elem_t *br_elem;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2811 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2812 if (br_elem->type == SB_CHAR)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2813 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2814 /*
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2815 if (MB_CUR_MAX == 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2816 */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2817 if (nrules == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2818 return collseqmb[br_elem->opr.ch];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2819 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2820 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2821 wint_t wc = __btowc (br_elem->opr.ch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2822 return __collseq_table_lookup (collseqwc, wc);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2823 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2824 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2825 else if (br_elem->type == MB_CHAR)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2826 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2827 return __collseq_table_lookup (collseqwc, br_elem->opr.wch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2828 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2829 else if (br_elem->type == COLL_SYM)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2830 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2831 size_t sym_name_len = strlen ((char *) br_elem->opr.name);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2832 if (nrules != 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2833 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2834 int32_t elem, idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2835 elem = seek_collating_symbol_entry (br_elem->opr.name,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2836 sym_name_len);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2837 if (symb_table[2 * elem] != 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2838 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2839 /* We found the entry. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2840 idx = symb_table[2 * elem + 1];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2841 /* Skip the name of collating element name. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2842 idx += 1 + extra[idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2843 /* Skip the byte sequence of the collating element. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2844 idx += 1 + extra[idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2845 /* Adjust for the alignment. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2846 idx = (idx + 3) & ~3;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2847 /* Skip the multibyte collation sequence value. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2848 idx += sizeof (unsigned int);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2849 /* Skip the wide char sequence of the collating element. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2850 idx += sizeof (unsigned int) *
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2851 (1 + (unsigned int ) (extra + idx));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2852 /* Return the collation sequence value. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2853 return (unsigned int ) (extra + idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2854 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2855 else if (symb_table[2 * elem] == 0 && sym_name_len == 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2856 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2857 /* No valid character. Match it as a single byte
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2858 character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2859 return collseqmb[br_elem->opr.name[0]];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2860 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2861 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2862 else if (sym_name_len == 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2863 return collseqmb[br_elem->opr.name[0]];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2864 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2865 return UINT_MAX;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2866 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2867
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2868 /* Local function for parse_bracket_exp used in _LIBC environement.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2869 Build the range expression which starts from START_ELEM, and ends
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2870 at END_ELEM. The result are written to MBCSET and SBCSET.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2871 RANGE_ALLOC is the allocated size of mbcset->range_starts, and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2872 mbcset->range_ends, is a pointer argument sinse we may
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2873 update it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2874
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2875 auto inline reg_errcode_t
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2876 __attribute ((always_inline))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2877 build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2878 re_charset_t *mbcset;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2879 Idx *range_alloc;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2880 bitset_t sbcset;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2881 bracket_elem_t start_elem, end_elem;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2882 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2883 unsigned int ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2884 uint32_t start_collseq;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2885 uint32_t end_collseq;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2886
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2887 /* Equivalence Classes and Character Classes can't be a range
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2888 start/end. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2889 if (BE (start_elem->type == EQUIV_CLASS \|\| start_elem->type == CHAR_CLASS
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2890 \|\| end_elem->type == EQUIV_CLASS \|\| end_elem->type == CHAR_CLASS,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2891 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2892 return REG_ERANGE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2893
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2894 start_collseq = lookup_collation_sequence_value (start_elem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2895 end_collseq = lookup_collation_sequence_value (end_elem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2896 /* Check start/end collation sequence values. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2897 if (BE (start_collseq == UINT_MAX \|\| end_collseq == UINT_MAX, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2898 return REG_ECOLLATE;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2899 if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_collseq > end_collseq, 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2900 return REG_ERANGE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2901
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2902 /* Got valid collation sequence values, add them as a new entry.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2903 However, if we have no collation elements, and the character set
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2904 is single byte, the single byte character set that we
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2905 build below suffices. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2906 if (nrules > 0 \|\| dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2907 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2908 /* Check the space of the arrays. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2909 if (BE (*range_alloc == mbcset->nranges, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2910 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2911 /* There is not enough space, need realloc. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2912 uint32_t *new_array_start;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2913 uint32_t *new_array_end;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	2914 Idx new_nranges;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2915
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2916 /* +1 in case of mbcset->nranges is 0. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2917 new_nranges = 2 * mbcset->nranges + 1;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2918 new_array_start = re_realloc (mbcset->range_starts, uint32_t,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2919 new_nranges);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2920 new_array_end = re_realloc (mbcset->range_ends, uint32_t,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2921 new_nranges);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2922
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2923 if (BE (new_array_start == NULL \|\| new_array_end == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2924 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2925
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2926 mbcset->range_starts = new_array_start;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2927 mbcset->range_ends = new_array_end;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2928 *range_alloc = new_nranges;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2929 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2930
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2931 mbcset->range_starts[mbcset->nranges] = start_collseq;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2932 mbcset->range_ends[mbcset->nranges++] = end_collseq;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2933 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2934
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2935 /* Build the table for single byte characters. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2936 for (ch = 0; ch < SBC_MAX; ch++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2937 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2938 uint32_t ch_collseq;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2939 /*
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2940 if (MB_CUR_MAX == 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2941 */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2942 if (nrules == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2943 ch_collseq = collseqmb[ch];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2944 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2945 ch_collseq = __collseq_table_lookup (collseqwc, __btowc (ch));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2946 if (start_collseq <= ch_collseq && ch_collseq <= end_collseq)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2947 bitset_set (sbcset, ch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2948 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2949 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2950 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2951
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2952 /* Local function for parse_bracket_exp used in _LIBC environement.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2953 Build the collating element which is represented by NAME.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2954 The result are written to MBCSET and SBCSET.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2955 COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2956 pointer argument sinse we may update it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2957
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2958 auto inline reg_errcode_t
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2959 __attribute ((always_inline))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2960 build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2961 re_charset_t *mbcset;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2962 Idx *coll_sym_alloc;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2963 bitset_t sbcset;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2964 const unsigned char *name;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2965 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2966 int32_t elem, idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2967 size_t name_len = strlen ((const char *) name);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2968 if (nrules != 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2969 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2970 elem = seek_collating_symbol_entry (name, name_len);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2971 if (symb_table[2 * elem] != 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2972 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2973 /* We found the entry. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2974 idx = symb_table[2 * elem + 1];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2975 /* Skip the name of collating element name. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2976 idx += 1 + extra[idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2977 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2978 else if (symb_table[2 * elem] == 0 && name_len == 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2979 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2980 /* No valid character, treat it as a normal
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2981 character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2982 bitset_set (sbcset, name[0]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2983 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2984 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2985 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2986 return REG_ECOLLATE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2987
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2988 /* Got valid collation sequence, add it as a new entry. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2989 /* Check the space of the arrays. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2990 if (BE (*coll_sym_alloc == mbcset->ncoll_syms, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2991 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2992 /* Not enough, realloc it. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2993 /* +1 in case of mbcset->ncoll_syms is 0. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2994 Idx new_coll_sym_alloc = 2 * mbcset->ncoll_syms + 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2995 /* Use realloc since mbcset->coll_syms is NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2996 if alloc == 0. /
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2997 int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2998 new_coll_sym_alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2999 if (BE (new_coll_syms == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3000 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3001 mbcset->coll_syms = new_coll_syms;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3002 *coll_sym_alloc = new_coll_sym_alloc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3003 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3004 mbcset->coll_syms[mbcset->ncoll_syms++] = idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3005 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3006 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3007 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3008 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3009 if (BE (name_len != 1, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3010 return REG_ECOLLATE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3011 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3012 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3013 bitset_set (sbcset, name[0]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3014 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3015 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3016 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3017 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3018 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3019
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3020 re_token_t br_token;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3021 re_bitset_ptr_t sbcset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3022 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3023 re_charset_t *mbcset;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3024 Idx coll_sym_alloc = 0, range_alloc = 0, mbchar_alloc = 0;
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3025 Idx equiv_class_alloc = 0, char_class_alloc = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3026 #endif /* not RE_ENABLE_I18N */
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	3027 bool non_match = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3028 bin_tree_t *work_tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3029 int token_len;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	3030 bool first_round = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3031 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3032 collseqmb = (const unsigned char *)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3033 _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3034 nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3035 if (nrules)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3036 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3037 /*
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3038 if (MB_CUR_MAX > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3039 */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3040 collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3041 table_size = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_SYMB_HASH_SIZEMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3042 symb_table = (const int32_t *) _NL_CURRENT (LC_COLLATE,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3043 _NL_COLLATE_SYMB_TABLEMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3044 extra = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3045 _NL_COLLATE_SYMB_EXTRAMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3046 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3047 #endif
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3048 sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3049 #ifdef RE_ENABLE_I18N
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3050 mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3051 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3052 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3053 if (BE (sbcset == NULL \|\| mbcset == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3054 #else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3055 if (BE (sbcset == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3056 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3057 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3058 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3059 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3060 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3061
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3062 token_len = peek_token_bracket (token, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3063 if (BE (token->type == END_OF_RE, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3064 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3065 *err = REG_BADPAT;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3066 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3067 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3068 if (token->type == OP_NON_MATCH_LIST)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3069 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3070 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3071 mbcset->non_match = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3072 #endif /* not RE_ENABLE_I18N */
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	3073 non_match = true;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3074 if (syntax & RE_HAT_LISTS_NOT_NEWLINE)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3075 bitset_set (sbcset, '\0');
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3076 re_string_skip_bytes (regexp, token_len); /* Skip a token. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3077 token_len = peek_token_bracket (token, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3078 if (BE (token->type == END_OF_RE, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3079 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3080 *err = REG_BADPAT;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3081 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3082 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3083 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3084
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3085 /* We treat the first ']' as a normal character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3086 if (token->type == OP_CLOSE_BRACKET)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3087 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3088
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3089 while (1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3090 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3091 bracket_elem_t start_elem, end_elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3092 unsigned char start_name_buf[BRACKET_NAME_BUF_SIZE];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3093 unsigned char end_name_buf[BRACKET_NAME_BUF_SIZE];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3094 reg_errcode_t ret;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	3095 int token_len2 = 0;
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	3096 bool is_range_exp = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3097 re_token_t token2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3098
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3099 start_elem.opr.name = start_name_buf;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3100 ret = parse_bracket_element (&start_elem, regexp, token, token_len, dfa,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3101 syntax, first_round);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3102 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3103 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3104 *err = ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3105 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3106 }
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	3107 first_round = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3108
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3109 /* Get information about the next token. We need it in any case. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3110 token_len = peek_token_bracket (token, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3111
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3112 /* Do not check for ranges if we know they are not allowed. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3113 if (start_elem.type != CHAR_CLASS && start_elem.type != EQUIV_CLASS)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3114 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3115 if (BE (token->type == END_OF_RE, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3116 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3117 *err = REG_EBRACK;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3118 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3119 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3120 if (token->type == OP_CHARSET_RANGE)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3121 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3122 re_string_skip_bytes (regexp, token_len); /* Skip '-'. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3123 token_len2 = peek_token_bracket (&token2, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3124 if (BE (token2.type == END_OF_RE, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3125 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3126 *err = REG_EBRACK;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3127 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3128 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3129 if (token2.type == OP_CLOSE_BRACKET)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3130 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3131 /* We treat the last '-' as a normal character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3132 re_string_skip_bytes (regexp, -token_len);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3133 token->type = CHARACTER;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3134 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3135 else
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	3136 is_range_exp = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3137 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3138 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3139
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	3140 if (is_range_exp == true)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3141 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3142 end_elem.opr.name = end_name_buf;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3143 ret = parse_bracket_element (&end_elem, regexp, &token2, token_len2,
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	3144 dfa, syntax, true);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3145 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3146 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3147 *err = ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3148 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3149 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3150
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3151 token_len = peek_token_bracket (token, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3152
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3153 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3154 *err = build_range_exp (sbcset, mbcset, &range_alloc,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3155 &start_elem, &end_elem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3156 #else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3157 # ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3158 *err = build_range_exp (sbcset,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3159 dfa->mb_cur_max > 1 ? mbcset : NULL,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3160 &range_alloc, &start_elem, &end_elem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3161 # else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3162 *err = build_range_exp (sbcset, &start_elem, &end_elem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3163 # endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3164 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3165 if (BE (*err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3166 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3167 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3168 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3169 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3170 switch (start_elem.type)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3171 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3172 case SB_CHAR:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3173 bitset_set (sbcset, start_elem.opr.ch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3174 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3175 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3176 case MB_CHAR:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3177 /* Check whether the array has enough space. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3178 if (BE (mbchar_alloc == mbcset->nmbchars, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3179 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3180 wchar_t *new_mbchars;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3181 /* Not enough, realloc it. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3182 /* +1 in case of mbcset->nmbchars is 0. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3183 mbchar_alloc = 2 * mbcset->nmbchars + 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3184 /* Use realloc since array is NULL if alloc == 0. /
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3185 new_mbchars = re_realloc (mbcset->mbchars, wchar_t,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3186 mbchar_alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3187 if (BE (new_mbchars == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3188 goto parse_bracket_exp_espace;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3189 mbcset->mbchars = new_mbchars;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3190 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3191 mbcset->mbchars[mbcset->nmbchars++] = start_elem.opr.wch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3192 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3193 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3194 case EQUIV_CLASS:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3195 *err = build_equiv_class (sbcset,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3196 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3197 mbcset, &equiv_class_alloc,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3198 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3199 start_elem.opr.name);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3200 if (BE (*err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3201 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3202 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3203 case COLL_SYM:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3204 *err = build_collating_symbol (sbcset,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3205 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3206 mbcset, &coll_sym_alloc,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3207 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3208 start_elem.opr.name);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3209 if (BE (*err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3210 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3211 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3212 case CHAR_CLASS:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3213 *err = build_charclass (regexp->trans, sbcset,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3214 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3215 mbcset, &char_class_alloc,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3216 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3217 start_elem.opr.name, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3218 if (BE (*err != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3219 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3220 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3221 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3222 assert (0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3223 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3224 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3225 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3226 if (BE (token->type == END_OF_RE, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3227 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3228 *err = REG_EBRACK;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3229 goto parse_bracket_exp_free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3230 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3231 if (token->type == OP_CLOSE_BRACKET)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3232 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3233 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3234
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3235 re_string_skip_bytes (regexp, token_len); /* Skip a token. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3236
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3237 /* If it is non-matching list. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3238 if (non_match)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3239 bitset_not (sbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3240
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3241 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3242 /* Ensure only single byte characters are set. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3243 if (dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3244 bitset_mask (sbcset, dfa->sb_char);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3245
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3246 if (mbcset->nmbchars \|\| mbcset->ncoll_syms \|\| mbcset->nequiv_classes
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3247 \|\| mbcset->nranges \|\| (dfa->mb_cur_max > 1 && (mbcset->nchar_classes
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3248 \|\| mbcset->non_match)))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3249 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3250 bin_tree_t *mbc_tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3251 int sbc_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3252 /* Build a tree for complex bracket. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3253 dfa->has_mb_node = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3254 br_token.type = COMPLEX_BRACKET;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3255 br_token.opr.mbcset = mbcset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3256 mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3257 if (BE (mbc_tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3258 goto parse_bracket_exp_espace;
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3259 for (sbc_idx = 0; sbc_idx < BITSET_WORDS; ++sbc_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3260 if (sbcset[sbc_idx])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3261 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3262 /* If there are no bits set in sbcset, there is no point
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3263 of having both SIMPLE_BRACKET and COMPLEX_BRACKET. */
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3264 if (sbc_idx < BITSET_WORDS)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3265 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3266 /* Build a tree for simple bracket. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3267 br_token.type = SIMPLE_BRACKET;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3268 br_token.opr.sbcset = sbcset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3269 work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3270 if (BE (work_tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3271 goto parse_bracket_exp_espace;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3272
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3273 /* Then join them by ALT node. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3274 work_tree = create_tree (dfa, work_tree, mbc_tree, OP_ALT);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3275 if (BE (work_tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3276 goto parse_bracket_exp_espace;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3277 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3278 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3279 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3280 re_free (sbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3281 work_tree = mbc_tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3282 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3283 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3284 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3285 #endif /* not RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3286 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3287 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3288 free_charset (mbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3289 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3290 /* Build a tree for simple bracket. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3291 br_token.type = SIMPLE_BRACKET;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3292 br_token.opr.sbcset = sbcset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3293 work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3294 if (BE (work_tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3295 goto parse_bracket_exp_espace;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3296 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3297 return work_tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3298
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3299 parse_bracket_exp_espace:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3300 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3301 parse_bracket_exp_free_return:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3302 re_free (sbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3303 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3304 free_charset (mbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3305 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3306 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3307 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3308
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3309 /* Parse an element in the bracket expression. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3310
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3311 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3312 parse_bracket_element (bracket_elem_t elem, re_string_t regexp,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3313 re_token_t token, int token_len, re_dfa_t dfa,
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	3314 reg_syntax_t syntax, bool accept_hyphen)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3315 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3316 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3317 int cur_char_size;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3318 cur_char_size = re_string_char_size_at (regexp, re_string_cur_idx (regexp));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3319 if (cur_char_size > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3320 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3321 elem->type = MB_CHAR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3322 elem->opr.wch = re_string_wchar_at (regexp, re_string_cur_idx (regexp));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3323 re_string_skip_bytes (regexp, cur_char_size);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3324 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3325 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3326 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3327 re_string_skip_bytes (regexp, token_len); /* Skip a token. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3328 if (token->type == OP_OPEN_COLL_ELEM \|\| token->type == OP_OPEN_CHAR_CLASS
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3329 \|\| token->type == OP_OPEN_EQUIV_CLASS)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3330 return parse_bracket_symbol (elem, regexp, token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3331 if (BE (token->type == OP_CHARSET_RANGE, 0) && !accept_hyphen)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3332 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3333 /* A '-' must only appear as anything but a range indicator before
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3334 the closing bracket. Everything else is an error. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3335 re_token_t token2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3336 (void) peek_token_bracket (&token2, regexp, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3337 if (token2.type != OP_CLOSE_BRACKET)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3338 /* The actual error value is not standardized since this whole
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3339 case is undefined. But ERANGE makes good sense. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3340 return REG_ERANGE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3341 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3342 elem->type = SB_CHAR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3343 elem->opr.ch = token->opr.c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3344 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3345 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3346
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3347 /* Parse a bracket symbol in the bracket expression. Bracket symbols are
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3348 such as [:<character_class>:], [.<collating_element>.], and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3349 [=<equivalent_class>=]. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3350
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3351 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3352 parse_bracket_symbol (bracket_elem_t elem, re_string_t regexp,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3353 re_token_t *token)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3354 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3355 unsigned char ch, delim = token->opr.c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3356 int i = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3357 if (re_string_eoi(regexp))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3358 return REG_EBRACK;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3359 for (;; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3360 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3361 if (i >= BRACKET_NAME_BUF_SIZE)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3362 return REG_EBRACK;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3363 if (token->type == OP_OPEN_CHAR_CLASS)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3364 ch = re_string_fetch_byte_case (regexp);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3365 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3366 ch = re_string_fetch_byte (regexp);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3367 if (re_string_eoi(regexp))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3368 return REG_EBRACK;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3369 if (ch == delim && re_string_peek_byte (regexp, 0) == ']')
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3370 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3371 elem->opr.name[i] = ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3372 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3373 re_string_skip_bytes (regexp, 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3374 elem->opr.name[i] = '\0';
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3375 switch (token->type)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3376 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3377 case OP_OPEN_COLL_ELEM:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3378 elem->type = COLL_SYM;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3379 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3380 case OP_OPEN_EQUIV_CLASS:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3381 elem->type = EQUIV_CLASS;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3382 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3383 case OP_OPEN_CHAR_CLASS:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3384 elem->type = CHAR_CLASS;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3385 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3386 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3387 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3388 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3389 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3390 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3391
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3392 /* Helper function for parse_bracket_exp.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3393 Build the equivalence class which is represented by NAME.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3394 The result are written to MBCSET and SBCSET.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3395 EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3396 is a pointer argument sinse we may update it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3397
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3398 static reg_errcode_t
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3399 #ifdef RE_ENABLE_I18N
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3400 build_equiv_class (bitset_t sbcset, re_charset_t *mbcset,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3401 Idx equiv_class_alloc, const unsigned char name)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3402 #else /* not RE_ENABLE_I18N */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3403 build_equiv_class (bitset_t sbcset, const unsigned char *name)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3404 #endif /* not RE_ENABLE_I18N */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3405 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3406 #ifdef _LIBC
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3407 uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3408 if (nrules != 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3409 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3410 const int32_t table, indirect;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3411 const unsigned char weights, extra, *cp;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3412 unsigned char char_buf[2];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3413 int32_t idx1, idx2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3414 unsigned int ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3415 size_t len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3416 /* This #include defines a local function! */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3417 # include <locale/weight.h>
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3418 /* Calculate the index for equivalence class. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3419 cp = name;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3420 table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3421 weights = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3422 _NL_COLLATE_WEIGHTMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3423 extra = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3424 _NL_COLLATE_EXTRAMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3425 indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3426 _NL_COLLATE_INDIRECTMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3427 idx1 = findidx (&cp);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3428 if (BE (idx1 == 0 \|\| cp < name + strlen ((const char *) name), 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3429 /* This isn't a valid character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3430 return REG_ECOLLATE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3431
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3432 /* Build single byte matcing table for this equivalence class. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3433 char_buf[1] = (unsigned char) '\0';
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3434 len = weights[idx1];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3435 for (ch = 0; ch < SBC_MAX; ++ch)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3436 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3437 char_buf[0] = ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3438 cp = char_buf;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3439 idx2 = findidx (&cp);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3440 /*
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3441 idx2 = table[ch];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3442 */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3443 if (idx2 == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3444 /* This isn't a valid character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3445 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3446 if (len == weights[idx2])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3447 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3448 int cnt = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3449 while (cnt <= len &&
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3450 weights[idx1 + 1 + cnt] == weights[idx2 + 1 + cnt])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3451 ++cnt;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3452
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3453 if (cnt > len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3454 bitset_set (sbcset, ch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3455 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3456 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3457 /* Check whether the array has enough space. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3458 if (BE (*equiv_class_alloc == mbcset->nequiv_classes, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3459 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3460 /* Not enough, realloc it. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3461 /* +1 in case of mbcset->nequiv_classes is 0. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3462 Idx new_equiv_class_alloc = 2 * mbcset->nequiv_classes + 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3463 /* Use realloc since the array is NULL if alloc == 0. /
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3464 int32_t *new_equiv_classes = re_realloc (mbcset->equiv_classes,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3465 int32_t,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3466 new_equiv_class_alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3467 if (BE (new_equiv_classes == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3468 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3469 mbcset->equiv_classes = new_equiv_classes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3470 *equiv_class_alloc = new_equiv_class_alloc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3471 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3472 mbcset->equiv_classes[mbcset->nequiv_classes++] = idx1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3473 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3474 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3475 #endif /* _LIBC */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3476 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3477 if (BE (strlen ((const char *) name) != 1, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3478 return REG_ECOLLATE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3479 bitset_set (sbcset, *name);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3480 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3481 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3482 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3483
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3484 /* Helper function for parse_bracket_exp.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3485 Build the character class which is represented by NAME.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3486 The result are written to MBCSET and SBCSET.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3487 CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3488 is a pointer argument sinse we may update it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3489
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3490 static reg_errcode_t
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3491 #ifdef RE_ENABLE_I18N
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3492 build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3493 re_charset_t mbcset, Idx char_class_alloc,
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3494 const unsigned char *class_name, reg_syntax_t syntax)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3495 #else /* not RE_ENABLE_I18N */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3496 build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3497 const unsigned char *class_name, reg_syntax_t syntax)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3498 #endif /* not RE_ENABLE_I18N */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3499 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3500 int i;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3501 const char name = (const char ) class_name;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3502
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3503 /* In case of REG_ICASE "upper" and "lower" match the both of
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3504 upper and lower cases. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3505 if ((syntax & RE_ICASE)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3506 && (strcmp (name, "upper") == 0 \|\| strcmp (name, "lower") == 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3507 name = "alpha";
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3508
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3509 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3510 /* Check the space of the arrays. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3511 if (BE (*char_class_alloc == mbcset->nchar_classes, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3512 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3513 /* Not enough, realloc it. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3514 /* +1 in case of mbcset->nchar_classes is 0. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3515 Idx new_char_class_alloc = 2 * mbcset->nchar_classes + 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3516 /* Use realloc since array is NULL if alloc == 0. /
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3517 wctype_t *new_char_classes = re_realloc (mbcset->char_classes, wctype_t,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3518 new_char_class_alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3519 if (BE (new_char_classes == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3520 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3521 mbcset->char_classes = new_char_classes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3522 *char_class_alloc = new_char_class_alloc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3523 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3524 mbcset->char_classes[mbcset->nchar_classes++] = __wctype (name);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3525 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3526
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3527 #define BUILD_CHARCLASS_LOOP(ctype_func) \
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3528 do { \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3529 if (BE (trans != NULL, 0)) \
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3530 { \
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3531 for (i = 0; i < SBC_MAX; ++i) \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3532 if (ctype_func (i)) \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3533 bitset_set (sbcset, trans[i]); \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3534 } \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3535 else \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3536 { \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3537 for (i = 0; i < SBC_MAX; ++i) \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3538 if (ctype_func (i)) \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3539 bitset_set (sbcset, i); \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3540 } \
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3541 } while (0)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3542
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3543 if (strcmp (name, "alnum") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3544 BUILD_CHARCLASS_LOOP (isalnum);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3545 else if (strcmp (name, "cntrl") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3546 BUILD_CHARCLASS_LOOP (iscntrl);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3547 else if (strcmp (name, "lower") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3548 BUILD_CHARCLASS_LOOP (islower);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3549 else if (strcmp (name, "space") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3550 BUILD_CHARCLASS_LOOP (isspace);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3551 else if (strcmp (name, "alpha") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3552 BUILD_CHARCLASS_LOOP (isalpha);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3553 else if (strcmp (name, "digit") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3554 BUILD_CHARCLASS_LOOP (isdigit);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3555 else if (strcmp (name, "print") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3556 BUILD_CHARCLASS_LOOP (isprint);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3557 else if (strcmp (name, "upper") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3558 BUILD_CHARCLASS_LOOP (isupper);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3559 else if (strcmp (name, "blank") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3560 BUILD_CHARCLASS_LOOP (isblank);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3561 else if (strcmp (name, "graph") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3562 BUILD_CHARCLASS_LOOP (isgraph);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3563 else if (strcmp (name, "punct") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3564 BUILD_CHARCLASS_LOOP (ispunct);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3565 else if (strcmp (name, "xdigit") == 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3566 BUILD_CHARCLASS_LOOP (isxdigit);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3567 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3568 return REG_ECTYPE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3569
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3570 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3571 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3572
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3573 static bin_tree_t *
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3574 build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3575 const unsigned char *class_name,
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3576 const unsigned char *extra, bool non_match,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3577 reg_errcode_t *err)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3578 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3579 re_bitset_ptr_t sbcset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3580 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3581 re_charset_t *mbcset;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3582 Idx alloc = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3583 #endif /* not RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3584 reg_errcode_t ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3585 re_token_t br_token;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3586 bin_tree_t *tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3587
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3588 sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3589 #ifdef RE_ENABLE_I18N
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3590 mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3591 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3592
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3593 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3594 if (BE (sbcset == NULL \|\| mbcset == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3595 #else /* not RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3596 if (BE (sbcset == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3597 #endif /* not RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3598 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3599 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3600 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3601 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3602
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3603 if (non_match)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3604 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3605 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3606 /*
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3607 if (syntax & RE_HAT_LISTS_NOT_NEWLINE)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3608 bitset_set(cset->sbcset, '\0');
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3609 */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3610 mbcset->non_match = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3611 #endif /* not RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3612 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3613
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3614 /* We don't care the syntax in this case. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3615 ret = build_charclass (trans, sbcset,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3616 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3617 mbcset, &alloc,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3618 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3619 class_name, 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3620
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3621 if (BE (ret != REG_NOERROR, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3622 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3623 re_free (sbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3624 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3625 free_charset (mbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3626 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3627 *err = ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3628 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3629 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3630 /* \w match '_' also. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3631 for (; *extra; extra++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3632 bitset_set (sbcset, *extra);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3633
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3634 /* If it is non-matching list. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3635 if (non_match)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3636 bitset_not (sbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3637
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3638 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3639 /* Ensure only single byte characters are set. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3640 if (dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3641 bitset_mask (sbcset, dfa->sb_char);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3642 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3643
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3644 /* Build a tree for simple bracket. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3645 br_token.type = SIMPLE_BRACKET;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3646 br_token.opr.sbcset = sbcset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3647 tree = create_token_tree (dfa, NULL, NULL, &br_token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3648 if (BE (tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3649 goto build_word_op_espace;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3650
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3651 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3652 if (dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3653 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3654 bin_tree_t *mbc_tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3655 /* Build a tree for complex bracket. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3656 br_token.type = COMPLEX_BRACKET;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3657 br_token.opr.mbcset = mbcset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3658 dfa->has_mb_node = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3659 mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3660 if (BE (mbc_tree == NULL, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3661 goto build_word_op_espace;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3662 /* Then join them by ALT node. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3663 tree = create_tree (dfa, tree, mbc_tree, OP_ALT);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3664 if (BE (mbc_tree != NULL, 1))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3665 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3666 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3667 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3668 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3669 free_charset (mbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3670 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3671 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3672 #else /* not RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3673 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3674 #endif /* not RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3675
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3676 build_word_op_espace:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3677 re_free (sbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3678 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3679 free_charset (mbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3680 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3681 *err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3682 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3683 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3684
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3685 /* This is intended for the expressions like "a{1,3}".
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3686 Fetch a number from `input', and return the number.
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3687 Return REG_MISSING if the number field is empty like "{,1}".
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3688 Return REG_ERROR if an error occurred. */
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3689
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3690 static Idx
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3691 fetch_number (re_string_t input, re_token_t token, reg_syntax_t syntax)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3692 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3693 Idx num = REG_MISSING;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3694 unsigned char c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3695 while (1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3696 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3697 fetch_token (token, input, syntax);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3698 c = token->opr.c;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3699 if (BE (token->type == END_OF_RE, 0))
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3700 return REG_ERROR;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3701 if (token->type == OP_CLOSE_DUP_NUM \|\| c == ',')
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3702 break;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3703 num = ((token->type != CHARACTER \|\| c < '0' \|\| '9' < c
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3704 \|\| num == REG_ERROR)
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3705 ? REG_ERROR
f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3706 : ((num == REG_MISSING) ? c - '0' : num * 10 + c - '0'));
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3707 num = (num > RE_DUP_MAX) ? REG_ERROR : num;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3708 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3709 return num;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3710 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3711
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3712 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3713 static void
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3714 free_charset (re_charset_t *cset)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3715 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3716 re_free (cset->mbchars);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3717 # ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3718 re_free (cset->coll_syms);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3719 re_free (cset->equiv_classes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3720 re_free (cset->range_starts);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3721 re_free (cset->range_ends);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3722 # endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3723 re_free (cset->char_classes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3724 re_free (cset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3725 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3726 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3727
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3728 /* Functions for binary tree operation. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3729
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3730 /* Create a tree node. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3731
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3732 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3733 create_tree (re_dfa_t dfa, bin_tree_t left, bin_tree_t *right,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3734 re_token_type_t type)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3735 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3736 re_token_t t;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3737 t.type = type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3738 return create_token_tree (dfa, left, right, &t);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3739 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3740
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3741 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3742 create_token_tree (re_dfa_t dfa, bin_tree_t left, bin_tree_t *right,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3743 const re_token_t *token)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3744 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3745 bin_tree_t *tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3746 if (BE (dfa->str_tree_storage_idx == BIN_TREE_STORAGE_SIZE, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3747 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3748 bin_tree_storage_t *storage = re_malloc (bin_tree_storage_t, 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3749
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3750 if (storage == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3751 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3752 storage->next = dfa->str_tree_storage;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3753 dfa->str_tree_storage = storage;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3754 dfa->str_tree_storage_idx = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3755 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3756 tree = &dfa->str_tree_storage->data[dfa->str_tree_storage_idx++];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3757
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3758 tree->parent = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3759 tree->left = left;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3760 tree->right = right;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3761 tree->token = *token;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3762 tree->token.duplicated = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3763 tree->token.opt_subexp = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3764 tree->first = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3765 tree->next = NULL;
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3766 tree->node_idx = REG_MISSING;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3767
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3768 if (left != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3769 left->parent = tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3770 if (right != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3771 right->parent = tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3772 return tree;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3773 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3774
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3775 /* Mark the tree SRC as an optional subexpression.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3776 To be called from preorder or postorder. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3777
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3778 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3779 mark_opt_subexp (void extra, bin_tree_t node)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3780 {
6184 f1728546eca4 On 64-bit hosts (where size_t is 64 bits and int is 32 bits), the Paul Eggert <eggert@cs.ucla.edu> parents: 6174 diff changeset	3781 Idx idx = (Idx) (long) extra;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3782 if (node->token.type == SUBEXP && node->token.opr.idx == idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3783 node->token.opt_subexp = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3784
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3785 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3786 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3787
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3788 /* Free the allocated memory inside NODE. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3789
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3790 static void
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3791 free_token (re_token_t *node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3792 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3793 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3794 if (node->type == COMPLEX_BRACKET && node->duplicated == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3795 free_charset (node->opr.mbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3796 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3797 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3798 if (node->type == SIMPLE_BRACKET && node->duplicated == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3799 re_free (node->opr.sbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3800 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3801
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3802 /* Worker function for tree walking. Free the allocated memory inside NODE
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3803 and its children. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3804
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3805 static reg_errcode_t
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3806 free_tree (void extra, bin_tree_t node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3807 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3808 free_token (&node->token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3809 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3810 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3811
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3812
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3813 /* Duplicate the node SRC, and return new node. This is a preorder
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3814 visit similar to the one implemented by the generic visitor, but
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3815 we need more infrastructure to maintain two parallel trees --- so,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3816 it's easier to duplicate. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3817
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3818 static bin_tree_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6071 diff changeset	3819 duplicate_tree (const bin_tree_t root, re_dfa_t dfa)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3820 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3821 const bin_tree_t *node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3822 bin_tree_t *dup_root;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3823 bin_tree_t *p_new = &dup_root, dup_node = root->parent;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3824
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3825 for (node = root; ; )
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3826 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3827 /* Create a new tree and link it back to the current parent. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3828 *p_new = create_token_tree (dfa, NULL, NULL, &node->token);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3829 if (*p_new == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3830 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3831 (*p_new)->parent = dup_node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3832 (*p_new)->token.duplicated = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3833 dup_node = *p_new;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3834
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3835 /* Go to the left node, or up and to the right. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3836 if (node->left)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3837 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3838 node = node->left;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3839 p_new = &dup_node->left;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3840 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3841 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3842 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3843 const bin_tree_t *prev = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3844 while (node->right == prev \|\| node->right == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3845 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3846 prev = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3847 node = node->parent;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3848 dup_node = dup_node->parent;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3849 if (!node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3850 return dup_root;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3851 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3852 node = node->right;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3853 p_new = &dup_node->right;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3854 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3855 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3856 }

Mercurial > gnulib

annotate lib/regcomp.c @ 6726:af9abbcedfbd