gnulib: lib/regexec.c annotate

annotate lib/regexec.c @ 40168:f533980eb42f

autoupdate

author	Paul Eggert <eggert@cs.ucla.edu>
date	Thu, 31 Jan 2019 13:24:44 -0800
parents	f63c4e7dfb31
children	eeb8fe2e91ad

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.
40058 1a63e9768c53 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 40051 diff changeset	2 Copyright (C) 2002-2019 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
17233 b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	6 The GNU C Library is free software; you can redistribute it and/or
b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	7 modify it under the terms of the GNU Lesser General Public
b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	8 License as published by the Free Software Foundation; either
b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	9 version 2.1 of the License, or (at your option) any later version.
b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	10
b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	11 The GNU C Library is distributed in the hope that it will be useful,
5968 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
17233 b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	14 Lesser General Public License for more details.
b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	15
b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	16 You should have received a copy of the GNU Lesser General Public
b6b08f30c630 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 17138 diff changeset	17 License along with the GNU C Library; if not, see
19190 9759915b2aca all: prefer https: URLs Paul Eggert <eggert@cs.ucla.edu> parents: 19013 diff changeset	18 <https://www.gnu.org/licenses/>. */
5968 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 match_ctx_init (re_match_context_t *cache, int eflags,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	21 Idx n);
6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	22 static void match_ctx_clean (re_match_context_t *mctx);
6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	23 static void match_ctx_free (re_match_context_t *cache);
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	24 static reg_errcode_t match_ctx_add_entry (re_match_context_t *cache, Idx node,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	25 Idx str_idx, Idx from, Idx to);
6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	26 static Idx search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_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	27 static reg_errcode_t match_ctx_add_subtop (re_match_context_t *mctx, Idx node,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	28 Idx str_idx);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	29 static re_sub_match_last_t * match_ctx_add_sublast (re_sub_match_top_t *subtop,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	30 Idx node, Idx str_idx);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	31 static void sift_ctx_init (re_sift_context_t sctx, re_dfastate_t *sifted_sts,
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	32 re_dfastate_t **limited_sts, Idx last_node,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	33 Idx last_str_idx);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	34 static reg_errcode_t re_search_internal (const regex_t *preg,
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	35 const char *string, Idx length,
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	36 Idx start, Idx last_start, Idx stop,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	37 size_t nmatch, regmatch_t pmatch[],
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	38 int eflags);
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	39 static regoff_t re_search_2_stub (struct re_pattern_buffer *bufp,
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	40 const char *string1, Idx length1,
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	41 const char *string2, Idx length2,
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	42 Idx start, regoff_t range,
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	43 struct re_registers *regs,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	44 Idx stop, bool ret_len);
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	45 static regoff_t re_search_stub (struct re_pattern_buffer *bufp,
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	46 const char *string, Idx length, Idx start,
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	47 regoff_t range, Idx stop,
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 struct re_registers *regs,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	49 bool ret_len);
16361 ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	50 static unsigned re_copy_regs (struct re_registers regs, regmatch_t pmatch,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	51 Idx nregs, int regs_allocated);
6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	52 static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx);
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	53 static Idx check_matching (re_match_context_t *mctx, bool fl_longest_match,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	54 Idx *p_match_first);
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 check_halt_state_context (const re_match_context_t *mctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	56 const re_dfastate_t *state, Idx idx);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	57 static void update_regs (const re_dfa_t dfa, regmatch_t pmatch,
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	58 regmatch_t *prev_idx_match, Idx cur_node,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	59 Idx cur_idx, Idx nmatch);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	60 static reg_errcode_t push_fail_stack (struct re_fail_stack_t *fs,
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	61 Idx str_idx, Idx dest_node, Idx nregs,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	62 regmatch_t *regs,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	63 re_node_set *eps_via_nodes);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	64 static reg_errcode_t set_regs (const regex_t *preg,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	65 const re_match_context_t *mctx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	66 size_t nmatch, regmatch_t *pmatch,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	67 bool fl_backtrack);
6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	68 static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	69
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	70 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	71 static int sift_states_iter_mb (const re_match_context_t *mctx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	72 re_sift_context_t *sctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	73 Idx node_idx, Idx str_idx, Idx max_str_idx);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	74 #endif /* RE_ENABLE_I18N */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	75 static reg_errcode_t sift_states_backward (const re_match_context_t *mctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	76 re_sift_context_t *sctx);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	77 static reg_errcode_t build_sifted_states (const re_match_context_t *mctx,
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	78 re_sift_context_t *sctx, Idx str_idx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	79 re_node_set *cur_dest);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	80 static reg_errcode_t update_cur_sifted_state (const re_match_context_t *mctx,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	81 re_sift_context_t *sctx,
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	82 Idx str_idx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	83 re_node_set *dest_nodes);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	84 static reg_errcode_t add_epsilon_src_nodes (const re_dfa_t *dfa,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	85 re_node_set *dest_nodes,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	86 const re_node_set *candidates);
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	87 static bool check_dst_limits (const re_match_context_t *mctx,
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	88 const re_node_set *limits,
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	89 Idx dst_node, Idx dst_idx, Idx src_node,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	90 Idx src_idx);
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	91 static int check_dst_limits_calc_pos_1 (const re_match_context_t *mctx,
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	92 int boundaries, Idx subexp_idx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	93 Idx from_node, Idx bkref_idx);
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	94 static int check_dst_limits_calc_pos (const re_match_context_t *mctx,
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	95 Idx limit, Idx subexp_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	96 Idx node, Idx str_idx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	97 Idx bkref_idx);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	98 static reg_errcode_t check_subexp_limits (const re_dfa_t *dfa,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	99 re_node_set *dest_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	100 const re_node_set *candidates,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	101 re_node_set *limits,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	102 struct re_backref_cache_entry *bkref_ents,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	103 Idx str_idx);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	104 static reg_errcode_t sift_states_bkref (const re_match_context_t *mctx,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	105 re_sift_context_t *sctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	106 Idx str_idx, const re_node_set *candidates);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	107 static reg_errcode_t merge_state_array (const re_dfa_t *dfa,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	108 re_dfastate_t **dst,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	109 re_dfastate_t **src, Idx num);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	110 static re_dfastate_t find_recover_state (reg_errcode_t err,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	111 re_match_context_t *mctx);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	112 static re_dfastate_t transit_state (reg_errcode_t err,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	113 re_match_context_t *mctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	114 re_dfastate_t *state);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	115 static re_dfastate_t merge_state_with_log (reg_errcode_t err,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	116 re_match_context_t *mctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	117 re_dfastate_t *next_state);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	118 static reg_errcode_t check_subexp_matching_top (re_match_context_t *mctx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	119 re_node_set *cur_nodes,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	120 Idx str_idx);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	121 #if 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	122 static re_dfastate_t transit_state_sb (reg_errcode_t err,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	123 re_match_context_t *mctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	124 re_dfastate_t *pstate);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	125 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	126 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	127 static reg_errcode_t transit_state_mb (re_match_context_t *mctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	128 re_dfastate_t *pstate);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	129 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	130 static reg_errcode_t transit_state_bkref (re_match_context_t *mctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	131 const re_node_set *nodes);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	132 static reg_errcode_t get_subexp (re_match_context_t *mctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	133 Idx bkref_node, Idx bkref_str_idx);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	134 static reg_errcode_t get_subexp_sub (re_match_context_t *mctx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	135 const re_sub_match_top_t *sub_top,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	136 re_sub_match_last_t *sub_last,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	137 Idx bkref_node, Idx bkref_str);
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	138 static Idx find_subexp_node (const re_dfa_t dfa, const re_node_set nodes,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	139 Idx subexp_idx, int type);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	140 static reg_errcode_t check_arrival (re_match_context_t *mctx,
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	141 state_array_t *path, Idx top_node,
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	142 Idx top_str, Idx last_node, Idx last_str,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	143 int type);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	144 static reg_errcode_t check_arrival_add_next_nodes (re_match_context_t *mctx,
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	145 Idx str_idx,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	146 re_node_set *cur_nodes,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	147 re_node_set *next_nodes);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	148 static reg_errcode_t check_arrival_expand_ecl (const re_dfa_t *dfa,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	149 re_node_set *cur_nodes,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	150 Idx ex_subexp, int type);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	151 static reg_errcode_t check_arrival_expand_ecl_sub (const re_dfa_t *dfa,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	152 re_node_set *dst_nodes,
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	153 Idx target, Idx ex_subexp,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	154 int type);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	155 static reg_errcode_t expand_bkref_cache (re_match_context_t *mctx,
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	156 re_node_set *cur_nodes, Idx cur_str,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	157 Idx subexp_num, int type);
6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	158 static bool build_trtable (const re_dfa_t dfa, re_dfastate_t state);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	159 #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	160 static int check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	161 const re_string_t *input, Idx idx);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	162 # ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	163 static unsigned int find_collation_sequence_value (const unsigned char *mbs,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	164 size_t name_len);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	165 # endif /* _LIBC */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	166 #endif /* RE_ENABLE_I18N */
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	167 static Idx group_nodes_into_DFAstates (const re_dfa_t *dfa,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	168 const re_dfastate_t *state,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	169 re_node_set *states_node,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	170 bitset_t *states_ch);
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	171 static bool check_node_accept (const re_match_context_t *mctx,
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	172 const re_token_t *node, Idx idx);
6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	173 static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	174
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	175 /* Entry point for POSIX code. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	176
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	177 /* regexec searches for a given pattern, specified by PREG, in the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	178 string STRING.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	179
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	180 If NMATCH is zero or REG_NOSUB was set in the cflags argument to
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	181 'regcomp', we ignore PMATCH. Otherwise, we assume PMATCH has at
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	182 least NMATCH elements, and we set them to the offsets of the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	183 corresponding matched substrings.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	184
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	185 EFLAGS specifies "execution flags" which affect matching: if
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	186 REG_NOTBOL is set, then ^ does not match at the beginning of the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	187 string; if REG_NOTEOL is set, then $ does not match at the end.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	188
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	189 We return 0 if we find a match and REG_NOMATCH if not. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	190
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	191 int
40051 fc22144891c0 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 40039 diff changeset	192 regexec (const regex_t __restrict preg, const char __restrict string,
18252 8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	193 size_t nmatch, regmatch_t pmatch[], int eflags)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	194 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	195 reg_errcode_t err;
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	196 Idx start, length;
16770 e011e0a7ab5a regex: remove unnecessary type punning Paul Eggert <eggert@cs.ucla.edu> parents: 16472 diff changeset	197 re_dfa_t *dfa = preg->buffer;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	198
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	199 if (eflags & ~(REG_NOTBOL \| REG_NOTEOL \| REG_STARTEND))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	200 return REG_BADPAT;
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 if (eflags & REG_STARTEND)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	203 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	204 start = pmatch[0].rm_so;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	205 length = pmatch[0].rm_eo;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	206 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	207 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	208 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	209 start = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	210 length = strlen (string);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	211 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	212
17411 08883714ab3e regex: adapt to locking regime instead of depending on pthread Paul Eggert <eggert@cs.ucla.edu> parents: 17408 diff changeset	213 lock_lock (dfa->lock);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	214 if (preg->no_sub)
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	215 err = re_search_internal (preg, string, length, start, length,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	216 length, 0, NULL, eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	217 else
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	218 err = re_search_internal (preg, string, length, start, length,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	219 length, nmatch, pmatch, eflags);
17411 08883714ab3e regex: adapt to locking regime instead of depending on pthread Paul Eggert <eggert@cs.ucla.edu> parents: 17408 diff changeset	220 lock_unlock (dfa->lock);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	221 return err != REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	222 }
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 #ifdef _LIBC
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	225 libc_hidden_def (__regexec)
6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	226
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	227 # include <shlib-compat.h>
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	228 versioned_symbol (libc, __regexec, regexec, GLIBC_2_3_4);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	229
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	230 # if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	231 __typeof__ (__regexec) __compat_regexec;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	232
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	233 int
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	234 attribute_compat_text_section
40051 fc22144891c0 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 40039 diff changeset	235 __compat_regexec (const regex_t *__restrict preg,
fc22144891c0 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 40039 diff changeset	236 const char *__restrict string, size_t nmatch,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	237 regmatch_t pmatch[], int eflags)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	238 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	239 return regexec (preg, string, nmatch, pmatch,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	240 eflags & (REG_NOTBOL \| REG_NOTEOL));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	241 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	242 compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	243 # endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	244 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	245
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	246 /* Entry points for GNU code. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	247
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	248 /* re_match, re_search, re_match_2, re_search_2
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	249
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	250 The former two functions operate on STRING with length LENGTH,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	251 while the later two operate on concatenation of STRING1 and STRING2
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	252 with lengths LENGTH1 and LENGTH2, respectively.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	253
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	254 re_match() matches the compiled pattern in BUFP against the string,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	255 starting at index START.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	256
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	257 re_search() first tries matching at index START, then it tries to match
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	258 starting from index START + 1, and so on. The last start position tried
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	259 is START + RANGE. (Thus RANGE = 0 forces re_search to operate the same
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	260 way as re_match().)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	261
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	262 The parameter STOP of re_{match,search}_2 specifies that no match exceeding
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	263 the first STOP characters of the concatenation of the strings should be
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	264 concerned.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	265
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	266 If REGS is not NULL, and BUFP->no_sub is not set, the offsets of the match
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	267 and all groups is stored in REGS. (For the "_2" variants, the offsets are
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	268 computed relative to the concatenation, not relative to the individual
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	269 strings.)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	270
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	271 On success, re_match* functions return the length of the match, re_search*
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	272 return the position of the start of the match. Return value -1 means no
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	273 match was found and -2 indicates an internal error. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	274
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	275 regoff_t
18252 8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	276 re_match (struct re_pattern_buffer bufp, const char string, Idx length,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	277 Idx start, struct re_registers *regs)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	278 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	279 return re_search_stub (bufp, string, length, start, 0, length, regs, true);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	280 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	281 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	282 weak_alias (__re_match, re_match)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	283 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	284
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	285 regoff_t
18252 8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	286 re_search (struct re_pattern_buffer bufp, const char string, Idx length,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	287 Idx start, regoff_t range, struct re_registers *regs)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	288 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	289 return re_search_stub (bufp, string, length, start, range, length, regs,
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	290 false);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	291 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	292 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	293 weak_alias (__re_search, re_search)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	294 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	295
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	296 regoff_t
18252 8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	297 re_match_2 (struct re_pattern_buffer bufp, const char string1, Idx length1,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	298 const char *string2, Idx length2, Idx start,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	299 struct re_registers *regs, Idx stop)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	300 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	301 return re_search_2_stub (bufp, string1, length1, string2, length2,
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	302 start, 0, regs, stop, true);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	303 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	304 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	305 weak_alias (__re_match_2, re_match_2)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	306 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	307
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	308 regoff_t
18252 8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	309 re_search_2 (struct re_pattern_buffer bufp, const char string1, Idx length1,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	310 const char *string2, Idx length2, Idx start, regoff_t range,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	311 struct re_registers *regs, Idx stop)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	312 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	313 return re_search_2_stub (bufp, string1, length1, string2, length2,
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	314 start, range, regs, stop, false);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	315 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	316 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	317 weak_alias (__re_search_2, re_search_2)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	318 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	319
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	320 static regoff_t
18252 8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	321 re_search_2_stub (struct re_pattern_buffer bufp, const char string1,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	322 Idx length1, const char *string2, Idx length2, Idx start,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	323 regoff_t range, struct re_registers *regs,
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	324 Idx stop, bool ret_len)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	325 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	326 const char *str;
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	327 regoff_t rval;
18567 3a87606f33ed regex: fix integer-overflow bug in never-used code Paul Eggert <eggert@cs.ucla.edu> parents: 18253 diff changeset	328 Idx len;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	329 char *s = NULL;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	330
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	331 if (__glibc_unlikely ((length1 < 0 \|\| length2 < 0 \|\| stop < 0
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	332 \|\| INT_ADD_WRAPV (length1, length2, &len))))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	333 return -2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	334
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	335 /* Concatenate the strings. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	336 if (length2 > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	337 if (length1 > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	338 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	339 s = re_malloc (char, len);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	340
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	341 if (__glibc_unlikely (s == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	342 return -2;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	343 #ifdef _LIBC
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	344 memcpy (__mempcpy (s, string1, length1), string2, length2);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	345 #else
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	346 memcpy (s, string1, length1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	347 memcpy (s + length1, string2, length2);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	348 #endif
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	349 str = s;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	350 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	351 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	352 str = string2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	353 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	354 str = string1;
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 rval = re_search_stub (bufp, str, len, start, range, stop, regs,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	357 ret_len);
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	358 re_free (s);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	359 return rval;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	360 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	361
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	362 /* The parameters have the same meaning as those of re_search.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	363 Additional parameters:
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	364 If RET_LEN is true the length of the match is returned (re_match style);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	365 otherwise the position of the match is returned. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	366
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	367 static regoff_t
18252 8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	368 re_search_stub (struct re_pattern_buffer bufp, const char string, Idx length,
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	369 Idx start, regoff_t range, Idx stop, struct re_registers *regs,
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	370 bool ret_len)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	371 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	372 reg_errcode_t result;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	373 regmatch_t *pmatch;
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	374 Idx nregs;
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	375 regoff_t rval;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	376 int eflags = 0;
16770 e011e0a7ab5a regex: remove unnecessary type punning Paul Eggert <eggert@cs.ucla.edu> parents: 16472 diff changeset	377 re_dfa_t *dfa = bufp->buffer;
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	378 Idx last_start = start + range;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	379
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	380 /* Check for out-of-range. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	381 if (__glibc_unlikely (start < 0 \|\| start > length))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	382 return -1;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	383 if (__glibc_unlikely (length < last_start
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	384 \|\| (0 <= range && last_start < start)))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	385 last_start = length;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	386 else if (__glibc_unlikely (last_start < 0
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	387 \|\| (range < 0 && start <= last_start)))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	388 last_start = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	389
17411 08883714ab3e regex: adapt to locking regime instead of depending on pthread Paul Eggert <eggert@cs.ucla.edu> parents: 17408 diff changeset	390 lock_lock (dfa->lock);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	391
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	392 eflags \|= (bufp->not_bol) ? REG_NOTBOL : 0;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	393 eflags \|= (bufp->not_eol) ? REG_NOTEOL : 0;
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 /* Compile fastmap if we haven't yet. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	396 if (start < last_start && bufp->fastmap != NULL && !bufp->fastmap_accurate)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	397 re_compile_fastmap (bufp);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	398
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	399 if (__glibc_unlikely (bufp->no_sub))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	400 regs = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	401
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	402 /* We need at least 1 register. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	403 if (regs == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	404 nregs = 1;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	405 else if (__glibc_unlikely (bufp->regs_allocated == REGS_FIXED
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	406 && regs->num_regs <= bufp->re_nsub))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	407 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	408 nregs = regs->num_regs;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	409 if (__glibc_unlikely (nregs < 1))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	410 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	411 /* Nothing can be copied to regs. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	412 regs = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	413 nregs = 1;
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 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	417 nregs = bufp->re_nsub + 1;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	418 pmatch = re_malloc (regmatch_t, nregs);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	419 if (__glibc_unlikely (pmatch == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	420 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	421 rval = -2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	422 goto out;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	423 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	424
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	425 result = re_search_internal (bufp, string, length, start, last_start, stop,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	426 nregs, pmatch, eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	427
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	428 rval = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	429
16887 80e017adf024 maint: fix typos in comments and ChangeLog Jim Meyering <meyering@redhat.com> parents: 16770 diff changeset	430 /* I hope we needn't fill their regs with -1's when no match was found. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	431 if (result != REG_NOERROR)
16472 3aacf1725823 regex: re_search etc. should return -2 when memory exhausted Paul Eggert <eggert@cs.ucla.edu> parents: 16366 diff changeset	432 rval = result == REG_NOMATCH ? -1 : -2;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	433 else if (regs != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	434 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	435 /* If caller wants register contents data back, copy them. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	436 bufp->regs_allocated = re_copy_regs (regs, pmatch, nregs,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	437 bufp->regs_allocated);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	438 if (__glibc_unlikely (bufp->regs_allocated == REGS_UNALLOCATED))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	439 rval = -2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	440 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	441
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	442 if (__glibc_likely (rval == 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	443 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	444 if (ret_len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	445 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	446 assert (pmatch[0].rm_so == start);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	447 rval = pmatch[0].rm_eo - start;
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 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	450 rval = pmatch[0].rm_so;
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 re_free (pmatch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	453 out:
17411 08883714ab3e regex: adapt to locking regime instead of depending on pthread Paul Eggert <eggert@cs.ucla.edu> parents: 17408 diff changeset	454 lock_unlock (dfa->lock);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	455 return rval;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	456 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	457
16361 ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	458 static unsigned
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	459 re_copy_regs (struct re_registers regs, regmatch_t pmatch, Idx nregs,
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	460 int regs_allocated)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	461 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	462 int rval = REGS_REALLOCATE;
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	463 Idx 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	464 Idx need_regs = nregs + 1;
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	465 /* We need one extra element beyond 'num_regs' for the '-1' marker GNU code
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	466 uses. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	467
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	468 /* Have the register data arrays been allocated? */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	469 if (regs_allocated == REGS_UNALLOCATED)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	470 { /* No. So allocate them with malloc. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	471 regs->start = re_malloc (regoff_t, need_regs);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	472 if (__glibc_unlikely (regs->start == NULL))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	473 return REGS_UNALLOCATED;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	474 regs->end = re_malloc (regoff_t, need_regs);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	475 if (__glibc_unlikely (regs->end == NULL))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	476 {
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	477 re_free (regs->start);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	478 return REGS_UNALLOCATED;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	479 }
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	480 regs->num_regs = need_regs;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	481 }
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	482 else if (regs_allocated == REGS_REALLOCATE)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	483 { /* Yes. If we need more elements than were already
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	484 allocated, reallocate them. If we need fewer, just
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	485 leave it alone. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	486 if (__glibc_unlikely (need_regs > regs->num_regs))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	487 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	488 regoff_t *new_start = re_realloc (regs->start, regoff_t, need_regs);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	489 regoff_t *new_end;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	490 if (__glibc_unlikely (new_start == NULL))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	491 return REGS_UNALLOCATED;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	492 new_end = re_realloc (regs->end, regoff_t, need_regs);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	493 if (__glibc_unlikely (new_end == NULL))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	494 {
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	495 re_free (new_start);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	496 return REGS_UNALLOCATED;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	497 }
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	498 regs->start = new_start;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	499 regs->end = new_end;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	500 regs->num_regs = need_regs;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	501 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	502 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	503 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	504 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	505 assert (regs_allocated == REGS_FIXED);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	506 /* This function may not be called with REGS_FIXED and nregs too big. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	507 assert (regs->num_regs >= nregs);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	508 rval = REGS_FIXED;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	509 }
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 /* Copy the regs. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	512 for (i = 0; i < nregs; ++i)
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 regs->start[i] = pmatch[i].rm_so;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	515 regs->end[i] = pmatch[i].rm_eo;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	516 }
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	517 for ( ; i < regs->num_regs; ++i)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	518 regs->start[i] = regs->end[i] = -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	519
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	520 return rval;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	521 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	522
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	523 /* Set REGS to hold NUM_REGS registers, storing them in STARTS and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	524 ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	525 this memory for recording register information. STARTS and ENDS
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	526 must be allocated using the malloc library routine, and must each
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	527 be at least NUM_REGS * sizeof (regoff_t) bytes long.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	528
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	529 If NUM_REGS == 0, then subsequent matches should allocate their own
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	530 register data.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	531
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	532 Unless this function is called, the first search or match using
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	533 PATTERN_BUFFER will allocate its own register data, without
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	534 freeing the old data. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	535
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	536 void
18252 8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	537 re_set_registers (struct re_pattern_buffer bufp, struct re_registers regs,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	538 __re_size_t num_regs, regoff_t starts, regoff_t ends)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	539 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	540 if (num_regs)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	541 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	542 bufp->regs_allocated = REGS_REALLOCATE;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	543 regs->num_regs = num_regs;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	544 regs->start = starts;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	545 regs->end = ends;
5968 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 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	548 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	549 bufp->regs_allocated = REGS_UNALLOCATED;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	550 regs->num_regs = 0;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	551 regs->start = regs->end = NULL;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	552 }
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 #ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	555 weak_alias (__re_set_registers, re_set_registers)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	556 #endif
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 /* 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	559 them unless specifically requested. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	560
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	561 #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	562 int
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	563 # ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	564 weak_function
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	565 # endif
18252 8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	566 re_exec (const char *s)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	567 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	568 return 0 == regexec (&re_comp_buf, s, 0, NULL, 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	569 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	570 #endif /* _REGEX_RE_COMP */
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 /* Internal entry point. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	573
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	574 /* Searches for a compiled pattern PREG in the string STRING, whose
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	575 length is LENGTH. NMATCH, PMATCH, and EFLAGS have the same
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	576 meaning as with regexec. LAST_START is START + RANGE, where
7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	577 START and RANGE have the same meaning as with re_search.
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	578 Return REG_NOERROR if we find a match, and REG_NOMATCH if not,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	579 otherwise return the error code.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	580 Note: We assume front end functions already check ranges.
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	581 (0 <= LAST_START && LAST_START <= LENGTH) */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	582
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	583 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	584 __attribute_warn_unused_result__
18252 8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	585 re_search_internal (const regex_t preg, const char string, Idx length,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	586 Idx start, Idx last_start, Idx stop, size_t nmatch,
8162c20f4bc7 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 18189 diff changeset	587 regmatch_t pmatch[], int eflags)
5968 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 reg_errcode_t err;
16770 e011e0a7ab5a regex: remove unnecessary type punning Paul Eggert <eggert@cs.ucla.edu> parents: 16472 diff changeset	590 const re_dfa_t *dfa = preg->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	591 Idx left_lim, right_lim;
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	592 int incr;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	593 bool fl_longest_match;
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	594 int match_kind;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	595 Idx match_first;
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	596 Idx match_last = -1;
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	597 Idx extra_nmatch;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	598 bool sb;
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	599 int ch;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	600 #if defined _LIBC \|\| (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	601 re_match_context_t mctx = { .dfa = dfa };
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	602 #else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	603 re_match_context_t mctx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	604 #endif
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	605 char *fastmap = ((preg->fastmap != NULL && preg->fastmap_accurate
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	606 && start != last_start && !preg->can_be_null)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	607 ? preg->fastmap : NULL);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	608 RE_TRANSLATE_TYPE t = preg->translate;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	609
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	610 #if !(defined _LIBC \|\| (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	611 memset (&mctx, '\0', sizeof (re_match_context_t));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	612 mctx.dfa = dfa;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	613 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	614
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	615 extra_nmatch = (nmatch > preg->re_nsub) ? nmatch - (preg->re_nsub + 1) : 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	616 nmatch -= extra_nmatch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	617
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	618 /* Check if the DFA haven't been compiled. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	619 if (__glibc_unlikely (preg->used == 0 \|\| dfa->init_state == NULL
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	620 \|\| dfa->init_state_word == NULL
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	621 \|\| dfa->init_state_nl == NULL
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	622 \|\| dfa->init_state_begbuf == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	623 return REG_NOMATCH;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	624
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	625 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	626 /* We assume front-end functions already check them. */
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	627 assert (0 <= last_start && last_start <= length);
5968 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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	630 /* If initial states with non-begbuf contexts have no elements,
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	631 the regex must be anchored. If preg->newline_anchor is set,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	632 we'll never use init_state_nl, so do not check it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	633 if (dfa->init_state->nodes.nelem == 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	634 && dfa->init_state_word->nodes.nelem == 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	635 && (dfa->init_state_nl->nodes.nelem == 0
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	636 \|\| !preg->newline_anchor))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	637 {
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	638 if (start != 0 && last_start != 0)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	639 return REG_NOMATCH;
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	640 start = last_start = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	641 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	642
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	643 /* We must check the longest matching, if nmatch > 0. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	644 fl_longest_match = (nmatch != 0 \|\| dfa->nbackref);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	645
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	646 err = re_string_allocate (&mctx.input, string, length, dfa->nodes_len + 1,
10079 6b412972dce7 Fix violation of <stdbool.h> replacement in regex. Eric Blake <ebb9@byu.net> parents: 8540 diff changeset	647 preg->translate, (preg->syntax & RE_ICASE) != 0,
6b412972dce7 Fix violation of <stdbool.h> replacement in regex. Eric Blake <ebb9@byu.net> parents: 8540 diff changeset	648 dfa);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	649 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	650 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	651 mctx.input.stop = stop;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	652 mctx.input.raw_stop = stop;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	653 mctx.input.newline_anchor = preg->newline_anchor;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	654
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	655 err = match_ctx_init (&mctx, eflags, dfa->nbackref * 2);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	656 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	657 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	658
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	659 /* We will log all the DFA states through which the dfa pass,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	660 if nmatch > 1, or this dfa has "multibyte node", which is a
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	661 back-reference or a node which can accept multibyte character or
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	662 multi character collating element. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	663 if (nmatch > 1 \|\| dfa->has_mb_node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	664 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	665 /* Avoid overflow. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	666 if (__glibc_unlikely ((MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *))
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	667 <= mctx.input.bufs_len)))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	668 {
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	669 err = REG_ESPACE;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	670 goto free_return;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	671 }
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	672
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	673 mctx.state_log = re_malloc (re_dfastate_t *, mctx.input.bufs_len + 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	674 if (__glibc_unlikely (mctx.state_log == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	675 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	676 err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	677 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	678 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	679 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	680 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	681 mctx.state_log = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	682
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	683 match_first = start;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	684 mctx.input.tip_context = (eflags & REG_NOTBOL) ? CONTEXT_BEGBUF
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	685 : CONTEXT_NEWLINE \| CONTEXT_BEGBUF;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	686
17138 42f6597efac3 * lib/regexec.c (re_search_internal): Fix grammar in comment. Paul Eggert <eggert@cs.ucla.edu> parents: 16887 diff changeset	687 /* Check incrementally whether the input string matches. */
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	688 incr = (last_start < start) ? -1 : 1;
7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	689 left_lim = (last_start < start) ? last_start : start;
7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	690 right_lim = (last_start < start) ? start : last_start;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	691 sb = dfa->mb_cur_max == 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	692 match_kind =
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	693 (fastmap
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	694 ? ((sb \|\| !(preg->syntax & RE_ICASE \|\| t) ? 4 : 0)
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	695 \| (start <= last_start ? 2 : 0)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	696 \| (t != NULL ? 1 : 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	697 : 8);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	698
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	699 for (;; match_first += incr)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	700 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	701 err = REG_NOMATCH;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	702 if (match_first < left_lim \|\| right_lim < match_first)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	703 goto free_return;
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 /* Advance as rapidly as possible through the string, until we
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	706 find a plausible place to start matching. This may be done
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	707 with varying efficiency, so there are various possibilities:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	708 only the most common of them are specialized, in order to
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	709 save on code size. We use a switch statement for speed. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	710 switch (match_kind)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	711 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	712 case 8:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	713 /* No fastmap. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	714 break;
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 case 7:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	717 /* Fastmap with single-byte translation, match forward. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	718 while (__glibc_likely (match_first < right_lim)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	719 && !fastmap[t[(unsigned char) string[match_first]]])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	720 ++match_first;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	721 goto forward_match_found_start_or_reached_end;
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 case 6:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	724 /* Fastmap without translation, match forward. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	725 while (__glibc_likely (match_first < right_lim)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	726 && !fastmap[(unsigned char) string[match_first]])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	727 ++match_first;
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 forward_match_found_start_or_reached_end:
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	730 if (__glibc_unlikely (match_first == right_lim))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	731 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	732 ch = match_first >= length
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	733 ? 0 : (unsigned char) string[match_first];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	734 if (!fastmap[t ? t[ch] : ch])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	735 goto free_return;
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 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	738
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	739 case 4:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	740 case 5:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	741 /* Fastmap without multi-byte translation, match backwards. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	742 while (match_first >= left_lim)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	743 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	744 ch = match_first >= length
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	745 ? 0 : (unsigned char) string[match_first];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	746 if (fastmap[t ? t[ch] : ch])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	747 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	748 --match_first;
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 if (match_first < left_lim)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	751 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	752 break;
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 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	755 /* In this case, we can't determine easily the current byte,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	756 since it might be a component byte of a multibyte
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	757 character. Then we use the constructed buffer instead. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	758 for (;;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	759 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	760 /* If MATCH_FIRST is out of the valid range, reconstruct the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	761 buffers. */
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	762 __re_size_t offset = match_first - mctx.input.raw_mbs_idx;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	763 if (__glibc_unlikely (offset
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	764 >= (__re_size_t) mctx.input.valid_raw_len))
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 = re_string_reconstruct (&mctx.input, match_first,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	767 eflags);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	768 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	769 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	770
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	771 offset = match_first - mctx.input.raw_mbs_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	772 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	773 /* If MATCH_FIRST is out of the buffer, leave it as '\0'.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	774 Note that MATCH_FIRST must not be smaller than 0. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	775 ch = (match_first >= length
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	776 ? 0 : re_string_byte_at (&mctx.input, offset));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	777 if (fastmap[ch])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	778 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	779 match_first += incr;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	780 if (match_first < left_lim \|\| match_first > right_lim)
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	781 {
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	782 err = REG_NOMATCH;
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	783 goto free_return;
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	784 }
5968 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 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	787 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	788
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	789 /* Reconstruct the buffers so that the matcher can assume that
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	790 the matching starts from the beginning of the buffer. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	791 err = re_string_reconstruct (&mctx.input, match_first, eflags);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	792 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	793 goto free_return;
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 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	796 /* Don't consider this char as a possible match start if it part,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	797 yet isn't the head, of a multibyte character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	798 if (!sb && !re_string_first_byte (&mctx.input, 0))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	799 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	800 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	801
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	802 /* It seems to be appropriate one, then use the matcher. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	803 /* We assume that the matching starts from 0. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	804 mctx.state_log_top = mctx.nbkref_ents = mctx.max_mb_elem_len = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	805 match_last = check_matching (&mctx, fl_longest_match,
6186 7a0537a5ad1b * lib/regex_internal.c (re_string_reconstruct): Don't assume buffer Paul Eggert <eggert@cs.ucla.edu> parents: 6185 diff changeset	806 start <= last_start ? &match_first : NULL);
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	807 if (match_last != -1)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	808 {
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	809 if (__glibc_unlikely (match_last == -2))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	810 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	811 err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	812 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	813 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	814 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	815 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	816 mctx.match_last = match_last;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	817 if ((!preg->no_sub && nmatch > 1) \|\| dfa->nbackref)
5968 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 re_dfastate_t *pstate = mctx.state_log[match_last];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	820 mctx.last_node = check_halt_state_context (&mctx, pstate,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	821 match_last);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	822 }
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	823 if ((!preg->no_sub && nmatch > 1 && dfa->has_plural_match)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	824 \|\| dfa->nbackref)
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 err = prune_impossible_nodes (&mctx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	827 if (err == REG_NOERROR)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	828 break;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	829 if (__glibc_unlikely (err != REG_NOMATCH))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	830 goto free_return;
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	831 match_last = -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	832 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	833 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	834 break; /* We found a match. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	835 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	836 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	837
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	838 match_ctx_clean (&mctx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	839 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	840
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	841 #ifdef DEBUG
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	842 assert (match_last != -1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	843 assert (err == REG_NOERROR);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	844 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	845
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	846 /* Set pmatch[] if we need. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	847 if (nmatch > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	848 {
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	849 Idx reg_idx;
5968 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 /* Initialize registers. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	852 for (reg_idx = 1; reg_idx < nmatch; ++reg_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	853 pmatch[reg_idx].rm_so = pmatch[reg_idx].rm_eo = -1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	854
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	855 /* Set the points where matching start/end. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	856 pmatch[0].rm_so = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	857 pmatch[0].rm_eo = mctx.match_last;
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	858 /* FIXME: This function should fail if mctx.match_last exceeds
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	859 the maximum possible regoff_t value. We need a new 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	860 code REG_OVERFLOW. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	861
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	862 if (!preg->no_sub && nmatch > 1)
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 err = set_regs (preg, &mctx, nmatch, pmatch,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	865 dfa->has_plural_match && dfa->nbackref > 0);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	866 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	867 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	868 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	869
16358 a712776b11ce maint: spelling fixes Paul Eggert <eggert@cs.ucla.edu> parents: 16235 diff changeset	870 /* At last, add the offset to each register, since we slid
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	871 the buffers so that we could assume that the matching starts
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	872 from 0. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	873 for (reg_idx = 0; reg_idx < nmatch; ++reg_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	874 if (pmatch[reg_idx].rm_so != -1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	875 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	876 #ifdef RE_ENABLE_I18N
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	877 if (__glibc_unlikely (mctx.input.offsets_needed != 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	878 {
6173 0728607db20f * lib/regexec.c (re_search_internal): Simplify update of Paul Eggert <eggert@cs.ucla.edu> parents: 6171 diff changeset	879 pmatch[reg_idx].rm_so =
0728607db20f * lib/regexec.c (re_search_internal): Simplify update of Paul Eggert <eggert@cs.ucla.edu> parents: 6171 diff changeset	880 (pmatch[reg_idx].rm_so == mctx.input.valid_len
0728607db20f * lib/regexec.c (re_search_internal): Simplify update of Paul Eggert <eggert@cs.ucla.edu> parents: 6171 diff changeset	881 ? mctx.input.valid_raw_len
0728607db20f * lib/regexec.c (re_search_internal): Simplify update of Paul Eggert <eggert@cs.ucla.edu> parents: 6171 diff changeset	882 : mctx.input.offsets[pmatch[reg_idx].rm_so]);
0728607db20f * lib/regexec.c (re_search_internal): Simplify update of Paul Eggert <eggert@cs.ucla.edu> parents: 6171 diff changeset	883 pmatch[reg_idx].rm_eo =
0728607db20f * lib/regexec.c (re_search_internal): Simplify update of Paul Eggert <eggert@cs.ucla.edu> parents: 6171 diff changeset	884 (pmatch[reg_idx].rm_eo == mctx.input.valid_len
0728607db20f * lib/regexec.c (re_search_internal): Simplify update of Paul Eggert <eggert@cs.ucla.edu> parents: 6171 diff changeset	885 ? mctx.input.valid_raw_len
0728607db20f * lib/regexec.c (re_search_internal): Simplify update of Paul Eggert <eggert@cs.ucla.edu> parents: 6171 diff changeset	886 : mctx.input.offsets[pmatch[reg_idx].rm_eo]);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	887 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	888 #else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	889 assert (mctx.input.offsets_needed == 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	890 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	891 pmatch[reg_idx].rm_so += match_first;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	892 pmatch[reg_idx].rm_eo += match_first;
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 for (reg_idx = 0; reg_idx < extra_nmatch; ++reg_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	895 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	896 pmatch[nmatch + reg_idx].rm_so = -1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	897 pmatch[nmatch + reg_idx].rm_eo = -1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	898 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	899
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	900 if (dfa->subexp_map)
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	901 for (reg_idx = 0; reg_idx + 1 < nmatch; reg_idx++)
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	902 if (dfa->subexp_map[reg_idx] != reg_idx)
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	903 {
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	904 pmatch[reg_idx + 1].rm_so
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	905 = pmatch[dfa->subexp_map[reg_idx] + 1].rm_so;
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	906 pmatch[reg_idx + 1].rm_eo
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	907 = pmatch[dfa->subexp_map[reg_idx] + 1].rm_eo;
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	908 }
5968 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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	911 free_return:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	912 re_free (mctx.state_log);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	913 if (dfa->nbackref)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	914 match_ctx_free (&mctx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	915 re_string_destruct (&mctx.input);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	916 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	917 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	918
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	919 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	920 __attribute_warn_unused_result__
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	921 prune_impossible_nodes (re_match_context_t *mctx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	922 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	923 const re_dfa_t *const dfa = mctx->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	924 Idx halt_node, match_last;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	925 reg_errcode_t ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	926 re_dfastate_t **sifted_states;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	927 re_dfastate_t **lim_states = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	928 re_sift_context_t sctx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	929 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	930 assert (mctx->state_log != NULL);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	931 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	932 match_last = mctx->match_last;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	933 halt_node = mctx->last_node;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	934
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	935 /* Avoid overflow. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	936 if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *))
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	937 <= match_last))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	938 return REG_ESPACE;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	939
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	940 sifted_states = re_malloc (re_dfastate_t *, match_last + 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	941 if (__glibc_unlikely (sifted_states == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	942 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	943 ret = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	944 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	945 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	946 if (dfa->nbackref)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	947 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	948 lim_states = re_malloc (re_dfastate_t *, match_last + 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	949 if (__glibc_unlikely (lim_states == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	950 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	951 ret = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	952 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	953 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	954 while (1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	955 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	956 memset (lim_states, '\0',
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	957 sizeof (re_dfastate_t ) (match_last + 1));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	958 sift_ctx_init (&sctx, sifted_states, lim_states, halt_node,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	959 match_last);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	960 ret = sift_states_backward (mctx, &sctx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	961 re_node_set_free (&sctx.limits);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	962 if (__glibc_unlikely (ret != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	963 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	964 if (sifted_states[0] != NULL \|\| lim_states[0] != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	965 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	966 do
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	967 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	968 --match_last;
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	969 if (match_last < 0)
5968 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 ret = REG_NOMATCH;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	972 goto free_return;
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 } while (mctx->state_log[match_last] == NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	975 \|\| !mctx->state_log[match_last]->halt);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	976 halt_node = check_halt_state_context (mctx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	977 mctx->state_log[match_last],
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	978 match_last);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	979 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	980 ret = merge_state_array (dfa, sifted_states, lim_states,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	981 match_last + 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	982 re_free (lim_states);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	983 lim_states = NULL;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	984 if (__glibc_unlikely (ret != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	985 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	986 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	987 else
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 sift_ctx_init (&sctx, sifted_states, lim_states, halt_node, match_last);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	990 ret = sift_states_backward (mctx, &sctx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	991 re_node_set_free (&sctx.limits);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	992 if (__glibc_unlikely (ret != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	993 goto free_return;
10999 7e353646d8a6 regex: fix glibc bug 697 Paolo Bonzini <bonzini@gnu.org> parents: 10955 diff changeset	994 if (sifted_states[0] == NULL)
7e353646d8a6 regex: fix glibc bug 697 Paolo Bonzini <bonzini@gnu.org> parents: 10955 diff changeset	995 {
7e353646d8a6 regex: fix glibc bug 697 Paolo Bonzini <bonzini@gnu.org> parents: 10955 diff changeset	996 ret = REG_NOMATCH;
7e353646d8a6 regex: fix glibc bug 697 Paolo Bonzini <bonzini@gnu.org> parents: 10955 diff changeset	997 goto free_return;
7e353646d8a6 regex: fix glibc bug 697 Paolo Bonzini <bonzini@gnu.org> parents: 10955 diff changeset	998 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	999 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1000 re_free (mctx->state_log);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1001 mctx->state_log = sifted_states;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1002 sifted_states = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1003 mctx->last_node = halt_node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1004 mctx->match_last = match_last;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1005 ret = REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1006 free_return:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1007 re_free (sifted_states);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1008 re_free (lim_states);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1009 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1010 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1011
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1012 /* Acquire an initial state and return it.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1013 We must select appropriate initial state depending on the context,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1014 since initial states may have constraints like "\<", "^", etc.. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1015
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1016 static inline re_dfastate_t *
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	1017 __attribute__ ((always_inline))
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	1018 acquire_init_state_context (reg_errcode_t err, const re_match_context_t mctx,
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	1019 Idx idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1020 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1021 const re_dfa_t *const dfa = mctx->dfa;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1022 if (dfa->init_state->has_constraint)
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 unsigned int context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1025 context = re_string_context_at (&mctx->input, idx - 1, mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1026 if (IS_WORD_CONTEXT (context))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1027 return dfa->init_state_word;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1028 else if (IS_ORDINARY_CONTEXT (context))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1029 return dfa->init_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1030 else if (IS_BEGBUF_CONTEXT (context) && IS_NEWLINE_CONTEXT (context))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1031 return dfa->init_state_begbuf;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1032 else if (IS_NEWLINE_CONTEXT (context))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1033 return dfa->init_state_nl;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1034 else if (IS_BEGBUF_CONTEXT (context))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1035 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1036 /* It is relatively rare case, then calculate on demand. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1037 return re_acquire_state_context (err, dfa,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1038 dfa->init_state->entrance_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1039 context);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1040 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1041 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1042 /* Must not happen? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1043 return dfa->init_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1044 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1045 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1046 return dfa->init_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1047 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1048
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1049 /* Check whether the regular expression match input string INPUT or not,
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1050 and return the index where the matching end. Return -1 if
8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1051 there is no match, and return -2 in case of an error.
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1052 FL_LONGEST_MATCH means we want the POSIX longest matching.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1053 If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1054 next place where we may want to try matching.
16358 a712776b11ce maint: spelling fixes Paul Eggert <eggert@cs.ucla.edu> parents: 16235 diff changeset	1055 Note that the matcher assumes that the matching starts from the current
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1056 index of the buffer. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1057
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	1058 static Idx
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	1059 __attribute_warn_unused_result__
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1060 check_matching (re_match_context_t *mctx, bool fl_longest_match,
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	1061 Idx *p_match_first)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1062 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1063 const re_dfa_t *const dfa = mctx->dfa;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1064 reg_errcode_t err;
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	1065 Idx match = 0;
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1066 Idx match_last = -1;
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	1067 Idx cur_str_idx = re_string_cur_idx (&mctx->input);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1068 re_dfastate_t *cur_state;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1069 bool at_init_state = p_match_first != 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	1070 Idx next_start_idx = cur_str_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1071
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1072 err = REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1073 cur_state = acquire_init_state_context (&err, mctx, cur_str_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1074 /* An initial state must not be NULL (invalid). */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1075 if (__glibc_unlikely (cur_state == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1076 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1077 assert (err == REG_ESPACE);
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1078 return -2;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1079 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1080
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1081 if (mctx->state_log != NULL)
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 mctx->state_log[cur_str_idx] = cur_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1084
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1085 /* Check OP_OPEN_SUBEXP in the initial state in case that we use them
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1086 later. E.g. Processing back references. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1087 if (__glibc_unlikely (dfa->nbackref))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1088 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1089 at_init_state = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1090 err = check_subexp_matching_top (mctx, &cur_state->nodes, 0);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1091 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1092 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1093
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1094 if (cur_state->has_backref)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1095 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1096 err = transit_state_bkref (mctx, &cur_state->nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1097 if (__glibc_unlikely (err != REG_NOERROR))
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1098 return err;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1099 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1100 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1101 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1102
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1103 /* If the RE accepts NULL string. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1104 if (__glibc_unlikely (cur_state->halt))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1105 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1106 if (!cur_state->has_constraint
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1107 \|\| check_halt_state_context (mctx, cur_state, cur_str_idx))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1108 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1109 if (!fl_longest_match)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1110 return cur_str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1111 else
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 match_last = cur_str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1114 match = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1115 }
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 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1118
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1119 while (!re_string_eoi (&mctx->input))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1120 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1121 re_dfastate_t *old_state = cur_state;
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	1122 Idx next_char_idx = re_string_cur_idx (&mctx->input) + 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1123
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1124 if ((__glibc_unlikely (next_char_idx >= mctx->input.bufs_len)
16361 ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	1125 && mctx->input.bufs_len < mctx->input.len)
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1126 \|\| (__glibc_unlikely (next_char_idx >= mctx->input.valid_len)
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1127 && mctx->input.valid_len < mctx->input.len))
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1128 {
17301 d08258969ee9 regex: fix buffer overrun in regexp matcher Andreas Schwab <schwab@suse.de> parents: 17249 diff changeset	1129 err = extend_buffers (mctx, next_char_idx + 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1130 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1131 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1132 assert (err == REG_ESPACE);
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1133 return -2;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1134 }
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1135 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1136
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1137 cur_state = transit_state (&err, mctx, cur_state);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1138 if (mctx->state_log != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1139 cur_state = merge_state_with_log (&err, mctx, cur_state);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1140
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1141 if (cur_state == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1142 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1143 /* Reached the invalid state or an error. Try to recover a valid
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1144 state using the state log, if available and if we have not
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1145 already found a valid (even if not the longest) match. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1146 if (__glibc_unlikely (err != REG_NOERROR))
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1147 return -2;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1148
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1149 if (mctx->state_log == NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1150 \|\| (match && !fl_longest_match)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1151 \|\| (cur_state = find_recover_state (&err, mctx)) == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1152 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1153 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1154
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1155 if (__glibc_unlikely (at_init_state))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1156 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1157 if (old_state == cur_state)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1158 next_start_idx = next_char_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1159 else
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1160 at_init_state = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1161 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1162
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1163 if (cur_state->halt)
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 /* Reached a halt state.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1166 Check the halt state can satisfy the current context. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1167 if (!cur_state->has_constraint
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1168 \|\| check_halt_state_context (mctx, cur_state,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1169 re_string_cur_idx (&mctx->input)))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1170 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1171 /* We found an appropriate halt state. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1172 match_last = re_string_cur_idx (&mctx->input);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1173 match = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1174
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1175 /* We found a match, do not modify match_first below. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1176 p_match_first = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1177 if (!fl_longest_match)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1178 break;
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 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1181 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1182
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1183 if (p_match_first)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1184 *p_match_first += next_start_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1185
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1186 return match_last;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1187 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1188
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1189 /* Check NODE match the current context. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1190
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1191 static bool
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	1192 check_halt_node_context (const re_dfa_t *dfa, Idx node, unsigned int context)
5968 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 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	1195 unsigned int constraint = dfa->nodes[node].constraint;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1196 if (type != END_OF_RE)
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1197 return false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1198 if (!constraint)
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1199 return true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1200 if (NOT_SATISFY_NEXT_CONSTRAINT (constraint, context))
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1201 return false;
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1202 return true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1203 }
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 /* Check the halt state STATE match the current context.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1206 Return 0 if not match, if the node, STATE has, is a halt node and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1207 match the context, return the node. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1208
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	1209 static Idx
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	1210 check_halt_state_context (const re_match_context_t *mctx,
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	1211 const re_dfastate_t *state, Idx idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1212 {
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	1213 Idx i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1214 unsigned int context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1215 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1216 assert (state->halt);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1217 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1218 context = re_string_context_at (&mctx->input, idx, mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1219 for (i = 0; i < state->nodes.nelem; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1220 if (check_halt_node_context (mctx->dfa, state->nodes.elems[i], context))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1221 return state->nodes.elems[i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1222 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1223 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1224
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1225 /* Compute the next node to which "NFA" transit from NODE("NFA" is a NFA
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1226 corresponding to the 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	1227 Return the destination node, and update EPS_VIA_NODES;
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1228 return -1 in case of errors. */
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	1229
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	1230 static Idx
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1231 proceed_next_node (const re_match_context_t mctx, Idx nregs, regmatch_t regs,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1232 Idx pidx, Idx node, re_node_set eps_via_nodes,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1233 struct re_fail_stack_t *fs)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1234 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1235 const re_dfa_t *const dfa = mctx->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	1236 Idx i;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1237 bool ok;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1238 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	1239 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1240 re_node_set cur_nodes = &mctx->state_log[pidx]->nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1241 re_node_set *edests = &dfa->edests[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	1242 Idx dest_node;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1243 ok = re_node_set_insert (eps_via_nodes, node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1244 if (__glibc_unlikely (! ok))
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1245 return -2;
8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1246 /* Pick up a valid destination, or return -1 if none
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	1247 is found. */
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1248 for (dest_node = -1, i = 0; i < edests->nelem; ++i)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1249 {
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	1250 Idx candidate = edests->elems[i];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1251 if (!re_node_set_contains (cur_nodes, candidate))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1252 continue;
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1253 if (dest_node == -1)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1254 dest_node = candidate;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1255
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1256 else
5968 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 /* In order to avoid infinite loop like "(a)", return the second
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1259 epsilon-transition if the first was already considered. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1260 if (re_node_set_contains (eps_via_nodes, dest_node))
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1261 return candidate;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1262
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1263 /* Otherwise, push the second epsilon-transition on the fail stack. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1264 else if (fs != NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1265 && push_fail_stack (fs, *pidx, candidate, nregs, regs,
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1266 eps_via_nodes))
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1267 return -2;
5968 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 /* We know we are going to exit. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1270 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1271 }
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 return dest_node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1274 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1275 else
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 naccepted = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1278 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	1279
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1280 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1281 if (dfa->nodes[node].accept_mb)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1282 naccepted = check_node_accept_bytes (dfa, node, &mctx->input, *pidx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1283 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1284 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1285 if (type == OP_BACK_REF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1286 {
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	1287 Idx subexp_idx = dfa->nodes[node].opr.idx + 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1288 naccepted = regs[subexp_idx].rm_eo - regs[subexp_idx].rm_so;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1289 if (fs != NULL)
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 if (regs[subexp_idx].rm_so == -1 \|\| regs[subexp_idx].rm_eo == -1)
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1292 return -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1293 else if (naccepted)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1294 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1295 char buf = (char ) re_string_get_buffer (&mctx->input);
40168 f533980eb42f autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 40100 diff changeset	1296 if (mctx->input.valid_len - *pidx < naccepted
f533980eb42f autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 40100 diff changeset	1297 \|\| (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
f533980eb42f autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 40100 diff changeset	1298 naccepted)
f533980eb42f autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 40100 diff changeset	1299 != 0))
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1300 return -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1301 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1302 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1303
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1304 if (naccepted == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1305 {
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	1306 Idx dest_node;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1307 ok = re_node_set_insert (eps_via_nodes, node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1308 if (__glibc_unlikely (! ok))
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1309 return -2;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1310 dest_node = dfa->edests[node].elems[0];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1311 if (re_node_set_contains (&mctx->state_log[*pidx]->nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1312 dest_node))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1313 return dest_node;
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 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1316
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1317 if (naccepted != 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1318 \|\| check_node_accept (mctx, dfa->nodes + node, *pidx))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1319 {
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	1320 Idx dest_node = dfa->nexts[node];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1321 pidx = (naccepted == 0) ? pidx + 1 : *pidx + naccepted;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1322 if (fs && (pidx > mctx->match_last \|\| mctx->state_log[pidx] == NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1323 \|\| !re_node_set_contains (&mctx->state_log[*pidx]->nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1324 dest_node)))
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1325 return -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1326 re_node_set_empty (eps_via_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1327 return dest_node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1328 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1329 }
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1330 return -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1331 }
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 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	1334 __attribute_warn_unused_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	1335 push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node,
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	1336 Idx nregs, regmatch_t regs, re_node_set eps_via_nodes)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1337 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1338 reg_errcode_t err;
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	1339 Idx num = fs->num++;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1340 if (fs->num == fs->alloc)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1341 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1342 struct re_fail_stack_ent_t *new_array;
19476 1f3bb9a8c477 regex: use re_malloc etc. consistently Paul Eggert <eggert@cs.ucla.edu> parents: 19445 diff changeset	1343 new_array = re_realloc (fs->stack, struct re_fail_stack_ent_t,
1f3bb9a8c477 regex: use re_malloc etc. consistently Paul Eggert <eggert@cs.ucla.edu> parents: 19445 diff changeset	1344 fs->alloc * 2);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1345 if (new_array == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1346 return REG_ESPACE;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1347 fs->alloc *= 2;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1348 fs->stack = new_array;
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 fs->stack[num].idx = str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1351 fs->stack[num].node = dest_node;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1352 fs->stack[num].regs = re_malloc (regmatch_t, nregs);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1353 if (fs->stack[num].regs == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1354 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1355 memcpy (fs->stack[num].regs, regs, sizeof (regmatch_t) * nregs);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1356 err = re_node_set_init_copy (&fs->stack[num].eps_via_nodes, eps_via_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1357 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1358 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1359
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	1360 static Idx
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1361 pop_fail_stack (struct re_fail_stack_t fs, Idx pidx, Idx nregs,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1362 regmatch_t regs, re_node_set eps_via_nodes)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1363 {
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	1364 Idx num = --fs->num;
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1365 assert (num >= 0);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1366 *pidx = fs->stack[num].idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1367 memcpy (regs, fs->stack[num].regs, sizeof (regmatch_t) * nregs);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1368 re_node_set_free (eps_via_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1369 re_free (fs->stack[num].regs);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1370 *eps_via_nodes = fs->stack[num].eps_via_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1371 return fs->stack[num].node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1372 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1373
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1374 /* Set the positions where the subexpressions are starts/ends to registers
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1375 PMATCH.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1376 Note: We assume that pmatch[0] is already set, and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1377 pmatch[i].rm_so == pmatch[i].rm_eo == -1 for 0 < i < nmatch. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1378
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1379 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	1380 __attribute_warn_unused_result__
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1381 set_regs (const regex_t preg, const re_match_context_t mctx, size_t nmatch,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1382 regmatch_t *pmatch, bool fl_backtrack)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1383 {
16770 e011e0a7ab5a regex: remove unnecessary type punning Paul Eggert <eggert@cs.ucla.edu> parents: 16472 diff changeset	1384 const re_dfa_t *dfa = preg->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	1385 Idx idx, cur_node;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1386 re_node_set eps_via_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1387 struct re_fail_stack_t *fs;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1388 struct re_fail_stack_t fs_body = { 0, 2, NULL };
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1389 regmatch_t *prev_idx_match;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1390 bool prev_idx_match_malloced = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1391
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1392 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1393 assert (nmatch > 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1394 assert (mctx->state_log != NULL);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1395 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1396 if (fl_backtrack)
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 fs = &fs_body;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1399 fs->stack = re_malloc (struct re_fail_stack_ent_t, fs->alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1400 if (fs->stack == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1401 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1402 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1403 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1404 fs = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1405
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1406 cur_node = dfa->init_node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1407 re_node_set_init_empty (&eps_via_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1408
6125 4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1409 if (__libc_use_alloca (nmatch * sizeof (regmatch_t)))
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1410 prev_idx_match = (regmatch_t ) alloca (nmatch sizeof (regmatch_t));
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1411 else
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1412 {
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1413 prev_idx_match = re_malloc (regmatch_t, nmatch);
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1414 if (prev_idx_match == NULL)
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1415 {
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1416 free_fail_stack_return (fs);
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1417 return REG_ESPACE;
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1418 }
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1419 prev_idx_match_malloced = true;
6125 4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1420 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1421 memcpy (prev_idx_match, pmatch, sizeof (regmatch_t) * nmatch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1422
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1423 for (idx = pmatch[0].rm_so; idx <= pmatch[0].rm_eo ;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1424 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1425 update_regs (dfa, pmatch, prev_idx_match, cur_node, idx, nmatch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1426
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1427 if (idx == pmatch[0].rm_eo && cur_node == mctx->last_node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1428 {
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	1429 Idx reg_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1430 if (fs)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1431 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1432 for (reg_idx = 0; reg_idx < nmatch; ++reg_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1433 if (pmatch[reg_idx].rm_so > -1 && pmatch[reg_idx].rm_eo == -1)
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 if (reg_idx == nmatch)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1436 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1437 re_node_set_free (&eps_via_nodes);
6125 4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1438 if (prev_idx_match_malloced)
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1439 re_free (prev_idx_match);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1440 return free_fail_stack_return (fs);
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 cur_node = pop_fail_stack (fs, &idx, nmatch, pmatch,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1443 &eps_via_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1444 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1445 else
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 re_node_set_free (&eps_via_nodes);
6125 4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1448 if (prev_idx_match_malloced)
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1449 re_free (prev_idx_match);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1450 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1451 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1452 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1453
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1454 /* Proceed to next node. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1455 cur_node = proceed_next_node (mctx, nmatch, pmatch, &idx, cur_node,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1456 &eps_via_nodes, fs);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1457
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1458 if (__glibc_unlikely (cur_node < 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1459 {
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1460 if (__glibc_unlikely (cur_node == -2))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1461 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1462 re_node_set_free (&eps_via_nodes);
6125 4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1463 if (prev_idx_match_malloced)
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1464 re_free (prev_idx_match);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1465 free_fail_stack_return (fs);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1466 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1467 }
18095 8ba083f1feb7 Revert previous patch, as it did not fix the bug after all. Paul Eggert <eggert@cs.ucla.edu> parents: 18094 diff changeset	1468 if (fs)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1469 cur_node = pop_fail_stack (fs, &idx, nmatch, pmatch,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1470 &eps_via_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1471 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1472 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1473 re_node_set_free (&eps_via_nodes);
6125 4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1474 if (prev_idx_match_malloced)
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1475 re_free (prev_idx_match);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1476 return REG_NOMATCH;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1477 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1478 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1479 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1480 re_node_set_free (&eps_via_nodes);
6125 4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1481 if (prev_idx_match_malloced)
4af02335816a * config/srclist.txt: Add glibc bug 1245. Paul Eggert <eggert@cs.ucla.edu> parents: 6119 diff changeset	1482 re_free (prev_idx_match);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1483 return free_fail_stack_return (fs);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1484 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1485
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1486 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	1487 free_fail_stack_return (struct re_fail_stack_t *fs)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1488 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1489 if (fs)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1490 {
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	1491 Idx fs_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1492 for (fs_idx = 0; fs_idx < fs->num; ++fs_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1493 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1494 re_node_set_free (&fs->stack[fs_idx].eps_via_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1495 re_free (fs->stack[fs_idx].regs);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1496 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1497 re_free (fs->stack);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1498 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1499 return REG_NOERROR;
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1502 static void
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1503 update_regs (const re_dfa_t dfa, regmatch_t pmatch,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1504 regmatch_t *prev_idx_match, Idx cur_node, Idx cur_idx, Idx nmatch)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1505 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1506 int type = dfa->nodes[cur_node].type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1507 if (type == OP_OPEN_SUBEXP)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1508 {
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	1509 Idx reg_num = dfa->nodes[cur_node].opr.idx + 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1510
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1511 /* We are at the first node of this sub expression. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1512 if (reg_num < nmatch)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1513 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1514 pmatch[reg_num].rm_so = cur_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1515 pmatch[reg_num].rm_eo = -1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1516 }
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 if (type == OP_CLOSE_SUBEXP)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1519 {
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	1520 Idx reg_num = dfa->nodes[cur_node].opr.idx + 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1521 if (reg_num < nmatch)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1522 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1523 /* We are at the last node of this sub expression. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1524 if (pmatch[reg_num].rm_so < cur_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1525 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1526 pmatch[reg_num].rm_eo = cur_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1527 /* This is a non-empty match or we are not inside an optional
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1528 subexpression. Accept this right away. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1529 memcpy (prev_idx_match, pmatch, sizeof (regmatch_t) * nmatch);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1530 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1531 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1532 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1533 if (dfa->nodes[cur_node].opt_subexp
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1534 && prev_idx_match[reg_num].rm_so != -1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1535 /* We transited through an empty match for an optional
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1536 subexpression, like (a?)*, and this is not the subexp's
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1537 first match. Copy back the old content of the registers
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1538 so that matches of an inner subexpression are undone as
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1539 well, like in ((a?)). /
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1540 memcpy (pmatch, prev_idx_match, sizeof (regmatch_t) * nmatch);
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 /* We completed a subexpression, but it may be part of
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1543 an optional one, so do not update PREV_IDX_MATCH. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1544 pmatch[reg_num].rm_eo = cur_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1545 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1546 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1547 }
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 /* This function checks the STATE_LOG from the SCTX->last_str_idx to 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1551 and sift the nodes in each states according to the following rules.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1552 Updated state_log will be wrote to STATE_LOG.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1553
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1554 Rules: We throw away the Node 'a' in the STATE_LOG[STR_IDX] if...
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1555 1. When STR_IDX == MATCH_LAST(the last index in the state_log):
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1556 If 'a' isn't the LAST_NODE and 'a' can't epsilon transit to
18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1557 the LAST_NODE, we throw away the node 'a'.
18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1558 2. When 0 <= STR_IDX < MATCH_LAST and 'a' accepts
18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1559 string 's' and transit to 'b':
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1560 i. If 'b' isn't in the STATE_LOG[STR_IDX+strlen('s')], we throw
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1561 away the node 'a'.
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1562 ii. If 'b' is in the STATE_LOG[STR_IDX+strlen('s')] but 'b' is
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1563 thrown away, we throw away the node 'a'.
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1564 3. When 0 <= STR_IDX < MATCH_LAST and 'a' epsilon transit to 'b':
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1565 i. If 'b' isn't in the STATE_LOG[STR_IDX], we throw away the
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1566 node 'a'.
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1567 ii. If 'b' is in the STATE_LOG[STR_IDX] but 'b' is thrown away,
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1568 we throw away the node 'a'. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1569
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1570 #define STATE_NODE_CONTAINS(state,node) \
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1571 ((state) != NULL && re_node_set_contains (&(state)->nodes, node))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1572
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1573 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	1574 sift_states_backward (const re_match_context_t mctx, re_sift_context_t sctx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1575 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1576 reg_errcode_t err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1577 int null_cnt = 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	1578 Idx str_idx = sctx->last_str_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1579 re_node_set cur_dest;
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 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1582 assert (mctx->state_log != NULL && mctx->state_log[str_idx] != NULL);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1583 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1584
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1585 /* Build sifted state_log[str_idx]. It has the nodes which can epsilon
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1586 transit to the last_node and the last_node itself. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1587 err = re_node_set_init_1 (&cur_dest, sctx->last_node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1588 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1589 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1590 err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1591 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1592 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1593
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1594 /* Then check each states in the state_log. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1595 while (str_idx > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1596 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1597 /* Update counters. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1598 null_cnt = (sctx->sifted_states[str_idx] == NULL) ? null_cnt + 1 : 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1599 if (null_cnt > mctx->max_mb_elem_len)
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 memset (sctx->sifted_states, '\0',
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1602 sizeof (re_dfastate_t ) str_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1603 re_node_set_free (&cur_dest);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1604 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1605 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1606 re_node_set_empty (&cur_dest);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1607 --str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1608
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1609 if (mctx->state_log[str_idx])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1610 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1611 err = build_sifted_states (mctx, sctx, str_idx, &cur_dest);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1612 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1613 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1614 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1615
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1616 /* Add all the nodes which satisfy the following conditions:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1617 - It can epsilon transit to a node in CUR_DEST.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1618 - It is in CUR_SRC.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1619 And update state_log. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1620 err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1621 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1622 goto free_return;
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 err = REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1625 free_return:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1626 re_node_set_free (&cur_dest);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1627 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1628 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1629
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1630 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	1631 __attribute_warn_unused_result__
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1632 build_sifted_states (const re_match_context_t mctx, re_sift_context_t sctx,
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	1633 Idx str_idx, re_node_set *cur_dest)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1634 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1635 const re_dfa_t *const dfa = mctx->dfa;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1636 const re_node_set *cur_src = &mctx->state_log[str_idx]->non_eps_nodes;
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	1637 Idx i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1638
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1639 /* Then build the next sifted state.
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1640 We build the next sifted state on 'cur_dest', and update
18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1641 'sifted_states[str_idx]' with 'cur_dest'.
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1642 Note:
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1643 'cur_dest' is the sifted state from 'state_log[str_idx + 1]'.
18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1644 'cur_src' points the node_set of the old 'state_log[str_idx]'
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1645 (with the epsilon nodes pre-filtered out). */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1646 for (i = 0; i < cur_src->nelem; i++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1647 {
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	1648 Idx prev_node = cur_src->elems[i];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1649 int naccepted = 0;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1650 bool ok;
5968 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 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1653 re_token_type_t type = dfa->nodes[prev_node].type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1654 assert (!IS_EPSILON_NODE (type));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1655 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1656 #ifdef RE_ENABLE_I18N
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	1657 /* If the node may accept "multi byte". */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1658 if (dfa->nodes[prev_node].accept_mb)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1659 naccepted = sift_states_iter_mb (mctx, sctx, prev_node,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1660 str_idx, sctx->last_str_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1661 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1662
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1663 /* We don't check backreferences here.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1664 See update_cur_sifted_state(). */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1665 if (!naccepted
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1666 && check_node_accept (mctx, dfa->nodes + prev_node, str_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1667 && STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + 1],
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1668 dfa->nexts[prev_node]))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1669 naccepted = 1;
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 if (naccepted == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1672 continue;
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 if (sctx->limits.nelem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1675 {
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 to_idx = str_idx + naccepted;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1677 if (check_dst_limits (mctx, &sctx->limits,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1678 dfa->nexts[prev_node], to_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1679 prev_node, str_idx))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1680 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1681 }
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1682 ok = re_node_set_insert (cur_dest, prev_node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1683 if (__glibc_unlikely (! ok))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1684 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1685 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1686
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1687 return REG_NOERROR;
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1690 /* Helper functions. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1691
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1692 static reg_errcode_t
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	1693 clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1694 {
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	1695 Idx top = mctx->state_log_top;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1696
16361 ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	1697 if ((next_state_log_idx >= mctx->input.bufs_len
ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	1698 && mctx->input.bufs_len < mctx->input.len)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1699 \|\| (next_state_log_idx >= mctx->input.valid_len
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1700 && mctx->input.valid_len < mctx->input.len))
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 reg_errcode_t err;
17301 d08258969ee9 regex: fix buffer overrun in regexp matcher Andreas Schwab <schwab@suse.de> parents: 17249 diff changeset	1703 err = extend_buffers (mctx, next_state_log_idx + 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1704 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1705 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1706 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1707
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1708 if (top < next_state_log_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1709 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1710 memset (mctx->state_log + top + 1, '\0',
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1711 sizeof (re_dfastate_t ) (next_state_log_idx - top));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1712 mctx->state_log_top = next_state_log_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1713 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1714 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1715 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1716
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1717 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	1718 merge_state_array (const re_dfa_t dfa, re_dfastate_t *dst,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1719 re_dfastate_t **src, Idx num)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1720 {
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	1721 Idx st_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1722 reg_errcode_t err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1723 for (st_idx = 0; st_idx < num; ++st_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1724 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1725 if (dst[st_idx] == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1726 dst[st_idx] = src[st_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1727 else if (src[st_idx] != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1728 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1729 re_node_set merged_set;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1730 err = re_node_set_init_union (&merged_set, &dst[st_idx]->nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1731 &src[st_idx]->nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1732 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1733 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1734 dst[st_idx] = re_acquire_state (&err, dfa, &merged_set);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1735 re_node_set_free (&merged_set);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1736 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1737 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1738 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1739 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1740 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1741 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1742
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1743 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	1744 update_cur_sifted_state (const re_match_context_t *mctx,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1745 re_sift_context_t *sctx, Idx str_idx,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1746 re_node_set *dest_nodes)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1747 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1748 const re_dfa_t *const dfa = mctx->dfa;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1749 reg_errcode_t err = REG_NOERROR;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1750 const re_node_set *candidates;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1751 candidates = ((mctx->state_log[str_idx] == NULL) ? NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1752 : &mctx->state_log[str_idx]->nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1753
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1754 if (dest_nodes->nelem == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1755 sctx->sifted_states[str_idx] = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1756 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1757 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1758 if (candidates)
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 /* At first, add the nodes which can epsilon transit to a node in
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1761 DEST_NODE. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1762 err = add_epsilon_src_nodes (dfa, dest_nodes, candidates);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1763 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1764 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1765
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1766 /* Then, check the limitations in the current sift_context. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1767 if (sctx->limits.nelem)
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 err = check_subexp_limits (dfa, dest_nodes, candidates, &sctx->limits,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1770 mctx->bkref_ents, str_idx);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1771 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1772 return err;
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1776 sctx->sifted_states[str_idx] = re_acquire_state (&err, dfa, dest_nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1777 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1778 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1779 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1780
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1781 if (candidates && mctx->state_log[str_idx]->has_backref)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1782 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1783 err = sift_states_bkref (mctx, sctx, str_idx, candidates);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1784 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1785 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1786 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1787 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1788 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1789
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1790 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	1791 __attribute_warn_unused_result__
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1792 add_epsilon_src_nodes (const re_dfa_t dfa, re_node_set dest_nodes,
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	1793 const re_node_set *candidates)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1794 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1795 reg_errcode_t err = REG_NOERROR;
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	1796 Idx i;
5968 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 re_dfastate_t *state = re_acquire_state (&err, dfa, dest_nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1799 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1800 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1801
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1802 if (!state->inveclosure.alloc)
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 err = re_node_set_alloc (&state->inveclosure, dest_nodes->nelem);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1805 if (__glibc_unlikely (err != REG_NOERROR))
12832 185094053301 regex: add many uses of __attribute_warn_unused_result__ Jim Meyering <meyering@redhat.com> parents: 12572 diff changeset	1806 return REG_ESPACE;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1807 for (i = 0; i < dest_nodes->nelem; i++)
12832 185094053301 regex: add many uses of __attribute_warn_unused_result__ Jim Meyering <meyering@redhat.com> parents: 12572 diff changeset	1808 {
185094053301 regex: add many uses of __attribute_warn_unused_result__ Jim Meyering <meyering@redhat.com> parents: 12572 diff changeset	1809 err = re_node_set_merge (&state->inveclosure,
185094053301 regex: add many uses of __attribute_warn_unused_result__ Jim Meyering <meyering@redhat.com> parents: 12572 diff changeset	1810 dfa->inveclosures + dest_nodes->elems[i]);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1811 if (__glibc_unlikely (err != REG_NOERROR))
12832 185094053301 regex: add many uses of __attribute_warn_unused_result__ Jim Meyering <meyering@redhat.com> parents: 12572 diff changeset	1812 return REG_ESPACE;
185094053301 regex: add many uses of __attribute_warn_unused_result__ Jim Meyering <meyering@redhat.com> parents: 12572 diff changeset	1813 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1814 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1815 return re_node_set_add_intersect (dest_nodes, candidates,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1816 &state->inveclosure);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1817 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1818
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1819 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	1820 sub_epsilon_src_nodes (const re_dfa_t dfa, Idx node, re_node_set dest_nodes,
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	1821 const re_node_set *candidates)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1822 {
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	1823 Idx ecl_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1824 reg_errcode_t err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1825 re_node_set *inv_eclosure = dfa->inveclosures + node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1826 re_node_set except_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1827 re_node_set_init_empty (&except_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1828 for (ecl_idx = 0; ecl_idx < inv_eclosure->nelem; ++ecl_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1829 {
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	1830 Idx cur_node = inv_eclosure->elems[ecl_idx];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1831 if (cur_node == node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1832 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1833 if (IS_EPSILON_NODE (dfa->nodes[cur_node].type))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1834 {
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	1835 Idx edst1 = dfa->edests[cur_node].elems[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	1836 Idx edst2 = ((dfa->edests[cur_node].nelem > 1)
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1837 ? dfa->edests[cur_node].elems[1] : -1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1838 if ((!re_node_set_contains (inv_eclosure, edst1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1839 && re_node_set_contains (dest_nodes, edst1))
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1840 \|\| (edst2 > 0
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1841 && !re_node_set_contains (inv_eclosure, edst2)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1842 && re_node_set_contains (dest_nodes, edst2)))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1843 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1844 err = re_node_set_add_intersect (&except_nodes, candidates,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1845 dfa->inveclosures + cur_node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	1846 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1847 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1848 re_node_set_free (&except_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1849 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1850 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1851 }
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 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1854 for (ecl_idx = 0; ecl_idx < inv_eclosure->nelem; ++ecl_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1855 {
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	1856 Idx cur_node = inv_eclosure->elems[ecl_idx];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1857 if (!re_node_set_contains (&except_nodes, cur_node))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1858 {
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	1859 Idx idx = re_node_set_contains (dest_nodes, cur_node) - 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1860 re_node_set_remove_at (dest_nodes, idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1861 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1862 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1863 re_node_set_free (&except_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1864 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1865 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1866
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1867 static bool
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	1868 check_dst_limits (const re_match_context_t mctx, const re_node_set limits,
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	1869 Idx dst_node, Idx dst_idx, Idx src_node, Idx src_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1870 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1871 const re_dfa_t *const dfa = mctx->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	1872 Idx lim_idx, src_pos, dst_pos;
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	1873
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	1874 Idx dst_bkref_idx = search_cur_bkref_entry (mctx, dst_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	1875 Idx src_bkref_idx = search_cur_bkref_entry (mctx, src_idx);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1876 for (lim_idx = 0; lim_idx < limits->nelem; ++lim_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1877 {
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	1878 Idx subexp_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1879 struct re_backref_cache_entry *ent;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1880 ent = mctx->bkref_ents + limits->elems[lim_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1881 subexp_idx = dfa->nodes[ent->node].opr.idx;
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 dst_pos = check_dst_limits_calc_pos (mctx, limits->elems[lim_idx],
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1884 subexp_idx, dst_node, dst_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1885 dst_bkref_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1886 src_pos = check_dst_limits_calc_pos (mctx, limits->elems[lim_idx],
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1887 subexp_idx, src_node, src_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1888 src_bkref_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1889
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1890 /* In case of:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1891 <src> <dst> ( <subexp> )
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1892 ( <subexp> ) <src> <dst>
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1893 ( <subexp1> <src> <subexp2> <dst> <subexp3> ) */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1894 if (src_pos == dst_pos)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1895 continue; /* This is unrelated limitation. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1896 else
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1897 return true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1898 }
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	1899 return false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1900 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1901
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1902 static int
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	1903 check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,
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	1904 Idx subexp_idx, Idx from_node, Idx bkref_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1905 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1906 const re_dfa_t *const dfa = mctx->dfa;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1907 const re_node_set *eclosures = dfa->eclosures + from_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	1908 Idx node_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1909
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1910 /* Else, we are on the boundary: examine the nodes on the epsilon
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1911 closure. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1912 for (node_idx = 0; node_idx < eclosures->nelem; ++node_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1913 {
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	1914 Idx node = eclosures->elems[node_idx];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1915 switch (dfa->nodes[node].type)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1916 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1917 case OP_BACK_REF:
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	1918 if (bkref_idx != -1)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1919 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1920 struct re_backref_cache_entry *ent = mctx->bkref_ents + bkref_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1921 do
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1922 {
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	1923 Idx dst;
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	1924 int cpos;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1925
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1926 if (ent->node != node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1927 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1928
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1929 if (subexp_idx < BITSET_WORD_BITS
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1930 && !(ent->eps_reachable_subexps_map
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1931 & ((bitset_word_t) 1 << subexp_idx)))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1932 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1933
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1934 /* Recurse trying to reach the OP_OPEN_SUBEXP and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1935 OP_CLOSE_SUBEXP cases below. But, if the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1936 destination node is the same node as the source
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1937 node, don't recurse because it would cause an
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1938 infinite loop: a regex that exhibits this behavior
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1939 is ()\1\1 */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1940 dst = dfa->edests[node].elems[0];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1941 if (dst == from_node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1942 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1943 if (boundaries & 1)
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1944 return -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1945 else /* if (boundaries & 2) */
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1946 return 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1947 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1948
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1949 cpos =
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1950 check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1951 dst, bkref_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1952 if (cpos == -1 /* && (boundaries & 1) */)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1953 return -1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1954 if (cpos == 0 && (boundaries & 2))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1955 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1956
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	1957 if (subexp_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	1958 ent->eps_reachable_subexps_map
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1959 &= ~((bitset_word_t) 1 << subexp_idx);
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	1960 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1961 while (ent++->more);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1962 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1963 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1964
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1965 case OP_OPEN_SUBEXP:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1966 if ((boundaries & 1) && subexp_idx == dfa->nodes[node].opr.idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1967 return -1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1968 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1969
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1970 case OP_CLOSE_SUBEXP:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1971 if ((boundaries & 2) && subexp_idx == dfa->nodes[node].opr.idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1972 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1973 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1974
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1975 default:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1976 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1977 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1978 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1979
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1980 return (boundaries & 2) ? 1 : 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1981 }
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 static int
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1984 check_dst_limits_calc_pos (const re_match_context_t *mctx, Idx limit,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1985 Idx subexp_idx, Idx from_node, Idx str_idx,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	1986 Idx bkref_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1987 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1988 struct re_backref_cache_entry *lim = mctx->bkref_ents + limit;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1989 int boundaries;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1990
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1991 /* If we are outside the range of the subexpression, return -1 or 1. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1992 if (str_idx < lim->subexp_from)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1993 return -1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1994
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1995 if (lim->subexp_to < str_idx)
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 /* If we are within the subexpression, return 0. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	1999 boundaries = (str_idx == lim->subexp_from);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2000 boundaries \|= (str_idx == lim->subexp_to) << 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2001 if (boundaries == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2002 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2003
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2004 /* Else, examine epsilon closure. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2005 return check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2006 from_node, bkref_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2007 }
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 /* Check the limitations of sub expressions LIMITS, and remove the nodes
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2010 which are against limitations from DEST_NODES. */
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 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	2013 check_subexp_limits (const re_dfa_t dfa, re_node_set dest_nodes,
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2014 const re_node_set candidates, re_node_set limits,
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	2015 struct re_backref_cache_entry *bkref_ents, Idx str_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2016 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2017 reg_errcode_t err;
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	2018 Idx node_idx, lim_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2019
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2020 for (lim_idx = 0; lim_idx < limits->nelem; ++lim_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2021 {
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	2022 Idx subexp_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2023 struct re_backref_cache_entry *ent;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2024 ent = bkref_ents + limits->elems[lim_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2025
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2026 if (str_idx <= ent->subexp_from \|\| ent->str_idx < str_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2027 continue; /* This is unrelated limitation. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2028
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2029 subexp_idx = dfa->nodes[ent->node].opr.idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2030 if (ent->subexp_to == str_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2031 {
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	2032 Idx ops_node = -1;
8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	2033 Idx cls_node = -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2034 for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2035 {
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	2036 Idx node = dest_nodes->elems[node_idx];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2037 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	2038 if (type == OP_OPEN_SUBEXP
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2039 && subexp_idx == dfa->nodes[node].opr.idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2040 ops_node = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2041 else if (type == OP_CLOSE_SUBEXP
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2042 && subexp_idx == dfa->nodes[node].opr.idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2043 cls_node = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2044 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2045
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2046 /* Check the limitation of the open subexpression. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2047 /* Note that (ent->subexp_to = str_idx != ent->subexp_from). */
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	2048 if (ops_node >= 0)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2049 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2050 err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2051 candidates);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2052 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2053 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2054 }
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 /* Check the limitation of the close subexpression. */
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	2057 if (cls_node >= 0)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2058 for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2059 {
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	2060 Idx node = dest_nodes->elems[node_idx];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2061 if (!re_node_set_contains (dfa->inveclosures + node,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2062 cls_node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2063 && !re_node_set_contains (dfa->eclosures + node,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2064 cls_node))
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 /* It is against this limitation.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2067 Remove it form the current sifted state. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2068 err = sub_epsilon_src_nodes (dfa, node, dest_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2069 candidates);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2070 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2071 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2072 --node_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2073 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2074 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2075 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2076 else /* (ent->subexp_to != str_idx) */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2077 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2078 for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2079 {
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	2080 Idx node = dest_nodes->elems[node_idx];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2081 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	2082 if (type == OP_CLOSE_SUBEXP \|\| type == OP_OPEN_SUBEXP)
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 if (subexp_idx != dfa->nodes[node].opr.idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2085 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2086 /* It is against this limitation.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2087 Remove it form the current sifted state. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2088 err = sub_epsilon_src_nodes (dfa, node, dest_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2089 candidates);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2090 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2091 return err;
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 }
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 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2097 }
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 reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	2100 __attribute_warn_unused_result__
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2101 sift_states_bkref (const re_match_context_t mctx, re_sift_context_t sctx,
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	2102 Idx str_idx, const re_node_set *candidates)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2103 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2104 const re_dfa_t *const dfa = mctx->dfa;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2105 reg_errcode_t err;
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	2106 Idx node_idx, node;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2107 re_sift_context_t local_sctx;
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	2108 Idx first_idx = search_cur_bkref_entry (mctx, str_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	2109
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	2110 if (first_idx == -1)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2111 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2112
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2113 local_sctx.sifted_states = NULL; /* Mark that it hasn't been initialized. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2114
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2115 for (node_idx = 0; node_idx < candidates->nelem; ++node_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2116 {
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	2117 Idx enabled_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2118 re_token_type_t type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2119 struct re_backref_cache_entry *entry;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2120 node = candidates->elems[node_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2121 type = dfa->nodes[node].type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2122 /* Avoid infinite loop for the REs like "()\1+". */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2123 if (node == sctx->last_node && str_idx == sctx->last_str_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2124 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2125 if (type != OP_BACK_REF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2126 continue;
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 entry = mctx->bkref_ents + first_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2129 enabled_idx = first_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2130 do
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2131 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2132 Idx subexp_len;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2133 Idx to_idx;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2134 Idx dst_node;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	2135 bool ok;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2136 re_dfastate_t *cur_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2137
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2138 if (entry->node != node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2139 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2140 subexp_len = entry->subexp_to - entry->subexp_from;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2141 to_idx = str_idx + subexp_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2142 dst_node = (subexp_len ? dfa->nexts[node]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2143 : dfa->edests[node].elems[0]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2144
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2145 if (to_idx > sctx->last_str_idx
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2146 \|\| sctx->sifted_states[to_idx] == NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2147 \|\| !STATE_NODE_CONTAINS (sctx->sifted_states[to_idx], dst_node)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2148 \|\| check_dst_limits (mctx, &sctx->limits, node,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2149 str_idx, dst_node, to_idx))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2150 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2151
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2152 if (local_sctx.sifted_states == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2153 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2154 local_sctx = *sctx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2155 err = re_node_set_init_copy (&local_sctx.limits, &sctx->limits);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2156 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2157 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2158 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2159 local_sctx.last_node = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2160 local_sctx.last_str_idx = str_idx;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	2161 ok = re_node_set_insert (&local_sctx.limits, enabled_idx);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2162 if (__glibc_unlikely (! ok))
5968 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 err = REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2165 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2166 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2167 cur_state = local_sctx.sifted_states[str_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2168 err = sift_states_backward (mctx, &local_sctx);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2169 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2170 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2171 if (sctx->limited_states != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2172 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2173 err = merge_state_array (dfa, sctx->limited_states,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2174 local_sctx.sifted_states,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2175 str_idx + 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2176 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2177 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2178 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2179 local_sctx.sifted_states[str_idx] = cur_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2180 re_node_set_remove (&local_sctx.limits, enabled_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2181
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2182 /* mctx->bkref_ents may have changed, reload the pointer. */
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2183 entry = mctx->bkref_ents + enabled_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2184 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2185 while (enabled_idx++, entry++->more);
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 err = REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2188 free_return:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2189 if (local_sctx.sifted_states != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2190 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2191 re_node_set_free (&local_sctx.limits);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2192 }
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 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2195 }
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2198 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2199 static int
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2200 sift_states_iter_mb (const re_match_context_t mctx, re_sift_context_t sctx,
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	2201 Idx node_idx, Idx str_idx, Idx max_str_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2202 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2203 const re_dfa_t *const dfa = mctx->dfa;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2204 int naccepted;
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	2205 /* Check the node can accept "multi byte". */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2206 naccepted = check_node_accept_bytes (dfa, node_idx, &mctx->input, str_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2207 if (naccepted > 0 && str_idx + naccepted <= max_str_idx &&
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2208 !STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + naccepted],
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2209 dfa->nexts[node_idx]))
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	2210 /* The node can't accept the "multi byte", or the
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2211 destination was already thrown away, then the node
40100 f63c4e7dfb31 Fix typos found by codespell. Tim Rühsen <tim.ruehsen@gmx.de> parents: 40058 diff changeset	2212 couldn't accept the current input "multi byte". */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2213 naccepted = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2214 /* Otherwise, it is sure that the node could accept
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	2215 'naccepted' bytes input. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2216 return naccepted;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2217 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2218 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2219
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2220
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2221 /* Functions for state transition. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2222
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2223 /* Return the next state to which the current state STATE will transit by
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2224 accepting the current input byte, and update STATE_LOG if necessary.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2225 If STATE can accept a multibyte char/collating element/back reference
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2226 update the destination of STATE_LOG. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2227
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2228 static re_dfastate_t *
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	2229 __attribute_warn_unused_result__
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2230 transit_state (reg_errcode_t err, re_match_context_t mctx,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2231 re_dfastate_t *state)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2232 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2233 re_dfastate_t **trtable;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2234 unsigned char ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2235
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2236 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2237 /* If the current state can accept multibyte. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2238 if (__glibc_unlikely (state->accept_mb))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2239 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2240 *err = transit_state_mb (mctx, state);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2241 if (__glibc_unlikely (*err != REG_NOERROR))
5968 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 #endif /* RE_ENABLE_I18N */
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 /* Then decide the next state with the single byte. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2247 #if 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2248 if (0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2249 /* don't use transition table */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2250 return transit_state_sb (err, mctx, state);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2251 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2252
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2253 /* Use transition table */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2254 ch = re_string_fetch_byte (&mctx->input);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2255 for (;;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2256 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2257 trtable = state->trtable;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2258 if (__glibc_likely (trtable != NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2259 return trtable[ch];
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 trtable = state->word_trtable;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2262 if (__glibc_likely (trtable != NULL))
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2263 {
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2264 unsigned int context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2265 context
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2266 = re_string_context_at (&mctx->input,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2267 re_string_cur_idx (&mctx->input) - 1,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2268 mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2269 if (IS_WORD_CONTEXT (context))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2270 return trtable[ch + SBC_MAX];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2271 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2272 return trtable[ch];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2273 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2274
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2275 if (!build_trtable (mctx->dfa, state))
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_ESPACE;
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2281 /* Retry, we now have a transition table. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2282 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2283 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2284
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2285 /* Update the state_log if we need */
8540 ea5d70262310 Avoid HP-UX cc warning. Bruno Haible <bruno@clisp.org> parents: 8045 diff changeset	2286 static re_dfastate_t *
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2287 merge_state_with_log (reg_errcode_t err, re_match_context_t mctx,
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2288 re_dfastate_t *next_state)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2289 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2290 const re_dfa_t *const dfa = mctx->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	2291 Idx cur_idx = re_string_cur_idx (&mctx->input);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2292
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2293 if (cur_idx > mctx->state_log_top)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2294 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2295 mctx->state_log[cur_idx] = next_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2296 mctx->state_log_top = cur_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2297 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2298 else if (mctx->state_log[cur_idx] == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2299 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2300 mctx->state_log[cur_idx] = next_state;
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2303 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2304 re_dfastate_t *pstate;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2305 unsigned int context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2306 re_node_set next_nodes, log_nodes, table_nodes = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2307 /* If (state_log[cur_idx] != 0), it implies that cur_idx is
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2308 the destination of a multibyte char/collating element/
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2309 back reference. Then the next state is the union set of
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2310 these destinations and the results of the transition table. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2311 pstate = mctx->state_log[cur_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2312 log_nodes = pstate->entrance_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2313 if (next_state != NULL)
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2314 {
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2315 table_nodes = next_state->entrance_nodes;
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2316 *err = re_node_set_init_union (&next_nodes, table_nodes,
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2317 log_nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2318 if (__glibc_unlikely (*err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2319 return NULL;
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2320 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2321 else
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2322 next_nodes = *log_nodes;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2323 /* Note: We already add the nodes of the initial state,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2324 then we don't need to add them here. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2325
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2326 context = re_string_context_at (&mctx->input,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2327 re_string_cur_idx (&mctx->input) - 1,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2328 mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2329 next_state = mctx->state_log[cur_idx]
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2330 = re_acquire_state_context (err, dfa, &next_nodes, context);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2331 /* We don't need to check errors here, since the return value of
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2332 this function is next_state and ERR is already set. */
5968 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 if (table_nodes != NULL)
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2335 re_node_set_free (&next_nodes);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2336 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2337
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2338 if (__glibc_unlikely (dfa->nbackref) && next_state != NULL)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2339 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2340 /* Check OP_OPEN_SUBEXP in the current state in case that we use them
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2341 later. We must check them here, since the back references in the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2342 next state might use them. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2343 *err = check_subexp_matching_top (mctx, &next_state->nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2344 cur_idx);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2345 if (__glibc_unlikely (*err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2346 return NULL;
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 /* If the next state has back references. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2349 if (next_state->has_backref)
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 = transit_state_bkref (mctx, &next_state->nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2352 if (__glibc_unlikely (*err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2353 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2354 next_state = mctx->state_log[cur_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2355 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2356 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2357
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2358 return next_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2359 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2360
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2361 /* Skip bytes in the input that correspond to part of a
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2362 multi-byte match, then look in the log for a state
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2363 from which to restart matching. */
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2364 static re_dfastate_t *
e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2365 find_recover_state (reg_errcode_t err, re_match_context_t mctx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2366 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2367 re_dfastate_t *cur_state;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2368 do
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2369 {
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	2370 Idx max = mctx->state_log_top;
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	2371 Idx cur_str_idx = re_string_cur_idx (&mctx->input);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2372
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2373 do
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2374 {
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2375 if (++cur_str_idx > max)
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2376 return NULL;
f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2377 re_string_skip_bytes (&mctx->input, 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2378 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2379 while (mctx->state_log[cur_str_idx] == NULL);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2380
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2381 cur_state = merge_state_with_log (err, mctx, NULL);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2382 }
6119 c3bf2ea44695 Make regex safe for g++. This fixes one real bug (an "err" Paul Eggert <eggert@cs.ucla.edu> parents: 6101 diff changeset	2383 while (*err == REG_NOERROR && cur_state == NULL);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2384 return cur_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2385 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2386
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2387 /* Helper functions for transit_state. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2388
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2389 /* From the node set CUR_NODES, pick up the nodes whose types are
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2390 OP_OPEN_SUBEXP and which have corresponding back references in the regular
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2391 expression. And register them to use them later for evaluating the
16358 a712776b11ce maint: spelling fixes Paul Eggert <eggert@cs.ucla.edu> parents: 16235 diff changeset	2392 corresponding back references. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2393
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2394 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2395 check_subexp_matching_top (re_match_context_t mctx, re_node_set cur_nodes,
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	2396 Idx str_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2397 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2398 const re_dfa_t *const dfa = mctx->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	2399 Idx node_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2400 reg_errcode_t err;
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 /* TODO: This isn't efficient.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2403 Because there might be more than one nodes whose types are
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2404 OP_OPEN_SUBEXP and whose index is SUBEXP_IDX, we must check all
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2405 nodes.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2406 E.g. RE: (a){2} */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2407 for (node_idx = 0; node_idx < cur_nodes->nelem; ++node_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2408 {
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	2409 Idx node = cur_nodes->elems[node_idx];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2410 if (dfa->nodes[node].type == OP_OPEN_SUBEXP
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	2411 && dfa->nodes[node].opr.idx < BITSET_WORD_BITS
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	2412 && (dfa->used_bkref_map
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2413 & ((bitset_word_t) 1 << dfa->nodes[node].opr.idx)))
5968 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 = match_ctx_add_subtop (mctx, node, str_idx);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2416 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2417 return err;
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 REG_NOERROR;
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 #if 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2424 /* Return the next state to which the current state STATE will transit by
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2425 accepting the current input byte. */
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 static re_dfastate_t *
6174 6039b763ad3c * lib/regcomp.c (re_comp) [defined _REGEX_RE_COMP \|\| defined _LIBC]: Paul Eggert <eggert@cs.ucla.edu> parents: 6173 diff changeset	2428 transit_state_sb (reg_errcode_t err, re_match_context_t mctx,
6039b763ad3c * lib/regcomp.c (re_comp) [defined _REGEX_RE_COMP \|\| defined _LIBC]: Paul Eggert <eggert@cs.ucla.edu> parents: 6173 diff changeset	2429 re_dfastate_t *state)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2430 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2431 const re_dfa_t *const dfa = mctx->dfa;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2432 re_node_set next_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2433 re_dfastate_t *next_state;
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	2434 Idx node_cnt, cur_str_idx = re_string_cur_idx (&mctx->input);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2435 unsigned int context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2436
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2437 *err = re_node_set_alloc (&next_nodes, state->nodes.nelem + 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2438 if (__glibc_unlikely (*err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2439 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2440 for (node_cnt = 0; node_cnt < state->nodes.nelem; ++node_cnt)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2441 {
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	2442 Idx cur_node = state->nodes.elems[node_cnt];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2443 if (check_node_accept (mctx, dfa->nodes + cur_node, cur_str_idx))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2444 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2445 *err = re_node_set_merge (&next_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2446 dfa->eclosures + dfa->nexts[cur_node]);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2447 if (__glibc_unlikely (*err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2448 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2449 re_node_set_free (&next_nodes);
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 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2452 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2453 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2454 context = re_string_context_at (&mctx->input, cur_str_idx, mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2455 next_state = re_acquire_state_context (err, dfa, &next_nodes, context);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2456 /* We don't need to check errors here, since the return value of
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2457 this function is next_state and ERR is already set. */
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 re_node_set_free (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2460 re_string_skip_bytes (&mctx->input, 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2461 return next_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2462 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2463 #endif
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 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2466 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2467 transit_state_mb (re_match_context_t mctx, re_dfastate_t pstate)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2468 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2469 const re_dfa_t *const dfa = mctx->dfa;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2470 reg_errcode_t err;
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	2471 Idx i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2472
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2473 for (i = 0; i < pstate->nodes.nelem; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2474 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2475 re_node_set dest_nodes, *new_nodes;
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	2476 Idx cur_node_idx = pstate->nodes.elems[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	2477 int naccepted;
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	2478 Idx dest_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2479 unsigned int context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2480 re_dfastate_t *dest_state;
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 (!dfa->nodes[cur_node_idx].accept_mb)
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2483 continue;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2484
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2485 if (dfa->nodes[cur_node_idx].constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2486 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2487 context = re_string_context_at (&mctx->input,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2488 re_string_cur_idx (&mctx->input),
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2489 mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2490 if (NOT_SATISFY_NEXT_CONSTRAINT (dfa->nodes[cur_node_idx].constraint,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2491 context))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2492 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2493 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2494
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2495 /* How many bytes the node can accept? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2496 naccepted = check_node_accept_bytes (dfa, cur_node_idx, &mctx->input,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2497 re_string_cur_idx (&mctx->input));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2498 if (naccepted == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2499 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2500
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	2501 /* The node can accepts 'naccepted' bytes. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2502 dest_idx = re_string_cur_idx (&mctx->input) + naccepted;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2503 mctx->max_mb_elem_len = ((mctx->max_mb_elem_len < naccepted) ? naccepted
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2504 : mctx->max_mb_elem_len);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2505 err = clean_state_log_if_needed (mctx, dest_idx);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2506 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2507 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2508 #ifdef DEBUG
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	2509 assert (dfa->nexts[cur_node_idx] != -1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2510 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2511 new_nodes = dfa->eclosures + dfa->nexts[cur_node_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2512
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2513 dest_state = mctx->state_log[dest_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2514 if (dest_state == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2515 dest_nodes = *new_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2516 else
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 err = re_node_set_init_union (&dest_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2519 dest_state->entrance_nodes, new_nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2520 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2521 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2522 }
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2523 context = re_string_context_at (&mctx->input, dest_idx - 1,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2524 mctx->eflags);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2525 mctx->state_log[dest_idx]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2526 = re_acquire_state_context (&err, dfa, &dest_nodes, context);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2527 if (dest_state != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2528 re_node_set_free (&dest_nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2529 if (__glibc_unlikely (mctx->state_log[dest_idx] == NULL
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2530 && err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2531 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2532 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2533 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2534 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2535 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2536
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2537 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2538 transit_state_bkref (re_match_context_t mctx, const re_node_set nodes)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2539 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2540 const re_dfa_t *const dfa = mctx->dfa;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2541 reg_errcode_t err;
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	2542 Idx 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	2543 Idx cur_str_idx = re_string_cur_idx (&mctx->input);
5968 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 for (i = 0; i < nodes->nelem; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2546 {
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	2547 Idx dest_str_idx, prev_nelem, bkc_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	2548 Idx node_idx = nodes->elems[i];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2549 unsigned int context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2550 const re_token_t *node = dfa->nodes + node_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2551 re_node_set *new_dest_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2552
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	2553 /* Check whether 'node' is a backreference or not. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2554 if (node->type != OP_BACK_REF)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2555 continue;
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 if (node->constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2558 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2559 context = re_string_context_at (&mctx->input, cur_str_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2560 mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2561 if (NOT_SATISFY_NEXT_CONSTRAINT (node->constraint, context))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2562 continue;
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
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	2565 /* 'node' is a backreference.
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2566 Check the substring which the substring matched. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2567 bkc_idx = mctx->nbkref_ents;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2568 err = get_subexp (mctx, node_idx, cur_str_idx);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2569 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2570 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2571
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	2572 /* And add the epsilon closures (which is 'new_dest_nodes') of
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2573 the backreference to appropriate state_log. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2574 #ifdef DEBUG
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	2575 assert (dfa->nexts[node_idx] != -1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2576 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2577 for (; bkc_idx < mctx->nbkref_ents; ++bkc_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2578 {
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	2579 Idx subexp_len;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2580 re_dfastate_t *dest_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2581 struct re_backref_cache_entry *bkref_ent;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2582 bkref_ent = mctx->bkref_ents + bkc_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2583 if (bkref_ent->node != node_idx \|\| bkref_ent->str_idx != cur_str_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2584 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2585 subexp_len = bkref_ent->subexp_to - bkref_ent->subexp_from;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2586 new_dest_nodes = (subexp_len == 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2587 ? dfa->eclosures + dfa->edests[node_idx].elems[0]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2588 : dfa->eclosures + dfa->nexts[node_idx]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2589 dest_str_idx = (cur_str_idx + bkref_ent->subexp_to
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2590 - bkref_ent->subexp_from);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2591 context = re_string_context_at (&mctx->input, dest_str_idx - 1,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2592 mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2593 dest_state = mctx->state_log[dest_str_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2594 prev_nelem = ((mctx->state_log[cur_str_idx] == NULL) ? 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2595 : mctx->state_log[cur_str_idx]->nodes.nelem);
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	2596 /* Add 'new_dest_node' to state_log. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2597 if (dest_state == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2598 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2599 mctx->state_log[dest_str_idx]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2600 = re_acquire_state_context (&err, dfa, new_dest_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2601 context);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2602 if (__glibc_unlikely (mctx->state_log[dest_str_idx] == NULL
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2603 && err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2604 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2605 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2606 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2607 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2608 re_node_set dest_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2609 err = re_node_set_init_union (&dest_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2610 dest_state->entrance_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2611 new_dest_nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2612 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2613 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2614 re_node_set_free (&dest_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2615 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2616 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2617 mctx->state_log[dest_str_idx]
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2618 = re_acquire_state_context (&err, dfa, &dest_nodes, context);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2619 re_node_set_free (&dest_nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2620 if (__glibc_unlikely (mctx->state_log[dest_str_idx] == NULL
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2621 && err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2622 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2623 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2624 /* We need to check recursively if the backreference can epsilon
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2625 transit. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2626 if (subexp_len == 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2627 && mctx->state_log[cur_str_idx]->nodes.nelem > prev_nelem)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2628 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2629 err = check_subexp_matching_top (mctx, new_dest_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2630 cur_str_idx);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2631 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2632 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2633 err = transit_state_bkref (mctx, new_dest_nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2634 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2635 goto free_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2636 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2637 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2638 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2639 err = REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2640 free_return:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2641 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2642 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2643
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2644 /* Enumerate all the candidates which the backreference BKREF_NODE can match
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2645 at BKREF_STR_IDX, and register them by match_ctx_add_entry().
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2646 Note that we might collect inappropriate candidates here.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2647 However, the cost of checking them strictly here is too high, then we
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2648 delay these checking for prune_impossible_nodes(). */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2649
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2650 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	2651 __attribute_warn_unused_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	2652 get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2653 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2654 const re_dfa_t *const dfa = mctx->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	2655 Idx subexp_num, sub_top_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2656 const char buf = (const char ) re_string_get_buffer (&mctx->input);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2657 /* Return if we have already checked BKREF_NODE at BKREF_STR_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	2658 Idx cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx);
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	2659 if (cache_idx != -1)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2660 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2661 const struct re_backref_cache_entry *entry
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2662 = mctx->bkref_ents + cache_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2663 do
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	2664 if (entry->node == bkref_node)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2665 return REG_NOERROR; /* We already checked it. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2666 while (entry++->more);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2667 }
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 subexp_num = dfa->nodes[bkref_node].opr.idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2670
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2671 /* For each sub expression */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2672 for (sub_top_idx = 0; sub_top_idx < mctx->nsub_tops; ++sub_top_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2673 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2674 reg_errcode_t err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2675 re_sub_match_top_t *sub_top = mctx->sub_tops[sub_top_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2676 re_sub_match_last_t *sub_last;
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	2677 Idx sub_last_idx, sl_str, bkref_str_off;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2678
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2679 if (dfa->nodes[sub_top->node].opr.idx != subexp_num)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2680 continue; /* It isn't related. */
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 sl_str = sub_top->str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2683 bkref_str_off = bkref_str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2684 /* At first, check the last node of sub expressions we already
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2685 evaluated. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2686 for (sub_last_idx = 0; sub_last_idx < sub_top->nlasts; ++sub_last_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2687 {
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	2688 regoff_t sl_str_diff;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2689 sub_last = sub_top->lasts[sub_last_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2690 sl_str_diff = sub_last->str_idx - sl_str;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2691 /* The matched string by the sub expression match with the substring
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2692 at the back reference? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2693 if (sl_str_diff > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2694 {
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2695 if (__glibc_unlikely (bkref_str_off + sl_str_diff
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2696 > mctx->input.valid_len))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2697 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2698 /* Not enough chars for a successful match. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2699 if (bkref_str_off + sl_str_diff > mctx->input.len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2700 break;
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 err = clean_state_log_if_needed (mctx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2703 bkref_str_off
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2704 + sl_str_diff);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2705 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2706 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2707 buf = (const char *) re_string_get_buffer (&mctx->input);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2708 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2709 if (memcmp (buf + bkref_str_off, buf + sl_str, sl_str_diff) != 0)
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2710 /* We don't need to search this sub expression any more. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2711 break;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2712 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2713 bkref_str_off += sl_str_diff;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2714 sl_str += sl_str_diff;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2715 err = get_subexp_sub (mctx, sub_top, sub_last, bkref_node,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2716 bkref_str_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2717
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2718 /* Reload buf, since the preceding call might have reallocated
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2719 the buffer. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2720 buf = (const char *) re_string_get_buffer (&mctx->input);
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 if (err == REG_NOMATCH)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2723 continue;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2724 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2725 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2726 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2727
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2728 if (sub_last_idx < sub_top->nlasts)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2729 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2730 if (sub_last_idx > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2731 ++sl_str;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2732 /* Then, search for the other last nodes of the sub expression. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2733 for (; sl_str <= bkref_str_idx; ++sl_str)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2734 {
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 Idx cls_node;
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	2736 regoff_t sl_str_off;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2737 const re_node_set *nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2738 sl_str_off = sl_str - sub_top->str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2739 /* The matched string by the sub expression match with the substring
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2740 at the back reference? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2741 if (sl_str_off > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2742 {
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2743 if (__glibc_unlikely (bkref_str_off >= mctx->input.valid_len))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2744 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2745 /* If we are at the end of the input, we cannot match. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2746 if (bkref_str_off >= mctx->input.len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2747 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2748
17301 d08258969ee9 regex: fix buffer overrun in regexp matcher Andreas Schwab <schwab@suse.de> parents: 17249 diff changeset	2749 err = extend_buffers (mctx, bkref_str_off + 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2750 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2751 return err;
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 buf = (const char *) re_string_get_buffer (&mctx->input);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2754 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2755 if (buf [bkref_str_off++] != buf[sl_str - 1])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2756 break; /* We don't need to search this sub expression
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2757 any more. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2758 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2759 if (mctx->state_log[sl_str] == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2760 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2761 /* Does this state have a ')' of the sub expression? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2762 nodes = &mctx->state_log[sl_str]->nodes;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2763 cls_node = find_subexp_node (dfa, nodes, subexp_num,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2764 OP_CLOSE_SUBEXP);
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	2765 if (cls_node == -1)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2766 continue; /* No. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2767 if (sub_top->path == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2768 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2769 sub_top->path = calloc (sizeof (state_array_t),
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2770 sl_str - sub_top->str_idx + 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2771 if (sub_top->path == NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2772 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2773 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2774 /* Can the OP_OPEN_SUBEXP node arrive the OP_CLOSE_SUBEXP node
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2775 in the current context? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2776 err = check_arrival (mctx, sub_top->path, sub_top->node,
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2777 sub_top->str_idx, cls_node, sl_str,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2778 OP_CLOSE_SUBEXP);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2779 if (err == REG_NOMATCH)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2780 continue;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2781 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2782 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2783 sub_last = match_ctx_add_sublast (sub_top, cls_node, sl_str);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2784 if (__glibc_unlikely (sub_last == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2785 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2786 err = get_subexp_sub (mctx, sub_top, sub_last, bkref_node,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2787 bkref_str_idx);
40039 929010f01e22 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39918 diff changeset	2788 buf = (const char *) re_string_get_buffer (&mctx->input);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2789 if (err == REG_NOMATCH)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2790 continue;
40039 929010f01e22 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39918 diff changeset	2791 if (__glibc_unlikely (err != REG_NOERROR))
929010f01e22 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39918 diff changeset	2792 return err;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2793 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2794 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2795 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2796 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2797
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2798 /* Helper functions for get_subexp(). */
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 /* Check SUB_LAST can arrive to the back reference BKREF_NODE at BKREF_STR.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2801 If it can arrive, register the sub expression expressed with SUB_TOP
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2802 and SUB_LAST. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2803
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2804 static reg_errcode_t
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2805 get_subexp_sub (re_match_context_t mctx, const re_sub_match_top_t sub_top,
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	2806 re_sub_match_last_t *sub_last, Idx bkref_node, Idx bkref_str)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2807 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2808 reg_errcode_t err;
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	2809 Idx to_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2810 /* Can the subexpression arrive the back reference? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2811 err = check_arrival (mctx, &sub_last->path, sub_last->node,
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2812 sub_last->str_idx, bkref_node, bkref_str,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2813 OP_OPEN_SUBEXP);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2814 if (err != REG_NOERROR)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2815 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2816 err = match_ctx_add_entry (mctx, bkref_node, bkref_str, sub_top->str_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2817 sub_last->str_idx);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2818 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2819 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2820 to_idx = bkref_str + sub_last->str_idx - sub_top->str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2821 return clean_state_log_if_needed (mctx, to_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2822 }
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 /* Find the first node which is '(' or ')' and whose index is SUBEXP_IDX.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2825 Search '(' if FL_OPEN, or search ')' otherwise.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2826 TODO: This function isn't efficient...
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2827 Because there might be more than one nodes whose types are
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2828 OP_OPEN_SUBEXP and whose index is SUBEXP_IDX, we must check all
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2829 nodes.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2830 E.g. RE: (a){2} */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2831
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	2832 static Idx
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	2833 find_subexp_node (const re_dfa_t dfa, const re_node_set nodes,
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	2834 Idx subexp_idx, int type)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2835 {
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	2836 Idx cls_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2837 for (cls_idx = 0; cls_idx < nodes->nelem; ++cls_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2838 {
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	2839 Idx cls_node = nodes->elems[cls_idx];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2840 const re_token_t *node = dfa->nodes + cls_node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2841 if (node->type == type
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2842 && node->opr.idx == subexp_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2843 return cls_node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2844 }
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	2845 return -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2846 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2847
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2848 /* Check whether the node TOP_NODE at TOP_STR can arrive to the node
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2849 LAST_NODE at LAST_STR. We record the path onto PATH since it will be
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2850 heavily reused.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2851 Return REG_NOERROR if it can arrive, or REG_NOMATCH otherwise. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2852
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2853 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	2854 __attribute_warn_unused_result__
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2855 check_arrival (re_match_context_t mctx, state_array_t path, Idx top_node,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2856 Idx top_str, Idx last_node, Idx last_str, int type)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2857 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2858 const re_dfa_t *const dfa = mctx->dfa;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2859 reg_errcode_t err = REG_NOERROR;
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	2860 Idx subexp_num, backup_cur_idx, str_idx, null_cnt;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2861 re_dfastate_t *cur_state = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2862 re_node_set *cur_nodes, next_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2863 re_dfastate_t **backup_state_log;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2864 unsigned int context;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2865
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2866 subexp_num = dfa->nodes[top_node].opr.idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2867 /* Extend the buffer if we need. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2868 if (__glibc_unlikely (path->alloc < last_str + mctx->max_mb_elem_len + 1))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2869 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2870 re_dfastate_t **new_array;
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	2871 Idx old_alloc = path->alloc;
16361 ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	2872 Idx incr_alloc = last_str + mctx->max_mb_elem_len + 1;
ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	2873 Idx new_alloc;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2874 if (__glibc_unlikely (IDX_MAX - old_alloc < incr_alloc))
16361 ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	2875 return REG_ESPACE;
ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	2876 new_alloc = old_alloc + incr_alloc;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2877 if (__glibc_unlikely (SIZE_MAX / sizeof (re_dfastate_t *) < new_alloc))
6206 ca2f5d46eeb6 Check for arithmetic overflow when calculating sizes, to prevent Paul Eggert <eggert@cs.ucla.edu> parents: 6195 diff changeset	2878 return REG_ESPACE;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2879 new_array = re_realloc (path->array, re_dfastate_t *, new_alloc);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2880 if (__glibc_unlikely (new_array == NULL))
6206 ca2f5d46eeb6 Check for arithmetic overflow when calculating sizes, to prevent Paul Eggert <eggert@cs.ucla.edu> parents: 6195 diff changeset	2881 return REG_ESPACE;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2882 path->array = new_array;
6206 ca2f5d46eeb6 Check for arithmetic overflow when calculating sizes, to prevent Paul Eggert <eggert@cs.ucla.edu> parents: 6195 diff changeset	2883 path->alloc = new_alloc;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2884 memset (new_array + old_alloc, '\0',
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2885 sizeof (re_dfastate_t ) (path->alloc - old_alloc));
5968 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
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2888 str_idx = path->next_idx ? path->next_idx : top_str;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2889
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2890 /* Temporary modify MCTX. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2891 backup_state_log = mctx->state_log;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2892 backup_cur_idx = mctx->input.cur_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2893 mctx->state_log = path->array;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2894 mctx->input.cur_idx = str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2895
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2896 /* Setup initial node set. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2897 context = re_string_context_at (&mctx->input, str_idx - 1, mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2898 if (str_idx == top_str)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2899 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2900 err = re_node_set_init_1 (&next_nodes, top_node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2901 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2902 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2903 err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2904 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2905 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2906 re_node_set_free (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2907 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2908 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2909 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2910 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2911 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2912 cur_state = mctx->state_log[str_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2913 if (cur_state && cur_state->has_backref)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2914 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2915 err = re_node_set_init_copy (&next_nodes, &cur_state->nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2916 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2917 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2918 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2919 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2920 re_node_set_init_empty (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2921 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2922 if (str_idx == top_str \|\| (cur_state && cur_state->has_backref))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2923 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2924 if (next_nodes.nelem)
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 err = expand_bkref_cache (mctx, &next_nodes, str_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2927 subexp_num, type);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2928 if (__glibc_unlikely (err != REG_NOERROR))
5968 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 re_node_set_free (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2931 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2932 }
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 cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2935 if (__glibc_unlikely (cur_state == NULL && err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2936 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2937 re_node_set_free (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2938 return err;
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 mctx->state_log[str_idx] = cur_state;
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2943 for (null_cnt = 0; str_idx < last_str && null_cnt <= mctx->max_mb_elem_len;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2944 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2945 re_node_set_empty (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2946 if (mctx->state_log[str_idx + 1])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2947 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2948 err = re_node_set_merge (&next_nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2949 &mctx->state_log[str_idx + 1]->nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2950 if (__glibc_unlikely (err != REG_NOERROR))
5968 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 re_node_set_free (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2953 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2954 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2955 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2956 if (cur_state)
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 err = check_arrival_add_next_nodes (mctx, str_idx,
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2959 &cur_state->non_eps_nodes,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	2960 &next_nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2961 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2962 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2963 re_node_set_free (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2964 return err;
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 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2967 ++str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2968 if (next_nodes.nelem)
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 err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2971 if (__glibc_unlikely (err != REG_NOERROR))
5968 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 re_node_set_free (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2974 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2975 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2976 err = expand_bkref_cache (mctx, &next_nodes, str_idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2977 subexp_num, type);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2978 if (__glibc_unlikely (err != REG_NOERROR))
5968 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 re_node_set_free (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2981 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2982 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2983 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2984 context = re_string_context_at (&mctx->input, str_idx - 1, mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2985 cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	2986 if (__glibc_unlikely (cur_state == NULL && err != REG_NOERROR))
5968 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 re_node_set_free (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2989 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2990 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2991 mctx->state_log[str_idx] = cur_state;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2992 null_cnt = cur_state == NULL ? null_cnt + 1 : 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2993 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2994 re_node_set_free (&next_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2995 cur_nodes = (mctx->state_log[last_str] == NULL ? NULL
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2996 : &mctx->state_log[last_str]->nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2997 path->next_idx = str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2998
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	2999 /* Fix MCTX. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3000 mctx->state_log = backup_state_log;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3001 mctx->input.cur_idx = backup_cur_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3002
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3003 /* Then check the current node set has the node LAST_NODE. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3004 if (cur_nodes != NULL && re_node_set_contains (cur_nodes, last_node))
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 return REG_NOMATCH;
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3010 /* Helper functions for check_arrival. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3011
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3012 /* Calculate the destination nodes of CUR_NODES at STR_IDX, and append them
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3013 to NEXT_NODES.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3014 TODO: This function is similar to the functions transit_state*(),
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3015 however this function has many additional works.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3016 Can't we unify them? */
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 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	3019 __attribute_warn_unused_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	3020 check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3021 re_node_set cur_nodes, re_node_set next_nodes)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3022 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3023 const re_dfa_t *const dfa = mctx->dfa;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3024 bool ok;
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	3025 Idx cur_idx;
10955 5c229a7fba2a Avoid gcc warnings on cygwin. Eric Blake <ebb9@byu.net> parents: 10079 diff changeset	3026 #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	3027 reg_errcode_t err = REG_NOERROR;
10955 5c229a7fba2a Avoid gcc warnings on cygwin. Eric Blake <ebb9@byu.net> parents: 10079 diff changeset	3028 #endif
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3029 re_node_set union_set;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3030 re_node_set_init_empty (&union_set);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3031 for (cur_idx = 0; cur_idx < cur_nodes->nelem; ++cur_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3032 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3033 int naccepted = 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	3034 Idx cur_node = cur_nodes->elems[cur_idx];
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3035 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3036 re_token_type_t type = dfa->nodes[cur_node].type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3037 assert (!IS_EPSILON_NODE (type));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3038 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3039 #ifdef RE_ENABLE_I18N
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3040 /* If the node may accept "multi byte". */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3041 if (dfa->nodes[cur_node].accept_mb)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3042 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3043 naccepted = check_node_accept_bytes (dfa, cur_node, &mctx->input,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3044 str_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3045 if (naccepted > 1)
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 re_dfastate_t *dest_state;
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	3048 Idx next_node = dfa->nexts[cur_node];
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	3049 Idx next_idx = str_idx + naccepted;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3050 dest_state = mctx->state_log[next_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3051 re_node_set_empty (&union_set);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3052 if (dest_state)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3053 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3054 err = re_node_set_merge (&union_set, &dest_state->nodes);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3055 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3056 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3057 re_node_set_free (&union_set);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3058 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3059 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3060 }
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3061 ok = re_node_set_insert (&union_set, next_node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3062 if (__glibc_unlikely (! ok))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3063 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3064 re_node_set_free (&union_set);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3065 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3066 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3067 mctx->state_log[next_idx] = re_acquire_state (&err, dfa,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3068 &union_set);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3069 if (__glibc_unlikely (mctx->state_log[next_idx] == NULL
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3070 && err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3071 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3072 re_node_set_free (&union_set);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3073 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3074 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3075 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3076 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3077 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3078 if (naccepted
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3079 \|\| check_node_accept (mctx, dfa->nodes + cur_node, str_idx))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3080 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3081 ok = re_node_set_insert (next_nodes, dfa->nexts[cur_node]);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3082 if (__glibc_unlikely (! ok))
5968 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 re_node_set_free (&union_set);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3085 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3086 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3087 }
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 re_node_set_free (&union_set);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3090 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3091 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3092
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3093 /* For all the nodes in CUR_NODES, add the epsilon closures of them to
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3094 CUR_NODES, however exclude the nodes which are:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3095 - inside the sub expression whose number is EX_SUBEXP, if FL_OPEN.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3096 - out of the sub expression whose number is EX_SUBEXP, if !FL_OPEN.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3097 */
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 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	3100 check_arrival_expand_ecl (const re_dfa_t dfa, re_node_set cur_nodes,
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	3101 Idx ex_subexp, int type)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3102 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3103 reg_errcode_t err;
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	3104 Idx idx, outside_node;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3105 re_node_set new_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3106 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3107 assert (cur_nodes->nelem);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3108 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3109 err = re_node_set_alloc (&new_nodes, cur_nodes->nelem);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3110 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3111 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3112 /* Create a new node set NEW_NODES with the nodes which are epsilon
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3113 closures of the node in CUR_NODES. */
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 for (idx = 0; idx < cur_nodes->nelem; ++idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3116 {
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	3117 Idx cur_node = cur_nodes->elems[idx];
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3118 const re_node_set *eclosure = dfa->eclosures + cur_node;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3119 outside_node = find_subexp_node (dfa, eclosure, ex_subexp, type);
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	3120 if (outside_node == -1)
5968 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 /* There are no problematic nodes, just merge them. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3123 err = re_node_set_merge (&new_nodes, eclosure);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3124 if (__glibc_unlikely (err != REG_NOERROR))
5968 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 re_node_set_free (&new_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3127 return err;
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 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3130 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3131 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3132 /* There are problematic nodes, re-calculate incrementally. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3133 err = check_arrival_expand_ecl_sub (dfa, &new_nodes, cur_node,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3134 ex_subexp, type);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3135 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3136 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3137 re_node_set_free (&new_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3138 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3139 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3140 }
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 re_node_set_free (cur_nodes);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3143 *cur_nodes = new_nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3144 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3145 }
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 /* Helper function for check_arrival_expand_ecl.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3148 Check incrementally the epsilon closure of TARGET, and if it isn't
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3149 problematic append it to DST_NODES. */
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 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	3152 __attribute_warn_unused_result__
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3153 check_arrival_expand_ecl_sub (const re_dfa_t dfa, re_node_set dst_nodes,
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	3154 Idx target, Idx ex_subexp, int type)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3155 {
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	3156 Idx cur_node;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3157 for (cur_node = target; !re_node_set_contains (dst_nodes, cur_node);)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3158 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3159 bool ok;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3160
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3161 if (dfa->nodes[cur_node].type == type
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3162 && dfa->nodes[cur_node].opr.idx == ex_subexp)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3163 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3164 if (type == OP_CLOSE_SUBEXP)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3165 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3166 ok = re_node_set_insert (dst_nodes, cur_node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3167 if (__glibc_unlikely (! ok))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3168 return REG_ESPACE;
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 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3171 }
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3172 ok = re_node_set_insert (dst_nodes, cur_node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3173 if (__glibc_unlikely (! ok))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3174 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3175 if (dfa->edests[cur_node].nelem == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3176 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3177 if (dfa->edests[cur_node].nelem == 2)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3178 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3179 reg_errcode_t err;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3180 err = check_arrival_expand_ecl_sub (dfa, dst_nodes,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3181 dfa->edests[cur_node].elems[1],
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3182 ex_subexp, type);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3183 if (__glibc_unlikely (err != REG_NOERROR))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3184 return err;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3185 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3186 cur_node = dfa->edests[cur_node].elems[0];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3187 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3188 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3189 }
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3192 /* For all the back references in the current state, calculate the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3193 destination of the back references by the appropriate entry
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3194 in MCTX->BKREF_ENTS. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3195
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3196 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	3197 __attribute_warn_unused_result__
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	3198 expand_bkref_cache (re_match_context_t mctx, re_node_set cur_nodes,
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	3199 Idx cur_str, Idx subexp_num, int type)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3200 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3201 const re_dfa_t *const dfa = mctx->dfa;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3202 reg_errcode_t err;
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	3203 Idx cache_idx_start = search_cur_bkref_entry (mctx, cur_str);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3204 struct re_backref_cache_entry *ent;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3205
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	3206 if (cache_idx_start == -1)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3207 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3208
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3209 restart:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3210 ent = mctx->bkref_ents + cache_idx_start;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3211 do
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3212 {
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	3213 Idx to_idx, next_node;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3214
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3215 /* Is this entry ENT is appropriate? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3216 if (!re_node_set_contains (cur_nodes, ent->node))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3217 continue; /* No. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3218
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3219 to_idx = cur_str + ent->subexp_to - ent->subexp_from;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3220 /* Calculate the destination of the back reference, and append it
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3221 to MCTX->STATE_LOG. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3222 if (to_idx == cur_str)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3223 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3224 /* The backreference did epsilon transit, we must re-check all the
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3225 node in the current state. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3226 re_node_set new_dests;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3227 reg_errcode_t err2, err3;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3228 next_node = dfa->edests[ent->node].elems[0];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3229 if (re_node_set_contains (cur_nodes, next_node))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3230 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3231 err = re_node_set_init_1 (&new_dests, next_node);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3232 err2 = check_arrival_expand_ecl (dfa, &new_dests, subexp_num, type);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3233 err3 = re_node_set_merge (cur_nodes, &new_dests);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3234 re_node_set_free (&new_dests);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3235 if (__glibc_unlikely (err != REG_NOERROR \|\| err2 != REG_NOERROR
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3236 \|\| err3 != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3237 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3238 err = (err != REG_NOERROR ? err
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3239 : (err2 != REG_NOERROR ? err2 : err3));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3240 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3241 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3242 /* TODO: It is still inefficient... */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3243 goto restart;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3244 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3245 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3246 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3247 re_node_set union_set;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3248 next_node = dfa->nexts[ent->node];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3249 if (mctx->state_log[to_idx])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3250 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3251 bool ok;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3252 if (re_node_set_contains (&mctx->state_log[to_idx]->nodes,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3253 next_node))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3254 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3255 err = re_node_set_init_copy (&union_set,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3256 &mctx->state_log[to_idx]->nodes);
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3257 ok = re_node_set_insert (&union_set, next_node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3258 if (__glibc_unlikely (err != REG_NOERROR \|\| ! ok))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3259 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3260 re_node_set_free (&union_set);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3261 err = err != REG_NOERROR ? err : REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3262 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3263 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3264 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3265 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3266 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3267 err = re_node_set_init_1 (&union_set, next_node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3268 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3269 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3270 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3271 mctx->state_log[to_idx] = re_acquire_state (&err, dfa, &union_set);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3272 re_node_set_free (&union_set);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3273 if (__glibc_unlikely (mctx->state_log[to_idx] == NULL
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3274 && err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3275 return err;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3276 }
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 while (ent++->more);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3279 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3280 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3281
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3282 /* Build transition table for the state.
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3283 Return true if successful. */
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3284
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3285 static bool
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3286 build_trtable (const re_dfa_t dfa, re_dfastate_t state)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3287 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3288 reg_errcode_t err;
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	3289 Idx i, j;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3290 int ch;
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3291 bool need_word_trtable = false;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3292 bitset_word_t elem, mask;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3293 bool dests_node_malloced = false;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3294 bool dest_states_malloced = false;
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3295 Idx ndests; /* Number of the destination states from 'state'. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3296 re_dfastate_t **trtable;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3297 re_dfastate_t dest_states = NULL, dest_states_word, **dest_states_nl;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3298 re_node_set follows, *dests_node;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3299 bitset_t *dests_ch;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3300 bitset_t acceptable;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3301
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3302 struct dests_alloc
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3303 {
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3304 re_node_set dests_node[SBC_MAX];
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3305 bitset_t dests_ch[SBC_MAX];
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3306 } *dests_alloc;
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3307
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3308 /* We build DFA states which corresponds to the destination nodes
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3309 from 'state'. 'dests_node[i]' represents the nodes which i-th
18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3310 destination state contains, and 'dests_ch[i]' represents the
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3311 characters which i-th destination state accepts. */
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3312 if (__libc_use_alloca (sizeof (struct dests_alloc)))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3313 dests_alloc = (struct dests_alloc *) alloca (sizeof (struct dests_alloc));
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3314 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3315 {
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3316 dests_alloc = re_malloc (struct dests_alloc, 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3317 if (__glibc_unlikely (dests_alloc == NULL))
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3318 return false;
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3319 dests_node_malloced = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3320 }
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3321 dests_node = dests_alloc->dests_node;
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3322 dests_ch = dests_alloc->dests_ch;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3323
16358 a712776b11ce maint: spelling fixes Paul Eggert <eggert@cs.ucla.edu> parents: 16235 diff changeset	3324 /* Initialize transition table. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3325 state->word_trtable = state->trtable = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3326
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3327 /* At first, group all nodes belonging to 'state' into several
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3328 destinations. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3329 ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3330 if (__glibc_unlikely (ndests <= 0))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3331 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3332 if (dests_node_malloced)
19476 1f3bb9a8c477 regex: use re_malloc etc. consistently Paul Eggert <eggert@cs.ucla.edu> parents: 19445 diff changeset	3333 re_free (dests_alloc);
16361 ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	3334 /* Return false in case of an error, true otherwise. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3335 if (ndests == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3336 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3337 state->trtable = (re_dfastate_t **)
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3338 calloc (sizeof (re_dfastate_t *), SBC_MAX);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3339 if (__glibc_unlikely (state->trtable == NULL))
14051 f296f8cfe0c6 regex: don't infloop on persistent failing calloc Jim Meyering <meyering@redhat.com> parents: 12833 diff changeset	3340 return false;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3341 return true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3342 }
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3343 return false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3344 }
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 err = re_node_set_alloc (&follows, ndests + 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3347 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3348 goto out_free;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3349
6206 ca2f5d46eeb6 Check for arithmetic overflow when calculating sizes, to prevent Paul Eggert <eggert@cs.ucla.edu> parents: 6195 diff changeset	3350 /* Avoid arithmetic overflow in size calculation. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3351 size_t ndests_max
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3352 = ((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX)
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3353 / (3 * sizeof (re_dfastate_t *)));
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3354 if (__glibc_unlikely (ndests_max < ndests))
6206 ca2f5d46eeb6 Check for arithmetic overflow when calculating sizes, to prevent Paul Eggert <eggert@cs.ucla.edu> parents: 6195 diff changeset	3355 goto out_free;
ca2f5d46eeb6 Check for arithmetic overflow when calculating sizes, to prevent Paul Eggert <eggert@cs.ucla.edu> parents: 6195 diff changeset	3356
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3357 if (__libc_use_alloca ((sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3358 + ndests * 3 * sizeof (re_dfastate_t *)))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3359 dest_states = (re_dfastate_t **)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3360 alloca (ndests * 3 * sizeof (re_dfastate_t *));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3361 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3362 {
19476 1f3bb9a8c477 regex: use re_malloc etc. consistently Paul Eggert <eggert@cs.ucla.edu> parents: 19445 diff changeset	3363 dest_states = re_malloc (re_dfastate_t , ndests 3);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3364 if (__glibc_unlikely (dest_states == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3365 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3366 out_free:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3367 if (dest_states_malloced)
19476 1f3bb9a8c477 regex: use re_malloc etc. consistently Paul Eggert <eggert@cs.ucla.edu> parents: 19445 diff changeset	3368 re_free (dest_states);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3369 re_node_set_free (&follows);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3370 for (i = 0; i < ndests; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3371 re_node_set_free (dests_node + i);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3372 if (dests_node_malloced)
19476 1f3bb9a8c477 regex: use re_malloc etc. consistently Paul Eggert <eggert@cs.ucla.edu> parents: 19445 diff changeset	3373 re_free (dests_alloc);
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3374 return false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3375 }
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3376 dest_states_malloced = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3377 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3378 dest_states_word = dest_states + ndests;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3379 dest_states_nl = dest_states_word + ndests;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3380 bitset_empty (acceptable);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3381
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3382 /* Then build the states for all destinations. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3383 for (i = 0; i < ndests; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3384 {
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	3385 Idx next_node;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3386 re_node_set_empty (&follows);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3387 /* Merge the follows of this destination states. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3388 for (j = 0; j < dests_node[i].nelem; ++j)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3389 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3390 next_node = dfa->nexts[dests_node[i].elems[j]];
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	3391 if (next_node != -1)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3392 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3393 err = re_node_set_merge (&follows, dfa->eclosures + next_node);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3394 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3395 goto out_free;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3396 }
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 dest_states[i] = re_acquire_state_context (&err, dfa, &follows, 0);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3399 if (__glibc_unlikely (dest_states[i] == NULL && err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3400 goto out_free;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3401 /* If the new state has context constraint,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3402 build appropriate states for these contexts. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3403 if (dest_states[i]->has_constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3404 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3405 dest_states_word[i] = re_acquire_state_context (&err, dfa, &follows,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3406 CONTEXT_WORD);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3407 if (__glibc_unlikely (dest_states_word[i] == NULL
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3408 && err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3409 goto out_free;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3410
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3411 if (dest_states[i] != dest_states_word[i] && dfa->mb_cur_max > 1)
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3412 need_word_trtable = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3413
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3414 dest_states_nl[i] = re_acquire_state_context (&err, dfa, &follows,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3415 CONTEXT_NEWLINE);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3416 if (__glibc_unlikely (dest_states_nl[i] == NULL && err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3417 goto out_free;
10079 6b412972dce7 Fix violation of <stdbool.h> replacement in regex. Eric Blake <ebb9@byu.net> parents: 8540 diff changeset	3418 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3419 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3420 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3421 dest_states_word[i] = dest_states[i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3422 dest_states_nl[i] = dest_states[i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3423 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3424 bitset_merge (acceptable, dests_ch[i]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3425 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3426
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3427 if (!__glibc_unlikely (need_word_trtable))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3428 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3429 /* We don't care about whether the following character is a word
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3430 character, or we are in a single-byte character set so we can
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3431 discern by looking at the character code: allocate a
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3432 256-entry transition table. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3433 trtable = state->trtable =
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3434 (re_dfastate_t *) calloc (sizeof (re_dfastate_t ), SBC_MAX);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3435 if (__glibc_unlikely (trtable == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3436 goto out_free;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3437
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3438 /* For all characters ch...: */
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3439 for (i = 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	3440 for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3441 elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3442 mask <<= 1, elem >>= 1, ++ch)
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3443 if (__glibc_unlikely (elem & 1))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3444 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3445 /* There must be exactly one destination which accepts
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3446 character ch. See group_nodes_into_DFAstates. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3447 for (j = 0; (dests_ch[j][i] & mask) == 0; ++j)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3448 ;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3449
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3450 /* j-th destination accepts the word character ch. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3451 if (dfa->word_char[i] & mask)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3452 trtable[ch] = dest_states_word[j];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3453 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3454 trtable[ch] = dest_states[j];
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 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3458 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3459 /* We care about whether the following character is a word
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3460 character, and we are in a multi-byte character set: discern
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3461 by looking at the character code: build two 256-entry
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3462 transition tables, one starting at trtable[0] and one
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3463 starting at trtable[SBC_MAX]. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3464 trtable = state->word_trtable =
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3465 (re_dfastate_t *) calloc (sizeof (re_dfastate_t ), 2 * SBC_MAX);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3466 if (__glibc_unlikely (trtable == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3467 goto out_free;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3468
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3469 /* For all characters ch...: */
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3470 for (i = 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	3471 for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3472 elem;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3473 mask <<= 1, elem >>= 1, ++ch)
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3474 if (__glibc_unlikely (elem & 1))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3475 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3476 /* There must be exactly one destination which accepts
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3477 character ch. See group_nodes_into_DFAstates. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3478 for (j = 0; (dests_ch[j][i] & mask) == 0; ++j)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3479 ;
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 /* j-th destination accepts the word character ch. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3482 trtable[ch] = dest_states[j];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3483 trtable[ch + SBC_MAX] = dest_states_word[j];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3484 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3485 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3486
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3487 /* new line */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3488 if (bitset_contain (acceptable, NEWLINE_CHAR))
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 /* The current state accepts newline character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3491 for (j = 0; j < ndests; ++j)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3492 if (bitset_contain (dests_ch[j], NEWLINE_CHAR))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3493 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3494 /* k-th destination accepts newline character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3495 trtable[NEWLINE_CHAR] = dest_states_nl[j];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3496 if (need_word_trtable)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3497 trtable[NEWLINE_CHAR + SBC_MAX] = dest_states_nl[j];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3498 /* There must be only one destination which accepts
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3499 newline. See group_nodes_into_DFAstates. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3500 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3501 }
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3504 if (dest_states_malloced)
19476 1f3bb9a8c477 regex: use re_malloc etc. consistently Paul Eggert <eggert@cs.ucla.edu> parents: 19445 diff changeset	3505 re_free (dest_states);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3506
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3507 re_node_set_free (&follows);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3508 for (i = 0; i < ndests; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3509 re_node_set_free (dests_node + i);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3510
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3511 if (dests_node_malloced)
19476 1f3bb9a8c477 regex: use re_malloc etc. consistently Paul Eggert <eggert@cs.ucla.edu> parents: 19445 diff changeset	3512 re_free (dests_alloc);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3513
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3514 return true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3515 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3516
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3517 /* Group all nodes belonging to STATE into several destinations.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3518 Then for all destinations, set the nodes belonging to the destination
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3519 to DESTS_NODE[i] and set the characters accepted by the destination
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3520 to DEST_CH[i]. This function return the number of destinations. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3521
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	3522 static Idx
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	3523 group_nodes_into_DFAstates (const re_dfa_t dfa, const re_dfastate_t state,
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3524 re_node_set dests_node, bitset_t dests_ch)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3525 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3526 reg_errcode_t err;
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3527 bool ok;
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	3528 Idx i, j, k;
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3529 Idx ndests; /* Number of the destinations from 'state'. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3530 bitset_t accepts; /* Characters a node can accept. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3531 const re_node_set *cur_nodes = &state->nodes;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3532 bitset_empty (accepts);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3533 ndests = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3534
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3535 /* For all the nodes belonging to 'state', */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3536 for (i = 0; i < cur_nodes->nelem; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3537 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3538 re_token_t *node = &dfa->nodes[cur_nodes->elems[i]];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3539 re_token_type_t type = node->type;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3540 unsigned int constraint = node->constraint;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3541
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3542 /* Enumerate all single byte character this node can accept. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3543 if (type == CHARACTER)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3544 bitset_set (accepts, node->opr.c);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3545 else if (type == SIMPLE_BRACKET)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3546 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3547 bitset_merge (accepts, node->opr.sbcset);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3548 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3549 else if (type == OP_PERIOD)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3550 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3551 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3552 if (dfa->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3553 bitset_merge (accepts, dfa->sb_char);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3554 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3555 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3556 bitset_set_all (accepts);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3557 if (!(dfa->syntax & RE_DOT_NEWLINE))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3558 bitset_clear (accepts, '\n');
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3559 if (dfa->syntax & RE_DOT_NOT_NULL)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3560 bitset_clear (accepts, '\0');
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3561 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3562 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3563 else if (type == OP_UTF8_PERIOD)
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	3564 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3565 if (ASCII_CHARS % BITSET_WORD_BITS == 0)
6816 336c26d193b7 * regexec.c (group_nodes_into_DFAstates): Fix a buffer overrun Paul Eggert <eggert@cs.ucla.edu> parents: 6726 diff changeset	3566 memset (accepts, -1, ASCII_CHARS / CHAR_BIT);
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3567 else
afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3568 bitset_merge (accepts, utf8_sb_map);
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3569 if (!(dfa->syntax & RE_DOT_NEWLINE))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3570 bitset_clear (accepts, '\n');
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3571 if (dfa->syntax & RE_DOT_NOT_NULL)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3572 bitset_clear (accepts, '\0');
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	3573 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3574 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3575 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3576 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3577
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3578 /* Check the 'accepts' and sift the characters which are not
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3579 match it the context. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3580 if (constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3581 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3582 if (constraint & NEXT_NEWLINE_CONSTRAINT)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3583 {
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3584 bool accepts_newline = bitset_contain (accepts, NEWLINE_CHAR);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3585 bitset_empty (accepts);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3586 if (accepts_newline)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3587 bitset_set (accepts, NEWLINE_CHAR);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3588 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3589 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3590 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3591 if (constraint & NEXT_ENDBUF_CONSTRAINT)
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 bitset_empty (accepts);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3594 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3595 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3596
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3597 if (constraint & NEXT_WORD_CONSTRAINT)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3598 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3599 bitset_word_t any_set = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3600 if (type == CHARACTER && !node->word_char)
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 bitset_empty (accepts);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3603 continue;
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 if (dfa->mb_cur_max > 1)
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3607 for (j = 0; j < BITSET_WORDS; ++j)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3608 any_set \|= (accepts[j] &= (dfa->word_char[j] \| ~dfa->sb_char[j]));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3609 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3610 #endif
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3611 for (j = 0; j < BITSET_WORDS; ++j)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3612 any_set \|= (accepts[j] &= dfa->word_char[j]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3613 if (!any_set)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3614 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3615 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3616 if (constraint & NEXT_NOTWORD_CONSTRAINT)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3617 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3618 bitset_word_t any_set = 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3619 if (type == CHARACTER && node->word_char)
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 bitset_empty (accepts);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3622 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3623 }
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 if (dfa->mb_cur_max > 1)
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3626 for (j = 0; j < BITSET_WORDS; ++j)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3627 any_set \|= (accepts[j] &= ~(dfa->word_char[j] & dfa->sb_char[j]));
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3628 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3629 #endif
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3630 for (j = 0; j < BITSET_WORDS; ++j)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3631 any_set \|= (accepts[j] &= ~dfa->word_char[j]);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3632 if (!any_set)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3633 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3634 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3635 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3636
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3637 /* Then divide 'accepts' into DFA states, or create a new
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3638 state. Above, we make sure that accepts is not empty. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3639 for (j = 0; j < ndests; ++j)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3640 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3641 bitset_t intersec; /* Intersection sets, see below. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3642 bitset_t remains;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3643 /* Flags, see below. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3644 bitset_word_t has_intersec, not_subset, not_consumed;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3645
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3646 /* Optimization, skip if this state doesn't accept the character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3647 if (type == CHARACTER && !bitset_contain (dests_ch[j], node->opr.c))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3648 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3649
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3650 /* Enumerate the intersection set of this state and 'accepts'. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3651 has_intersec = 0;
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3652 for (k = 0; k < BITSET_WORDS; ++k)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3653 has_intersec \|= intersec[k] = accepts[k] & dests_ch[j][k];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3654 /* And skip if the intersection set is empty. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3655 if (!has_intersec)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3656 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3657
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3658 /* Then check if this state is a subset of 'accepts'. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3659 not_subset = not_consumed = 0;
6214 afb93b90dcb8 Change bitset word type from unsigned int to unsigned long int, Paul Eggert <eggert@cs.ucla.edu> parents: 6206 diff changeset	3660 for (k = 0; k < BITSET_WORDS; ++k)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3661 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3662 not_subset \|= remains[k] = ~accepts[k] & dests_ch[j][k];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3663 not_consumed \|= accepts[k] = accepts[k] & ~dests_ch[j][k];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3664 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3665
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3666 /* If this state isn't a subset of 'accepts', create a
18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3667 new group state, which has the 'remains'. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3668 if (not_subset)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3669 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3670 bitset_copy (dests_ch[ndests], remains);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3671 bitset_copy (dests_ch[j], intersec);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3672 err = re_node_set_init_copy (dests_node + ndests, &dests_node[j]);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3673 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3674 goto error_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3675 ++ndests;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3676 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3677
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3678 /* Put the position in the current group. */
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3679 ok = re_node_set_insert (&dests_node[j], cur_nodes->elems[i]);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3680 if (__glibc_unlikely (! ok))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3681 goto error_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3682
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3683 /* If all characters are consumed, go to next node. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3684 if (!not_consumed)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3685 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3686 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3687 /* Some characters remain, create a new group. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3688 if (j == ndests)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3689 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3690 bitset_copy (dests_ch[ndests], accepts);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3691 err = re_node_set_init_1 (dests_node + ndests, cur_nodes->elems[i]);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3692 if (__glibc_unlikely (err != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3693 goto error_return;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3694 ++ndests;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3695 bitset_empty (accepts);
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 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3698 return ndests;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3699 error_return:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3700 for (j = 0; j < ndests; ++j)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3701 re_node_set_free (dests_node + j);
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	3702 return -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3703 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3704
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3705 #ifdef RE_ENABLE_I18N
16235 18a38c9615f0 In commentary, do not use ` to quote. Paul Eggert <eggert@cs.ucla.edu> parents: 16201 diff changeset	3706 /* Check how many bytes the node 'dfa->nodes[node_idx]' accepts.
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3707 Return the number of the bytes the node accepts.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3708 STR_IDX is the current index of the input string.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3709
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3710 This function handles the nodes which can accept one character, or
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3711 one collating element like '.', '[a-z]', opposite to the other nodes
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3712 can only accept one byte. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3713
18093 00853c226336 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 17848 diff changeset	3714 # ifdef _LIBC
00853c226336 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 17848 diff changeset	3715 # include <locale/weight.h>
00853c226336 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 17848 diff changeset	3716 # endif
00853c226336 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 17848 diff changeset	3717
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3718 static int
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3719 check_node_accept_bytes (const re_dfa_t *dfa, Idx 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	3720 const re_string_t *input, Idx str_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3721 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3722 const re_token_t *node = dfa->nodes + node_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3723 int char_len, elem_len;
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	3724 Idx i;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3725
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3726 if (__glibc_unlikely (node->type == OP_UTF8_PERIOD))
5968 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 unsigned char c = re_string_byte_at (input, str_idx), d;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	3729 if (__glibc_likely (c < 0xc2))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3730 return 0;
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 if (str_idx + 2 > input->len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3733 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3734
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3735 d = re_string_byte_at (input, str_idx + 1);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3736 if (c < 0xe0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3737 return (d < 0x80 \|\| d > 0xbf) ? 0 : 2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3738 else if (c < 0xf0)
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 char_len = 3;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3741 if (c == 0xe0 && d < 0xa0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3742 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3743 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3744 else if (c < 0xf8)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3745 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3746 char_len = 4;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3747 if (c == 0xf0 && d < 0x90)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3748 return 0;
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 else if (c < 0xfc)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3751 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3752 char_len = 5;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3753 if (c == 0xf8 && d < 0x88)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3754 return 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 else if (c < 0xfe)
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 char_len = 6;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3759 if (c == 0xfc && d < 0x84)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3760 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3761 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3762 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3763 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3764
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3765 if (str_idx + char_len > input->len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3766 return 0;
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 for (i = 1; i < char_len; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3769 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3770 d = re_string_byte_at (input, str_idx + i);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3771 if (d < 0x80 \|\| d > 0xbf)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3772 return 0;
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 return char_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3775 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3776
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3777 char_len = re_string_char_size_at (input, str_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3778 if (node->type == OP_PERIOD)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3779 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3780 if (char_len <= 1)
12833 f6972e309c30 regex: sync more white-space changes from libc Jim Meyering <meyering@redhat.com> parents: 12832 diff changeset	3781 return 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3782 /* FIXME: I don't think this if is needed, as both '\n'
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3783 and '\0' are char_len == 1. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3784 /* '.' accepts any one character except the following two cases. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3785 if ((!(dfa->syntax & RE_DOT_NEWLINE) &&
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3786 re_string_byte_at (input, str_idx) == '\n') \|\|
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	3787 ((dfa->syntax & RE_DOT_NOT_NULL) &&
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3788 re_string_byte_at (input, str_idx) == '\0'))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3789 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3790 return char_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3791 }
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 elem_len = re_string_elem_size_at (input, str_idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3794 if ((elem_len <= 1 && char_len <= 1) \|\| char_len == 0)
17241 f21c2ecfb7d1 regex: revert single-byte change Paul Eggert <eggert@cs.ucla.edu> parents: 17238 diff changeset	3795 return 0;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3796
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3797 if (node->type == COMPLEX_BRACKET)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3798 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3799 const re_charset_t *cset = node->opr.mbcset;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3800 # ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3801 const unsigned char *pin
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3802 = ((const unsigned char *) re_string_get_buffer (input) + str_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	3803 Idx j;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3804 uint32_t nrules;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3805 # endif /* _LIBC */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3806 int match_len = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3807 wchar_t wc = ((cset->nranges \|\| cset->nchar_classes \|\| cset->nmbchars)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3808 ? re_string_wchar_at (input, str_idx) : 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3809
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3810 /* match with multibyte character? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3811 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	3812 if (wc == cset->mbchars[i])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3813 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3814 match_len = char_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3815 goto check_node_accept_bytes_match;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3816 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3817 /* match with character_class? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3818 for (i = 0; i < cset->nchar_classes; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3819 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3820 wctype_t wt = cset->char_classes[i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3821 if (__iswctype (wc, wt))
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3822 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3823 match_len = char_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3824 goto check_node_accept_bytes_match;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3825 }
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
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3828 # ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3829 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	3830 if (nrules != 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3831 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3832 unsigned int in_collseq = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3833 const int32_t table, indirect;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3834 const unsigned char weights, extra;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3835 const char *collseqwc;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3836
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3837 /* match with collating_symbol? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3838 if (cset->ncoll_syms)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3839 extra = (const unsigned char *)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3840 _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3841 for (i = 0; i < cset->ncoll_syms; ++i)
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 unsigned char *coll_sym = extra + cset->coll_syms[i];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3844 /* Compare the length of input collating element and
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3845 the length of current collating element. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3846 if (*coll_sym != elem_len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3847 continue;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3848 /* Compare each bytes. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3849 for (j = 0; j < *coll_sym; j++)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3850 if (pin[j] != coll_sym[1 + j])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3851 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3852 if (j == *coll_sym)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3853 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3854 /* Match if every bytes is equal. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3855 match_len = j;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3856 goto check_node_accept_bytes_match;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3857 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3858 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3859
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3860 if (cset->nranges)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3861 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3862 if (elem_len <= char_len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3863 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3864 collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3865 in_collseq = __collseq_table_lookup (collseqwc, wc);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3866 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3867 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3868 in_collseq = find_collation_sequence_value (pin, elem_len);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3869 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3870 /* match with range expression? */
17237 899138bc3a58 regex: implement rational ranges Paul Eggert <eggert@cs.ucla.edu> parents: 17233 diff changeset	3871 /* FIXME: Implement rational ranges here, too. */
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3872 for (i = 0; i < cset->nranges; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3873 if (cset->range_starts[i] <= in_collseq
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3874 && in_collseq <= cset->range_ends[i])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3875 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3876 match_len = elem_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3877 goto check_node_accept_bytes_match;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3878 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3879
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3880 /* match with equivalence_class? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3881 if (cset->nequiv_classes)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3882 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3883 const unsigned char *cp = pin;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3884 table = (const int32_t *)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3885 _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	3886 weights = (const unsigned char *)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3887 _NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3888 extra = (const unsigned char *)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3889 _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3890 indirect = (const int32_t *)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3891 _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
18093 00853c226336 regex: merge patches from libc Paul Eggert <eggert@cs.ucla.edu> parents: 17848 diff changeset	3892 int32_t idx = findidx (table, indirect, extra, &cp, elem_len);
39745 7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3893 int32_t rule = idx >> 24;
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3894 idx &= 0xffffff;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3895 if (idx > 0)
39745 7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3896 {
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3897 size_t weight_len = weights[idx];
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3898 for (i = 0; i < cset->nequiv_classes; ++i)
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3899 {
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3900 int32_t equiv_class_idx = cset->equiv_classes[i];
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3901 int32_t equiv_class_rule = equiv_class_idx >> 24;
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3902 equiv_class_idx &= 0xffffff;
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3903 if (weights[equiv_class_idx] == weight_len
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3904 && equiv_class_rule == rule
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3905 && memcmp (weights + idx + 1,
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3906 weights + equiv_class_idx + 1,
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3907 weight_len) == 0)
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3908 {
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3909 match_len = elem_len;
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3910 goto check_node_accept_bytes_match;
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3911 }
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3912 }
7c90c41f3f28 autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 19484 diff changeset	3913 }
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3914 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3915 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3916 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3917 # endif /* _LIBC */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3918 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3919 /* match with range expression? */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3920 for (i = 0; i < cset->nranges; ++i)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3921 {
17237 899138bc3a58 regex: implement rational ranges Paul Eggert <eggert@cs.ucla.edu> parents: 17233 diff changeset	3922 if (cset->range_starts[i] <= wc && wc <= cset->range_ends[i])
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3923 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3924 match_len = char_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3925 goto check_node_accept_bytes_match;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3926 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3927 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3928 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3929 check_node_accept_bytes_match:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3930 if (!cset->non_match)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3931 return match_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3932 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3933 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3934 if (match_len > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3935 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3936 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3937 return (elem_len > char_len) ? elem_len : char_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3938 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3939 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3940 return 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3941 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3942
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3943 # ifdef _LIBC
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3944 static unsigned int
6174 6039b763ad3c * lib/regcomp.c (re_comp) [defined _REGEX_RE_COMP \|\| defined _LIBC]: Paul Eggert <eggert@cs.ucla.edu> parents: 6173 diff changeset	3945 find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3946 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3947 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	3948 if (nrules == 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3949 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3950 if (mbs_len == 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3951 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3952 /* No valid character. Match it as a single byte character. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3953 const unsigned char collseq = (const unsigned char )
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3954 _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	3955 return collseq[mbs[0]];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3956 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3957 return UINT_MAX;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3958 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3959 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3960 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3961 int32_t idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3962 const unsigned char extra = (const unsigned char )
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3963 _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3964 int32_t extrasize = (const unsigned char *)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3965 _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB + 1) - extra;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3966
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3967 for (idx = 0; idx < extrasize;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3968 {
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3969 int mbs_cnt;
25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3970 bool found = false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3971 int32_t elem_mbs_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3972 /* 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	3973 idx = idx + extra[idx] + 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3974 elem_mbs_len = extra[idx++];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3975 if (mbs_len == elem_mbs_len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3976 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3977 for (mbs_cnt = 0; mbs_cnt < elem_mbs_len; ++mbs_cnt)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3978 if (extra[idx + mbs_cnt] != mbs[mbs_cnt])
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3979 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3980 if (mbs_cnt == elem_mbs_len)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3981 /* Found the entry. */
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	3982 found = true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3983 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3984 /* 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	3985 idx += elem_mbs_len;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3986 /* Adjust for the alignment. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3987 idx = (idx + 3) & ~3;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3988 /* Skip the collation sequence value. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3989 idx += sizeof (uint32_t);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3990 /* Skip the wide char sequence of the collating element. */
16361 ab59b5080051 regex: merge glibc changes Paul Eggert <eggert@cs.ucla.edu> parents: 16358 diff changeset	3991 idx = idx + sizeof (uint32_t) * ((int32_t ) (extra + idx) + 1);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3992 /* If we found the entry, return the sequence value. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3993 if (found)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3994 return (uint32_t ) (extra + idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3995 /* Skip the collation sequence value. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3996 idx += sizeof (uint32_t);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3997 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3998 return UINT_MAX;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	3999 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4000 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4001 # endif /* _LIBC */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4002 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4003
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4004 /* Check whether the node accepts the byte which is IDX-th
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4005 byte of the INPUT. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4006
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	4007 static bool
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	4008 check_node_accept (const re_match_context_t mctx, const re_token_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	4009 Idx idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4010 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4011 unsigned char ch;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4012 ch = re_string_byte_at (&mctx->input, idx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4013 switch (node->type)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4014 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4015 case CHARACTER:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4016 if (node->opr.c != ch)
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	4017 return false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4018 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4019
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4020 case SIMPLE_BRACKET:
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4021 if (!bitset_contain (node->opr.sbcset, ch))
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	4022 return false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4023 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4024
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4025 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4026 case OP_UTF8_PERIOD:
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4027 if (ch >= ASCII_CHARS)
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	4028 return false;
19013 fa6b743e021c regex: work with GCC7's -Werror=implicit-fallthrough= Paul Eggert <eggert@cs.ucla.edu> parents: 18626 diff changeset	4029 FALLTHROUGH;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4030 #endif
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4031 case OP_PERIOD:
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4032 if ((ch == '\n' && !(mctx->dfa->syntax & RE_DOT_NEWLINE))
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4033 \|\| (ch == '\0' && (mctx->dfa->syntax & RE_DOT_NOT_NULL)))
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	4034 return false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4035 break;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4036
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4037 default:
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	4038 return false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4039 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4040
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4041 if (node->constraint)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4042 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4043 /* The node has constraints. Check whether the current context
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4044 satisfies the constraints. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4045 unsigned int context = re_string_context_at (&mctx->input, idx,
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4046 mctx->eflags);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4047 if (NOT_SATISFY_NEXT_CONSTRAINT (node->constraint, context))
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	4048 return false;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4049 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4050
6195 25eaa608fc4e Use bool where appropriate. Paul Eggert <eggert@cs.ucla.edu> parents: 6186 diff changeset	4051 return true;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4052 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4053
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4054 /* Extend the buffers, if the buffers have run out. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4055
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4056 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	4057 __attribute_warn_unused_result__
17301 d08258969ee9 regex: fix buffer overrun in regexp matcher Andreas Schwab <schwab@suse.de> parents: 17249 diff changeset	4058 extend_buffers (re_match_context_t *mctx, int min_len)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4059 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4060 reg_errcode_t ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4061 re_string_t *pstr = &mctx->input;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4062
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4063 /* Avoid overflow. */
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4064 if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / sizeof (re_dfastate_t *)) / 2
c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4065 <= pstr->bufs_len))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4066 return REG_ESPACE;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4067
17301 d08258969ee9 regex: fix buffer overrun in regexp matcher Andreas Schwab <schwab@suse.de> parents: 17249 diff changeset	4068 /* Double the lengths of the buffers, but allocate at least MIN_LEN. */
d08258969ee9 regex: fix buffer overrun in regexp matcher Andreas Schwab <schwab@suse.de> parents: 17249 diff changeset	4069 ret = re_string_realloc_buffers (pstr,
d08258969ee9 regex: fix buffer overrun in regexp matcher Andreas Schwab <schwab@suse.de> parents: 17249 diff changeset	4070 MAX (min_len,
d08258969ee9 regex: fix buffer overrun in regexp matcher Andreas Schwab <schwab@suse.de> parents: 17249 diff changeset	4071 MIN (pstr->len, pstr->bufs_len * 2)));
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4072 if (__glibc_unlikely (ret != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4073 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4074
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4075 if (mctx->state_log != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4076 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4077 /* And double the length of state_log. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4078 /* XXX We have no indication of the size of this buffer. If this
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4079 allocation fail we have no indication that the state_log array
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4080 does not have the right size. */
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4081 re_dfastate_t *new_array = re_realloc (mctx->state_log, re_dfastate_t ,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4082 pstr->bufs_len + 1);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4083 if (__glibc_unlikely (new_array == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4084 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4085 mctx->state_log = new_array;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4086 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4087
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4088 /* Then reconstruct the buffers. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4089 if (pstr->icase)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4090 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4091 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4092 if (pstr->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4093 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4094 ret = build_wcs_upper_buffer (pstr);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4095 if (__glibc_unlikely (ret != REG_NOERROR))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4096 return ret;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4097 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4098 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4099 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4100 build_upper_buffer (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4101 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4102 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4103 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4104 #ifdef RE_ENABLE_I18N
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4105 if (pstr->mb_cur_max > 1)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4106 build_wcs_buffer (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4107 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4108 #endif /* RE_ENABLE_I18N */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4109 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4110 if (pstr->trans != NULL)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4111 re_string_translate_buffer (pstr);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4112 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4113 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4114 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4115 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4116
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4117
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4118 /* Functions for matching context. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4119
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4120 /* Initialize MCTX. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4121
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4122 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	4123 __attribute_warn_unused_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	4124 match_ctx_init (re_match_context_t *mctx, int eflags, Idx n)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4125 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4126 mctx->eflags = eflags;
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	4127 mctx->match_last = -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4128 if (n > 0)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4129 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4130 /* Avoid overflow. */
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4131 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	4132 MAX (sizeof (struct re_backref_cache_entry),
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4133 sizeof (re_sub_match_top_t *));
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4134 if (__glibc_unlikely (MIN (IDX_MAX, SIZE_MAX / max_object_size) < n))
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4135 return REG_ESPACE;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4136
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4137 mctx->bkref_ents = re_malloc (struct re_backref_cache_entry, n);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4138 mctx->sub_tops = re_malloc (re_sub_match_top_t *, n);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4139 if (__glibc_unlikely (mctx->bkref_ents == NULL \|\| mctx->sub_tops == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4140 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4141 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4142 /* Already zero-ed by the caller.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4143 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4144 mctx->bkref_ents = NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4145 mctx->nbkref_ents = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4146 mctx->nsub_tops = 0; */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4147 mctx->abkref_ents = n;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4148 mctx->max_mb_elem_len = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4149 mctx->asub_tops = n;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4150 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4151 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4152
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4153 /* Clean the entries which depend on the current input in MCTX.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4154 This function must be invoked when the matcher changes the start index
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4155 of the input, or changes the input string. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4156
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4157 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	4158 match_ctx_clean (re_match_context_t *mctx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4159 {
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	4160 Idx st_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4161 for (st_idx = 0; st_idx < mctx->nsub_tops; ++st_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4162 {
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	4163 Idx sl_idx;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4164 re_sub_match_top_t *top = mctx->sub_tops[st_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4165 for (sl_idx = 0; sl_idx < top->nlasts; ++sl_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4166 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4167 re_sub_match_last_t *last = top->lasts[sl_idx];
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4168 re_free (last->path.array);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4169 re_free (last);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4170 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4171 re_free (top->lasts);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4172 if (top->path)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4173 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4174 re_free (top->path->array);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4175 re_free (top->path);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4176 }
19476 1f3bb9a8c477 regex: use re_malloc etc. consistently Paul Eggert <eggert@cs.ucla.edu> parents: 19445 diff changeset	4177 re_free (top);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4178 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4179
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4180 mctx->nsub_tops = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4181 mctx->nbkref_ents = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4182 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4183
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4184 /* Free all the memory associated with MCTX. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4185
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4186 static void
6076 e2dd51f6e259 * config/srclist.txt: Add glibc bugs 1220, 1221, 1222. Paul Eggert <eggert@cs.ucla.edu> parents: 6069 diff changeset	4187 match_ctx_free (re_match_context_t *mctx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4188 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4189 /* First, free all the memory associated with MCTX->SUB_TOPS. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4190 match_ctx_clean (mctx);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4191 re_free (mctx->sub_tops);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4192 re_free (mctx->bkref_ents);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4193 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4194
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4195 /* Add a new backreference entry to MCTX.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4196 Note that we assume that caller never call this function with duplicate
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4197 entry, and call with STR_IDX which isn't smaller than any existing entry.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4198 */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4199
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4200 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	4201 __attribute_warn_unused_result__
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4202 match_ctx_add_entry (re_match_context_t *mctx, Idx node, Idx str_idx, Idx from,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4203 Idx to)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4204 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4205 if (mctx->nbkref_ents >= mctx->abkref_ents)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4206 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4207 struct re_backref_cache_entry* new_entry;
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4208 new_entry = re_realloc (mctx->bkref_ents, struct re_backref_cache_entry,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4209 mctx->abkref_ents * 2);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4210 if (__glibc_unlikely (new_entry == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4211 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4212 re_free (mctx->bkref_ents);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4213 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4214 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4215 mctx->bkref_ents = new_entry;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4216 memset (mctx->bkref_ents + mctx->nbkref_ents, '\0',
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4217 sizeof (struct re_backref_cache_entry) * mctx->abkref_ents);
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4218 mctx->abkref_ents *= 2;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4219 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4220 if (mctx->nbkref_ents > 0
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4221 && mctx->bkref_ents[mctx->nbkref_ents - 1].str_idx == str_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4222 mctx->bkref_ents[mctx->nbkref_ents - 1].more = 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4223
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4224 mctx->bkref_ents[mctx->nbkref_ents].node = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4225 mctx->bkref_ents[mctx->nbkref_ents].str_idx = str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4226 mctx->bkref_ents[mctx->nbkref_ents].subexp_from = from;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4227 mctx->bkref_ents[mctx->nbkref_ents].subexp_to = to;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4228
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4229 /* This is a cache that saves negative results of check_dst_limits_calc_pos.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4230 If bit N is clear, means that this entry won't epsilon-transition to
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4231 an OP_OPEN_SUBEXP or OP_CLOSE_SUBEXP for the N+1-th subexpression. If
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4232 it is set, check_dst_limits_calc_pos_1 will recurse and try to find one
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4233 such node.
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4234
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4235 A backreference does not epsilon-transition unless it is empty, so set
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4236 to all zeros if FROM != TO. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4237 mctx->bkref_ents[mctx->nbkref_ents].eps_reachable_subexps_map
6171 5862ee08bfc1 * lib/regcomp.c (re_compile_fastmap_iter, init_dfa, init_word_char): Paul Eggert <eggert@cs.ucla.edu> parents: 6125 diff changeset	4238 = (from == to ? -1 : 0);
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4239
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4240 mctx->bkref_ents[mctx->nbkref_ents++].more = 0;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4241 if (mctx->max_mb_elem_len < to - from)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4242 mctx->max_mb_elem_len = to - from;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4243 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4244 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4245
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	4246 /* Return the first entry with the same str_idx, or -1 if none is
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4247 found. Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4248
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	4249 static Idx
6185 6b09f7f6ba73 * lib/regcomp.c (search_duplicated_node): Make first pointer arg Paul Eggert <eggert@cs.ucla.edu> parents: 6184 diff changeset	4250 search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4251 {
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	4252 Idx left, right, mid, last;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4253 last = right = mctx->nbkref_ents;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4254 for (left = 0; left < right;)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4255 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4256 mid = (left + right) / 2;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4257 if (mctx->bkref_ents[mid].str_idx < str_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4258 left = mid + 1;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4259 else
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4260 right = mid;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4261 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4262 if (left < last && mctx->bkref_ents[left].str_idx == str_idx)
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4263 return left;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4264 else
18253 8367bee10021 regex: make it closer to libc Paul Eggert <eggert@cs.ucla.edu> parents: 18252 diff changeset	4265 return -1;
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4266 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4267
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4268 /* Register the node NODE, whose type is OP_OPEN_SUBEXP, and which matches
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4269 at STR_IDX. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4270
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4271 static reg_errcode_t
19445 6b21a1f20af2 regex: merge from glibc Paul Eggert <eggert@cs.ucla.edu> parents: 19190 diff changeset	4272 __attribute_warn_unused_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	4273 match_ctx_add_subtop (re_match_context_t *mctx, Idx node, Idx str_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4274 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4275 #ifdef DEBUG
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4276 assert (mctx->sub_tops != NULL);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4277 assert (mctx->asub_tops > 0);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4278 #endif
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4279 if (__glibc_unlikely (mctx->nsub_tops == mctx->asub_tops))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4280 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4281 Idx new_asub_tops = mctx->asub_tops * 2;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4282 re_sub_match_top_t **new_array = re_realloc (mctx->sub_tops,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4283 re_sub_match_top_t *,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4284 new_asub_tops);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4285 if (__glibc_unlikely (new_array == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4286 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4287 mctx->sub_tops = new_array;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4288 mctx->asub_tops = new_asub_tops;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4289 }
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4290 mctx->sub_tops[mctx->nsub_tops] = calloc (1, sizeof (re_sub_match_top_t));
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4291 if (__glibc_unlikely (mctx->sub_tops[mctx->nsub_tops] == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4292 return REG_ESPACE;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4293 mctx->sub_tops[mctx->nsub_tops]->node = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4294 mctx->sub_tops[mctx->nsub_tops++]->str_idx = str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4295 return REG_NOERROR;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4296 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4297
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4298 /* Register the node NODE, whose type is OP_CLOSE_SUBEXP, and which matches
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4299 at STR_IDX, whose corresponding OP_OPEN_SUBEXP is SUB_TOP. */
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4300
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4301 static re_sub_match_last_t *
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	4302 match_ctx_add_sublast (re_sub_match_top_t *subtop, Idx node, Idx str_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4303 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4304 re_sub_match_last_t *new_entry;
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4305 if (__glibc_unlikely (subtop->nlasts == subtop->alasts))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4306 {
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4307 Idx new_alasts = 2 * subtop->alasts + 1;
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4308 re_sub_match_last_t **new_array = re_realloc (subtop->lasts,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4309 re_sub_match_last_t *,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4310 new_alasts);
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4311 if (__glibc_unlikely (new_array == NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4312 return NULL;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4313 subtop->lasts = new_array;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4314 subtop->alasts = new_alasts;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4315 }
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4316 new_entry = calloc (1, sizeof (re_sub_match_last_t));
39918 c17f5376064e autoupdate Paul Eggert <eggert@cs.ucla.edu> parents: 39745 diff changeset	4317 if (__glibc_likely (new_entry != NULL))
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4318 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4319 subtop->lasts[subtop->nlasts] = new_entry;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4320 new_entry->node = node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4321 new_entry->str_idx = str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4322 ++subtop->nlasts;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4323 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4324 return new_entry;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4325 }
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4326
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4327 static void
6726 af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4328 sift_ctx_init (re_sift_context_t sctx, re_dfastate_t *sifted_sts,
af9abbcedfbd Merge regex changes from libc, removing some of our Paul Eggert <eggert@cs.ucla.edu> parents: 6236 diff changeset	4329 re_dfastate_t **limited_sts, Idx last_node, Idx last_str_idx)
5968 541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4330 {
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4331 sctx->sifted_states = sifted_sts;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4332 sctx->limited_states = limited_sts;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4333 sctx->last_node = last_node;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4334 sctx->last_str_idx = last_str_idx;
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4335 re_node_set_init_empty (&sctx->limits);
541fed6ae301 * modules/regex (Files): Add lib/regex_internal.c, Paul Eggert <eggert@cs.ucla.edu> parents: diff changeset	4336 }

Mercurial > gnulib

annotate lib/regexec.c @ 40168:f533980eb42f