2002-02-26 19:06:03 +00:00
|
|
|
|
/* Extended regular expression matching and search library.
|
Update.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.c (re_node_set_insert): Remove unused variables.
* posix/regex_internal.h (re_dfa_t): Add syntax field.
* posix/regcomp.c (parse): Initialize dfa->syntax.
* posix/regexec.c (acquire_init_state_context,
prune_impossible_nodes, check_matching, check_halt_state_context,
proceed_next_node, sift_states_iter_mb, sift_states_backward,
update_cur_sifted_state, sift_states_bkref, transit_state,
transit_state_sb, transit_state_mb, transit_state_bkref,
get_subexp, get_subexp_sub, check_arrival, expand_bkref_cache,
build_trtable): Remove preg argument, add dfa argument instead
and remove dfa = preg->buffer initialization in the body.
Adjust all callers.
(check_node_accept_bytes, group_nodes_into_DFAstates,
check_node_accept): Likewise. Use dfa->syntax instead of
preg->syntax.
(check_arrival_add_next_nodes): Remove preg argument.
* posix/regex_internal.h (re_match_context_t): Make input
re_string_t instead of a pointer to it.
* posix/regex_internal.c (re_string_construct_common): Don't clear
pstr here...
(re_string_construct): ... but only here.
* posix/regexec.c (match_ctx_init): Remove input argument. Don't
initialize fields to zero.
(re_search_internal): Move input into mctx.input.
(acquire_init_state_context, check_matching,
check_halt_state_context, proceed_next_node,
clean_state_log_if_needed, sift_states_bkref, sift_states_iter_mb,
transit_state, transit_state_sb, transit_state_mb,
transit_state_bkref, get_subexp, check_arrival,
check_arrival_add_next_nodes, check_node_accept, extend_buffers):
Change mctx->input into &mctx->input and mctx->input->field into
mctx->input.field.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
Paolo Bonzini <bonzini@gnu.org>
* posix/regex_internal.h (re_const_bitset_ptr_t): New type.
(re_string_t): Add newline_anchor, word_char and word_ops_used fields.
(re_dfa_t): Change word_char type to bitset. Add word_ops_used field.
(re_string_context_at, re_string_reconstruct): Remove last argument.
* posix/regex_internal.c (re_string_allocate): Initialize
pstr->word_char and pstr->word_ops_used.
(re_string_context_at): Remove newline_anchor argument.
Use input->newline_anchor instead, swap && conditions.
Only use IS_WIDE_WORD_CHAR if input->word_ops_used != 0.
Use input->word_char bitmap instead of IS_WORD_CHAR.
(re_string_reconstruct): Likewise.
Adjust re_string_context_at caller.
* posix/regexec.c (acquire_init_state_context,
check_halt_state_context, transit_state, transit_state_sb,
transit_state_mb, transit_state_bkref, check_arrival,
check_node_accept): Adjust re_string_context_at and
re_string_reconstruct callers.
(re_search_internal): Likewise. Set input.newline_anchor.
(build_trtable): Use dfa->word_char bitmap instead of IS_WORD_CHAR.
* posix/regcomp.c (init_word_char): Change return type to void.
Set dfa->word_ops_used.
(free_dfa_content): Don't free dfa->word_char.
(parse_expression): Remove error handling for init_word_char.
2004-01-02 21:20:51 +00:00
|
|
|
|
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
|
2002-02-26 19:06:03 +00:00
|
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
|
|
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
License along with the GNU C Library; if not, write to the Free
|
|
|
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
|
02111-1307 USA. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
int length, reg_syntax_t syntax);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static void re_compile_fastmap_iter (regex_t *bufp,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
const re_dfastate_t *init_state,
|
|
|
|
|
char *fastmap);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static reg_errcode_t init_dfa (re_dfa_t *dfa, int pat_len);
|
Update.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.c (re_node_set_insert): Remove unused variables.
* posix/regex_internal.h (re_dfa_t): Add syntax field.
* posix/regcomp.c (parse): Initialize dfa->syntax.
* posix/regexec.c (acquire_init_state_context,
prune_impossible_nodes, check_matching, check_halt_state_context,
proceed_next_node, sift_states_iter_mb, sift_states_backward,
update_cur_sifted_state, sift_states_bkref, transit_state,
transit_state_sb, transit_state_mb, transit_state_bkref,
get_subexp, get_subexp_sub, check_arrival, expand_bkref_cache,
build_trtable): Remove preg argument, add dfa argument instead
and remove dfa = preg->buffer initialization in the body.
Adjust all callers.
(check_node_accept_bytes, group_nodes_into_DFAstates,
check_node_accept): Likewise. Use dfa->syntax instead of
preg->syntax.
(check_arrival_add_next_nodes): Remove preg argument.
* posix/regex_internal.h (re_match_context_t): Make input
re_string_t instead of a pointer to it.
* posix/regex_internal.c (re_string_construct_common): Don't clear
pstr here...
(re_string_construct): ... but only here.
* posix/regexec.c (match_ctx_init): Remove input argument. Don't
initialize fields to zero.
(re_search_internal): Move input into mctx.input.
(acquire_init_state_context, check_matching,
check_halt_state_context, proceed_next_node,
clean_state_log_if_needed, sift_states_bkref, sift_states_iter_mb,
transit_state, transit_state_sb, transit_state_mb,
transit_state_bkref, get_subexp, check_arrival,
check_arrival_add_next_nodes, check_node_accept, extend_buffers):
Change mctx->input into &mctx->input and mctx->input->field into
mctx->input.field.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
Paolo Bonzini <bonzini@gnu.org>
* posix/regex_internal.h (re_const_bitset_ptr_t): New type.
(re_string_t): Add newline_anchor, word_char and word_ops_used fields.
(re_dfa_t): Change word_char type to bitset. Add word_ops_used field.
(re_string_context_at, re_string_reconstruct): Remove last argument.
* posix/regex_internal.c (re_string_allocate): Initialize
pstr->word_char and pstr->word_ops_used.
(re_string_context_at): Remove newline_anchor argument.
Use input->newline_anchor instead, swap && conditions.
Only use IS_WIDE_WORD_CHAR if input->word_ops_used != 0.
Use input->word_char bitmap instead of IS_WORD_CHAR.
(re_string_reconstruct): Likewise.
Adjust re_string_context_at caller.
* posix/regexec.c (acquire_init_state_context,
check_halt_state_context, transit_state, transit_state_sb,
transit_state_mb, transit_state_bkref, check_arrival,
check_node_accept): Adjust re_string_context_at and
re_string_reconstruct callers.
(re_search_internal): Likewise. Set input.newline_anchor.
(build_trtable): Use dfa->word_char bitmap instead of IS_WORD_CHAR.
* posix/regcomp.c (init_word_char): Change return type to void.
Set dfa->word_ops_used.
(free_dfa_content): Don't free dfa->word_char.
(parse_expression): Remove error handling for init_word_char.
2004-01-02 21:20:51 +00:00
|
|
|
|
static void init_word_char (re_dfa_t *dfa);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static void free_charset (re_charset_t *cset);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static void free_workarea_compile (regex_t *preg);
|
|
|
|
|
static reg_errcode_t create_initial_state (re_dfa_t *dfa);
|
2003-11-12 19:09:20 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
static void optimize_utf8 (re_dfa_t *dfa);
|
|
|
|
|
#endif
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static reg_errcode_t analyze (re_dfa_t *dfa);
|
|
|
|
|
static reg_errcode_t analyze_tree (re_dfa_t *dfa, bin_tree_t *node);
|
|
|
|
|
static void calc_first (re_dfa_t *dfa, bin_tree_t *node);
|
|
|
|
|
static void calc_next (re_dfa_t *dfa, bin_tree_t *node);
|
|
|
|
|
static void calc_epsdest (re_dfa_t *dfa, bin_tree_t *node);
|
2002-10-12 08:34:26 +00:00
|
|
|
|
static reg_errcode_t duplicate_node_closure (re_dfa_t *dfa, int top_org_node,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
int top_clone_node, int root_node,
|
|
|
|
|
unsigned int constraint);
|
2002-02-28 07:43:13 +00:00
|
|
|
|
static reg_errcode_t duplicate_node (int *new_idx, re_dfa_t *dfa, int org_idx,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
unsigned int constraint);
|
2002-12-17 10:58:04 +00:00
|
|
|
|
static int search_duplicated_node (re_dfa_t *dfa, int org_node,
|
|
|
|
|
unsigned int constraint);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static reg_errcode_t calc_eclosure (re_dfa_t *dfa);
|
2002-02-28 07:43:13 +00:00
|
|
|
|
static reg_errcode_t calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
int node, int root);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static void calc_inveclosure (re_dfa_t *dfa);
|
|
|
|
|
static int fetch_number (re_string_t *input, re_token_t *token,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
reg_syntax_t syntax);
|
2003-11-21 23:42:18 +00:00
|
|
|
|
static void fetch_token (re_token_t *result, re_string_t *input,
|
|
|
|
|
reg_syntax_t syntax);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static int peek_token (re_token_t *token, re_string_t *input,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
reg_syntax_t syntax);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static int peek_token_bracket (re_token_t *token, re_string_t *input,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
reg_syntax_t syntax);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static bin_tree_t *parse (re_string_t *regexp, regex_t *preg,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
reg_syntax_t syntax, reg_errcode_t *err);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static bin_tree_t *parse_reg_exp (re_string_t *regexp, regex_t *preg,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_token_t *token, reg_syntax_t syntax,
|
|
|
|
|
int nest, reg_errcode_t *err);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static bin_tree_t *parse_branch (re_string_t *regexp, regex_t *preg,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_token_t *token, reg_syntax_t syntax,
|
|
|
|
|
int nest, reg_errcode_t *err);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static bin_tree_t *parse_expression (re_string_t *regexp, regex_t *preg,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_token_t *token, reg_syntax_t syntax,
|
|
|
|
|
int nest, reg_errcode_t *err);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static bin_tree_t *parse_sub_exp (re_string_t *regexp, regex_t *preg,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_token_t *token, reg_syntax_t syntax,
|
|
|
|
|
int nest, reg_errcode_t *err);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static bin_tree_t *parse_dup_op (bin_tree_t *dup_elem, re_string_t *regexp,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_dfa_t *dfa, re_token_t *token,
|
|
|
|
|
reg_syntax_t syntax, reg_errcode_t *err);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static bin_tree_t *parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_token_t *token, reg_syntax_t syntax,
|
|
|
|
|
reg_errcode_t *err);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static reg_errcode_t parse_bracket_element (bracket_elem_t *elem,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_string_t *regexp,
|
|
|
|
|
re_token_t *token, int token_len,
|
|
|
|
|
re_dfa_t *dfa,
|
2003-11-13 20:04:16 +00:00
|
|
|
|
reg_syntax_t syntax,
|
|
|
|
|
int accept_hyphen);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static reg_errcode_t parse_bracket_symbol (bracket_elem_t *elem,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_string_t *regexp,
|
|
|
|
|
re_token_t *token);
|
2002-04-26 20:52:02 +00:00
|
|
|
|
#ifndef _LIBC
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# ifdef RE_ENABLE_I18N
|
|
|
|
|
static reg_errcode_t build_range_exp (re_bitset_ptr_t sbcset,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_charset_t *mbcset, int *range_alloc,
|
|
|
|
|
bracket_elem_t *start_elem,
|
|
|
|
|
bracket_elem_t *end_elem);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
static reg_errcode_t build_collating_symbol (re_bitset_ptr_t sbcset,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_charset_t *mbcset,
|
|
|
|
|
int *coll_sym_alloc,
|
|
|
|
|
const unsigned char *name);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# else /* not RE_ENABLE_I18N */
|
|
|
|
|
static reg_errcode_t build_range_exp (re_bitset_ptr_t sbcset,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
bracket_elem_t *start_elem,
|
|
|
|
|
bracket_elem_t *end_elem);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
static reg_errcode_t build_collating_symbol (re_bitset_ptr_t sbcset,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
const unsigned char *name);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# endif /* not RE_ENABLE_I18N */
|
2002-04-26 20:52:02 +00:00
|
|
|
|
#endif /* not _LIBC */
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
static reg_errcode_t build_equiv_class (re_bitset_ptr_t sbcset,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_charset_t *mbcset,
|
|
|
|
|
int *equiv_class_alloc,
|
|
|
|
|
const unsigned char *name);
|
2004-01-06 21:59:24 +00:00
|
|
|
|
static reg_errcode_t build_charclass (unsigned RE_TRANSLATE_TYPE trans,
|
2003-06-12 18:29:52 +00:00
|
|
|
|
re_bitset_ptr_t sbcset,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_charset_t *mbcset,
|
|
|
|
|
int *char_class_alloc,
|
|
|
|
|
const unsigned char *class_name,
|
|
|
|
|
reg_syntax_t syntax);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#else /* not RE_ENABLE_I18N */
|
|
|
|
|
static reg_errcode_t build_equiv_class (re_bitset_ptr_t sbcset,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
const unsigned char *name);
|
2004-01-06 21:59:24 +00:00
|
|
|
|
static reg_errcode_t build_charclass (unsigned RE_TRANSLATE_TYPE trans,
|
2003-06-12 18:29:52 +00:00
|
|
|
|
re_bitset_ptr_t sbcset,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
const unsigned char *class_name,
|
|
|
|
|
reg_syntax_t syntax);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* not RE_ENABLE_I18N */
|
2004-01-06 21:59:24 +00:00
|
|
|
|
static bin_tree_t *build_charclass_op (re_dfa_t *dfa,
|
|
|
|
|
unsigned RE_TRANSLATE_TYPE trans,
|
2003-11-13 06:01:46 +00:00
|
|
|
|
const unsigned char *class_name,
|
2004-01-14 02:42:20 +00:00
|
|
|
|
const unsigned char *extra,
|
|
|
|
|
int non_match, reg_errcode_t *err);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
static bin_tree_t *create_tree (re_dfa_t *dfa,
|
|
|
|
|
bin_tree_t *left, bin_tree_t *right,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_token_type_t type, int index);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
static bin_tree_t *re_dfa_add_tree_node (re_dfa_t *dfa,
|
|
|
|
|
bin_tree_t *left, bin_tree_t *right,
|
2003-11-22 00:00:56 +00:00
|
|
|
|
const re_token_t *token)
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
__attribute ((noinline));
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static bin_tree_t *duplicate_tree (const bin_tree_t *src, re_dfa_t *dfa);
|
2003-12-27 23:40:06 +00:00
|
|
|
|
static void mark_opt_subexp (const bin_tree_t *src, re_dfa_t *dfa);
|
|
|
|
|
static void mark_opt_subexp_iter (const bin_tree_t *src, re_dfa_t *dfa, int idx);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
/* This table gives an error message for each of the error codes listed
|
|
|
|
|
in regex.h. Obviously the order here has to be same as there.
|
|
|
|
|
POSIX doesn't require that we do anything for REG_NOERROR,
|
|
|
|
|
but why not be nice? */
|
|
|
|
|
|
2002-03-13 08:59:47 +00:00
|
|
|
|
const char __re_error_msgid[] attribute_hidden =
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
#define REG_NOERROR_IDX 0
|
|
|
|
|
gettext_noop ("Success") /* REG_NOERROR */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_NOMATCH_IDX (REG_NOERROR_IDX + sizeof "Success")
|
|
|
|
|
gettext_noop ("No match") /* REG_NOMATCH */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_BADPAT_IDX (REG_NOMATCH_IDX + sizeof "No match")
|
|
|
|
|
gettext_noop ("Invalid regular expression") /* REG_BADPAT */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_ECOLLATE_IDX (REG_BADPAT_IDX + sizeof "Invalid regular expression")
|
|
|
|
|
gettext_noop ("Invalid collation character") /* REG_ECOLLATE */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_ECTYPE_IDX (REG_ECOLLATE_IDX + sizeof "Invalid collation character")
|
|
|
|
|
gettext_noop ("Invalid character class name") /* REG_ECTYPE */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_EESCAPE_IDX (REG_ECTYPE_IDX + sizeof "Invalid character class name")
|
|
|
|
|
gettext_noop ("Trailing backslash") /* REG_EESCAPE */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_ESUBREG_IDX (REG_EESCAPE_IDX + sizeof "Trailing backslash")
|
|
|
|
|
gettext_noop ("Invalid back reference") /* REG_ESUBREG */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_EBRACK_IDX (REG_ESUBREG_IDX + sizeof "Invalid back reference")
|
|
|
|
|
gettext_noop ("Unmatched [ or [^") /* REG_EBRACK */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_EPAREN_IDX (REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
|
|
|
|
|
gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_EBRACE_IDX (REG_EPAREN_IDX + sizeof "Unmatched ( or \\(")
|
|
|
|
|
gettext_noop ("Unmatched \\{") /* REG_EBRACE */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_BADBR_IDX (REG_EBRACE_IDX + sizeof "Unmatched \\{")
|
|
|
|
|
gettext_noop ("Invalid content of \\{\\}") /* REG_BADBR */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_ERANGE_IDX (REG_BADBR_IDX + sizeof "Invalid content of \\{\\}")
|
|
|
|
|
gettext_noop ("Invalid range end") /* REG_ERANGE */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_ESPACE_IDX (REG_ERANGE_IDX + sizeof "Invalid range end")
|
|
|
|
|
gettext_noop ("Memory exhausted") /* REG_ESPACE */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_BADRPT_IDX (REG_ESPACE_IDX + sizeof "Memory exhausted")
|
|
|
|
|
gettext_noop ("Invalid preceding regular expression") /* REG_BADRPT */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_EEND_IDX (REG_BADRPT_IDX + sizeof "Invalid preceding regular expression")
|
|
|
|
|
gettext_noop ("Premature end of regular expression") /* REG_EEND */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_ESIZE_IDX (REG_EEND_IDX + sizeof "Premature end of regular expression")
|
|
|
|
|
gettext_noop ("Regular expression too big") /* REG_ESIZE */
|
|
|
|
|
"\0"
|
|
|
|
|
#define REG_ERPAREN_IDX (REG_ESIZE_IDX + sizeof "Regular expression too big")
|
|
|
|
|
gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */
|
|
|
|
|
};
|
|
|
|
|
|
2002-03-13 08:59:47 +00:00
|
|
|
|
const size_t __re_error_msgid_idx[] attribute_hidden =
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
REG_NOERROR_IDX,
|
|
|
|
|
REG_NOMATCH_IDX,
|
|
|
|
|
REG_BADPAT_IDX,
|
|
|
|
|
REG_ECOLLATE_IDX,
|
|
|
|
|
REG_ECTYPE_IDX,
|
|
|
|
|
REG_EESCAPE_IDX,
|
|
|
|
|
REG_ESUBREG_IDX,
|
|
|
|
|
REG_EBRACK_IDX,
|
|
|
|
|
REG_EPAREN_IDX,
|
|
|
|
|
REG_EBRACE_IDX,
|
|
|
|
|
REG_BADBR_IDX,
|
|
|
|
|
REG_ERANGE_IDX,
|
|
|
|
|
REG_ESPACE_IDX,
|
|
|
|
|
REG_BADRPT_IDX,
|
|
|
|
|
REG_EEND_IDX,
|
|
|
|
|
REG_ESIZE_IDX,
|
|
|
|
|
REG_ERPAREN_IDX
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Entry points for GNU code. */
|
|
|
|
|
|
|
|
|
|
/* re_compile_pattern is the GNU regular expression compiler: it
|
2002-07-27 08:20:17 +00:00
|
|
|
|
compiles PATTERN (of length LENGTH) and puts the result in BUFP.
|
2002-02-26 19:06:03 +00:00
|
|
|
|
Returns 0 if the pattern was valid, otherwise an error string.
|
|
|
|
|
|
|
|
|
|
Assumes the `allocated' (and perhaps `buffer') and `translate' fields
|
|
|
|
|
are set in BUFP on entry. */
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
re_compile_pattern (pattern, length, bufp)
|
|
|
|
|
const char *pattern;
|
|
|
|
|
size_t length;
|
|
|
|
|
struct re_pattern_buffer *bufp;
|
|
|
|
|
{
|
|
|
|
|
reg_errcode_t ret;
|
|
|
|
|
|
|
|
|
|
/* And GNU code determines whether or not to get register information
|
|
|
|
|
by passing null for the REGS argument to re_match, etc., not by
|
|
|
|
|
setting no_sub. */
|
|
|
|
|
bufp->no_sub = 0;
|
|
|
|
|
|
|
|
|
|
/* Match anchors at newline. */
|
|
|
|
|
bufp->newline_anchor = 1;
|
|
|
|
|
|
2002-09-05 03:33:58 +00:00
|
|
|
|
ret = re_compile_internal (bufp, pattern, length, re_syntax_options);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
if (!ret)
|
|
|
|
|
return NULL;
|
2002-03-13 08:59:47 +00:00
|
|
|
|
return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
weak_alias (__re_compile_pattern, re_compile_pattern)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Set by `re_set_syntax' to the current regexp syntax to recognize. Can
|
|
|
|
|
also be assigned to arbitrarily: each pattern buffer stores its own
|
|
|
|
|
syntax, so it can be changed between regex compilations. */
|
|
|
|
|
/* This has no initializer because initialized variables in Emacs
|
|
|
|
|
become read-only after dumping. */
|
|
|
|
|
reg_syntax_t re_syntax_options;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Specify the precise syntax of regexps for compilation. This provides
|
|
|
|
|
for compatibility for various utilities which historically have
|
|
|
|
|
different, incompatible syntaxes.
|
|
|
|
|
|
|
|
|
|
The argument SYNTAX is a bit mask comprised of the various bits
|
|
|
|
|
defined in regex.h. We return the old syntax. */
|
|
|
|
|
|
|
|
|
|
reg_syntax_t
|
|
|
|
|
re_set_syntax (syntax)
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
{
|
|
|
|
|
reg_syntax_t ret = re_syntax_options;
|
|
|
|
|
|
|
|
|
|
re_syntax_options = syntax;
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
weak_alias (__re_set_syntax, re_set_syntax)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
re_compile_fastmap (bufp)
|
|
|
|
|
struct re_pattern_buffer *bufp;
|
|
|
|
|
{
|
|
|
|
|
re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
|
|
|
|
|
char *fastmap = bufp->fastmap;
|
|
|
|
|
|
|
|
|
|
memset (fastmap, '\0', sizeof (char) * SBC_MAX);
|
|
|
|
|
re_compile_fastmap_iter (bufp, dfa->init_state, fastmap);
|
|
|
|
|
if (dfa->init_state != dfa->init_state_word)
|
|
|
|
|
re_compile_fastmap_iter (bufp, dfa->init_state_word, fastmap);
|
|
|
|
|
if (dfa->init_state != dfa->init_state_nl)
|
|
|
|
|
re_compile_fastmap_iter (bufp, dfa->init_state_nl, fastmap);
|
|
|
|
|
if (dfa->init_state != dfa->init_state_begbuf)
|
|
|
|
|
re_compile_fastmap_iter (bufp, dfa->init_state_begbuf, fastmap);
|
|
|
|
|
bufp->fastmap_accurate = 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
weak_alias (__re_compile_fastmap, re_compile_fastmap)
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-11-06 19:57:50 +00:00
|
|
|
|
static inline void
|
2003-06-13 21:05:42 +00:00
|
|
|
|
__attribute ((always_inline))
|
2002-11-06 19:57:50 +00:00
|
|
|
|
re_set_fastmap (char *fastmap, int icase, int ch)
|
|
|
|
|
{
|
|
|
|
|
fastmap[ch] = 1;
|
|
|
|
|
if (icase)
|
|
|
|
|
fastmap[tolower (ch)] = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Helper function for re_compile_fastmap.
|
|
|
|
|
Compile fastmap for the initial_state INIT_STATE. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
re_compile_fastmap_iter (bufp, init_state, fastmap)
|
|
|
|
|
regex_t *bufp;
|
|
|
|
|
const re_dfastate_t *init_state;
|
|
|
|
|
char *fastmap;
|
|
|
|
|
{
|
|
|
|
|
re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
|
|
|
|
|
int node_cnt;
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
int icase = (dfa->mb_cur_max == 1 && (bufp->syntax & RE_ICASE));
|
2002-02-26 19:06:03 +00:00
|
|
|
|
for (node_cnt = 0; node_cnt < init_state->nodes.nelem; ++node_cnt)
|
|
|
|
|
{
|
|
|
|
|
int node = init_state->nodes.elems[node_cnt];
|
|
|
|
|
re_token_type_t type = dfa->nodes[node].type;
|
|
|
|
|
|
|
|
|
|
if (type == CHARACTER)
|
2003-11-12 06:13:10 +00:00
|
|
|
|
{
|
|
|
|
|
re_set_fastmap (fastmap, icase, dfa->nodes[node].opr.c);
|
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2003-11-12 19:09:20 +00:00
|
|
|
|
if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
|
2003-11-12 06:13:10 +00:00
|
|
|
|
{
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
unsigned char *buf = alloca (dfa->mb_cur_max), *p;
|
2003-11-12 06:13:10 +00:00
|
|
|
|
wchar_t wc;
|
|
|
|
|
mbstate_t state;
|
|
|
|
|
|
|
|
|
|
p = buf;
|
|
|
|
|
*p++ = dfa->nodes[node].opr.c;
|
|
|
|
|
while (++node < dfa->nodes_len
|
|
|
|
|
&& dfa->nodes[node].type == CHARACTER
|
|
|
|
|
&& dfa->nodes[node].mb_partial)
|
|
|
|
|
*p++ = dfa->nodes[node].opr.c;
|
|
|
|
|
memset (&state, 0, sizeof (state));
|
|
|
|
|
if (mbrtowc (&wc, (const char *) buf, p - buf,
|
|
|
|
|
&state) == p - buf
|
|
|
|
|
&& __wcrtomb ((char *) buf, towlower (wc), &state) > 0)
|
|
|
|
|
re_set_fastmap (fastmap, 0, buf[0]);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else if (type == SIMPLE_BRACKET)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
int i, j, ch;
|
|
|
|
|
for (i = 0, ch = 0; i < BITSET_UINTS; ++i)
|
|
|
|
|
for (j = 0; j < UINT_BITS; ++j, ++ch)
|
|
|
|
|
if (dfa->nodes[node].opr.sbcset[i] & (1 << j))
|
|
|
|
|
re_set_fastmap (fastmap, icase, ch);
|
|
|
|
|
}
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else if (type == COMPLEX_BRACKET)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
re_charset_t *cset = dfa->nodes[node].opr.mbcset;
|
|
|
|
|
if (cset->non_match || cset->ncoll_syms || cset->nequiv_classes
|
|
|
|
|
|| cset->nranges || cset->nchar_classes)
|
|
|
|
|
{
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# ifdef _LIBC
|
2002-11-06 20:36:47 +00:00
|
|
|
|
if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0)
|
|
|
|
|
{
|
|
|
|
|
/* In this case we want to catch the bytes which are
|
|
|
|
|
the first byte of any collation elements.
|
|
|
|
|
e.g. In da_DK, we want to catch 'a' since "aa"
|
|
|
|
|
is a valid collation element, and don't catch
|
|
|
|
|
'b' since 'b' is the only collation element
|
|
|
|
|
which starts from 'b'. */
|
|
|
|
|
int j, ch;
|
|
|
|
|
const int32_t *table = (const int32_t *)
|
|
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
|
|
|
|
|
for (i = 0, ch = 0; i < BITSET_UINTS; ++i)
|
|
|
|
|
for (j = 0; j < UINT_BITS; ++j, ++ch)
|
|
|
|
|
if (table[ch] < 0)
|
|
|
|
|
re_set_fastmap (fastmap, icase, ch);
|
|
|
|
|
}
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# else
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
if (dfa->mb_cur_max > 1)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
for (i = 0; i < SBC_MAX; ++i)
|
|
|
|
|
if (__btowc (i) == WEOF)
|
|
|
|
|
re_set_fastmap (fastmap, icase, i);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# endif /* not _LIBC */
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
for (i = 0; i < cset->nmbchars; ++i)
|
|
|
|
|
{
|
|
|
|
|
char buf[256];
|
|
|
|
|
mbstate_t state;
|
|
|
|
|
memset (&state, '\0', sizeof (state));
|
|
|
|
|
__wcrtomb (buf, cset->mbchars[i], &state);
|
|
|
|
|
re_set_fastmap (fastmap, icase, *(unsigned char *) buf);
|
2003-11-12 19:09:20 +00:00
|
|
|
|
if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
|
2003-11-12 06:13:10 +00:00
|
|
|
|
{
|
|
|
|
|
__wcrtomb (buf, towlower (cset->mbchars[i]), &state);
|
|
|
|
|
re_set_fastmap (fastmap, 0, *(unsigned char *) buf);
|
|
|
|
|
}
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2003-12-16 06:16:27 +00:00
|
|
|
|
else if (type == OP_PERIOD
|
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
|| type == OP_UTF8_PERIOD
|
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
|
|
|
|
|| type == END_OF_RE)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
memset (fastmap, '\1', sizeof (char) * SBC_MAX);
|
|
|
|
|
if (type == END_OF_RE)
|
|
|
|
|
bufp->can_be_null = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Entry point for POSIX code. */
|
|
|
|
|
/* regcomp takes a regular expression as a string and compiles it.
|
|
|
|
|
|
|
|
|
|
PREG is a regex_t *. We do not expect any fields to be initialized,
|
|
|
|
|
since POSIX says we shouldn't. Thus, we set
|
|
|
|
|
|
|
|
|
|
`buffer' to the compiled pattern;
|
|
|
|
|
`used' to the length of the compiled pattern;
|
|
|
|
|
`syntax' to RE_SYNTAX_POSIX_EXTENDED if the
|
|
|
|
|
REG_EXTENDED bit in CFLAGS is set; otherwise, to
|
|
|
|
|
RE_SYNTAX_POSIX_BASIC;
|
|
|
|
|
`newline_anchor' to REG_NEWLINE being set in CFLAGS;
|
|
|
|
|
`fastmap' to an allocated space for the fastmap;
|
|
|
|
|
`fastmap_accurate' to zero;
|
|
|
|
|
`re_nsub' to the number of subexpressions in PATTERN.
|
|
|
|
|
|
|
|
|
|
PATTERN is the address of the pattern string.
|
|
|
|
|
|
|
|
|
|
CFLAGS is a series of bits which affect compilation.
|
|
|
|
|
|
|
|
|
|
If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we
|
|
|
|
|
use POSIX basic syntax.
|
|
|
|
|
|
|
|
|
|
If REG_NEWLINE is set, then . and [^...] don't match newline.
|
|
|
|
|
Also, regexec will try a match beginning after every newline.
|
|
|
|
|
|
|
|
|
|
If REG_ICASE is set, then we considers upper- and lowercase
|
|
|
|
|
versions of letters to be equivalent when matching.
|
|
|
|
|
|
|
|
|
|
If REG_NOSUB is set, then when PREG is passed to regexec, that
|
|
|
|
|
routine will report only success or failure, and nothing about the
|
|
|
|
|
registers.
|
|
|
|
|
|
|
|
|
|
It returns 0 if it succeeds, nonzero if it doesn't. (See regex.h for
|
|
|
|
|
the return codes and their meanings.) */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
regcomp (preg, pattern, cflags)
|
2002-09-05 03:33:58 +00:00
|
|
|
|
regex_t *__restrict preg;
|
|
|
|
|
const char *__restrict pattern;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
int cflags;
|
|
|
|
|
{
|
|
|
|
|
reg_errcode_t ret;
|
|
|
|
|
reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED
|
2002-11-06 20:36:47 +00:00
|
|
|
|
: RE_SYNTAX_POSIX_BASIC);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
preg->buffer = NULL;
|
|
|
|
|
preg->allocated = 0;
|
|
|
|
|
preg->used = 0;
|
|
|
|
|
|
|
|
|
|
/* Try to allocate space for the fastmap. */
|
|
|
|
|
preg->fastmap = re_malloc (char, SBC_MAX);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (preg->fastmap == NULL, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
|
|
|
|
|
syntax |= (cflags & REG_ICASE) ? RE_ICASE : 0;
|
|
|
|
|
|
|
|
|
|
/* If REG_NEWLINE is set, newlines are treated differently. */
|
|
|
|
|
if (cflags & REG_NEWLINE)
|
|
|
|
|
{ /* REG_NEWLINE implies neither . nor [^...] match newline. */
|
|
|
|
|
syntax &= ~RE_DOT_NEWLINE;
|
|
|
|
|
syntax |= RE_HAT_LISTS_NOT_NEWLINE;
|
|
|
|
|
/* It also changes the matching behavior. */
|
|
|
|
|
preg->newline_anchor = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
preg->newline_anchor = 0;
|
|
|
|
|
preg->no_sub = !!(cflags & REG_NOSUB);
|
|
|
|
|
preg->translate = NULL;
|
|
|
|
|
|
|
|
|
|
ret = re_compile_internal (preg, pattern, strlen (pattern), syntax);
|
|
|
|
|
|
|
|
|
|
/* POSIX doesn't distinguish between an unmatched open-group and an
|
|
|
|
|
unmatched close-group: both are REG_EPAREN. */
|
|
|
|
|
if (ret == REG_ERPAREN)
|
|
|
|
|
ret = REG_EPAREN;
|
|
|
|
|
|
2002-02-28 07:43:13 +00:00
|
|
|
|
/* We have already checked preg->fastmap != NULL. */
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (ret == REG_NOERROR, 1))
|
2002-11-06 08:34:35 +00:00
|
|
|
|
/* Compute the fastmap now, since regexec cannot modify the pattern
|
2004-01-06 21:59:24 +00:00
|
|
|
|
buffer. This function never fails in this implementation. */
|
2002-12-13 23:45:32 +00:00
|
|
|
|
(void) re_compile_fastmap (preg);
|
2002-11-06 08:34:35 +00:00
|
|
|
|
else
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
2002-11-06 08:34:35 +00:00
|
|
|
|
/* Some error occurred while compiling the expression. */
|
|
|
|
|
re_free (preg->fastmap);
|
|
|
|
|
preg->fastmap = NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (int) ret;
|
|
|
|
|
}
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
weak_alias (__regcomp, regcomp)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Returns a message corresponding to an error code, ERRCODE, returned
|
|
|
|
|
from either regcomp or regexec. We don't use PREG here. */
|
|
|
|
|
|
|
|
|
|
size_t
|
|
|
|
|
regerror (errcode, preg, errbuf, errbuf_size)
|
|
|
|
|
int errcode;
|
|
|
|
|
const regex_t *preg;
|
|
|
|
|
char *errbuf;
|
|
|
|
|
size_t errbuf_size;
|
|
|
|
|
{
|
|
|
|
|
const char *msg;
|
|
|
|
|
size_t msg_size;
|
|
|
|
|
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (errcode < 0
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|| errcode >= (int) (sizeof (__re_error_msgid_idx)
|
|
|
|
|
/ sizeof (__re_error_msgid_idx[0])), 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Only error codes returned by the rest of the code should be passed
|
|
|
|
|
to this routine. If we are given anything else, or if other regex
|
|
|
|
|
code generates an invalid error code, then the program has a bug.
|
|
|
|
|
Dump core so we can fix it. */
|
|
|
|
|
abort ();
|
|
|
|
|
|
2002-03-13 08:59:47 +00:00
|
|
|
|
msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
msg_size = strlen (msg) + 1; /* Includes the null. */
|
|
|
|
|
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (errbuf_size != 0, 1))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (msg_size > errbuf_size, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2002-02-26 19:06:03 +00:00
|
|
|
|
#if defined HAVE_MEMPCPY || defined _LIBC
|
|
|
|
|
*((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
|
|
|
|
|
#else
|
2002-11-06 20:36:47 +00:00
|
|
|
|
memcpy (errbuf, msg, errbuf_size - 1);
|
|
|
|
|
errbuf[errbuf_size - 1] = 0;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
#endif
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else
|
2002-11-06 20:36:47 +00:00
|
|
|
|
memcpy (errbuf, msg, msg_size);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return msg_size;
|
|
|
|
|
}
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
weak_alias (__regerror, regerror)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
2002-11-06 08:34:35 +00:00
|
|
|
|
static void
|
|
|
|
|
free_dfa_content (re_dfa_t *dfa)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
int i, j;
|
|
|
|
|
|
2002-11-06 08:34:35 +00:00
|
|
|
|
re_free (dfa->subexps);
|
|
|
|
|
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (dfa->nodes)
|
|
|
|
|
for (i = 0; i < dfa->nodes_len; ++i)
|
|
|
|
|
{
|
|
|
|
|
re_token_t *node = dfa->nodes + i;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (node->type == COMPLEX_BRACKET && node->duplicated == 0)
|
|
|
|
|
free_charset (node->opr.mbcset);
|
|
|
|
|
else
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (node->type == SIMPLE_BRACKET && node->duplicated == 0)
|
|
|
|
|
re_free (node->opr.sbcset);
|
|
|
|
|
}
|
2002-11-06 08:34:35 +00:00
|
|
|
|
re_free (dfa->nexts);
|
|
|
|
|
for (i = 0; i < dfa->nodes_len; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (dfa->eclosures != NULL)
|
|
|
|
|
re_node_set_free (dfa->eclosures + i);
|
|
|
|
|
if (dfa->inveclosures != NULL)
|
|
|
|
|
re_node_set_free (dfa->inveclosures + i);
|
|
|
|
|
if (dfa->edests != NULL)
|
|
|
|
|
re_node_set_free (dfa->edests + i);
|
|
|
|
|
}
|
|
|
|
|
re_free (dfa->edests);
|
|
|
|
|
re_free (dfa->eclosures);
|
|
|
|
|
re_free (dfa->inveclosures);
|
|
|
|
|
re_free (dfa->nodes);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (dfa->state_table)
|
|
|
|
|
for (i = 0; i <= dfa->state_hash_mask; ++i)
|
|
|
|
|
{
|
|
|
|
|
struct re_state_table_entry *entry = dfa->state_table + i;
|
|
|
|
|
for (j = 0; j < entry->num; ++j)
|
|
|
|
|
{
|
|
|
|
|
re_dfastate_t *state = entry->array[j];
|
|
|
|
|
free_state (state);
|
|
|
|
|
}
|
|
|
|
|
re_free (entry->array);
|
|
|
|
|
}
|
2002-11-06 08:34:35 +00:00
|
|
|
|
re_free (dfa->state_table);
|
2003-11-24 19:30:51 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
re_free (dfa->sb_char);
|
2003-12-29 00:42:16 +00:00
|
|
|
|
#endif
|
2002-09-28 05:28:44 +00:00
|
|
|
|
#ifdef DEBUG
|
2002-11-06 08:34:35 +00:00
|
|
|
|
re_free (dfa->re_str);
|
2002-09-28 05:28:44 +00:00
|
|
|
|
#endif
|
2002-11-06 08:34:35 +00:00
|
|
|
|
|
|
|
|
|
re_free (dfa);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Free dynamically allocated space used by PREG. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
regfree (preg)
|
|
|
|
|
regex_t *preg;
|
|
|
|
|
{
|
|
|
|
|
re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
|
|
|
|
|
if (BE (dfa != NULL, 1))
|
|
|
|
|
free_dfa_content (dfa);
|
2004-01-06 21:59:24 +00:00
|
|
|
|
preg->buffer = NULL;
|
|
|
|
|
preg->allocated = 0;
|
2002-11-06 08:34:35 +00:00
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_free (preg->fastmap);
|
2004-01-06 21:59:24 +00:00
|
|
|
|
preg->fastmap = NULL;
|
|
|
|
|
|
|
|
|
|
re_free (preg->translate);
|
|
|
|
|
preg->translate = NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
weak_alias (__regfree, regfree)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Entry points compatible with 4.2 BSD regex library. We don't define
|
|
|
|
|
them unless specifically requested. */
|
|
|
|
|
|
|
|
|
|
#if defined _REGEX_RE_COMP || defined _LIBC
|
|
|
|
|
|
|
|
|
|
/* BSD has one and only one pattern buffer. */
|
|
|
|
|
static struct re_pattern_buffer re_comp_buf;
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
# ifdef _LIBC
|
|
|
|
|
/* Make these definitions weak in libc, so POSIX programs can redefine
|
|
|
|
|
these names if they don't use our functions, and still use
|
|
|
|
|
regcomp/regexec above without link errors. */
|
|
|
|
|
weak_function
|
|
|
|
|
# endif
|
|
|
|
|
re_comp (s)
|
|
|
|
|
const char *s;
|
|
|
|
|
{
|
|
|
|
|
reg_errcode_t ret;
|
2002-10-24 00:22:27 +00:00
|
|
|
|
char *fastmap;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
if (!s)
|
|
|
|
|
{
|
|
|
|
|
if (!re_comp_buf.buffer)
|
|
|
|
|
return gettext ("No previous regular expression");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-24 00:22:27 +00:00
|
|
|
|
if (re_comp_buf.buffer)
|
|
|
|
|
{
|
|
|
|
|
fastmap = re_comp_buf.fastmap;
|
|
|
|
|
re_comp_buf.fastmap = NULL;
|
|
|
|
|
__regfree (&re_comp_buf);
|
2002-11-06 19:57:50 +00:00
|
|
|
|
memset (&re_comp_buf, '\0', sizeof (re_comp_buf));
|
2002-10-24 00:22:27 +00:00
|
|
|
|
re_comp_buf.fastmap = fastmap;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (re_comp_buf.fastmap == NULL)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
re_comp_buf.fastmap = (char *) malloc (SBC_MAX);
|
|
|
|
|
if (re_comp_buf.fastmap == NULL)
|
2002-03-13 08:59:47 +00:00
|
|
|
|
return (char *) gettext (__re_error_msgid
|
|
|
|
|
+ __re_error_msgid_idx[(int) REG_ESPACE]);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Since `re_exec' always passes NULL for the `regs' argument, we
|
|
|
|
|
don't need to initialize the pattern buffer fields which affect it. */
|
|
|
|
|
|
|
|
|
|
/* Match anchors at newlines. */
|
|
|
|
|
re_comp_buf.newline_anchor = 1;
|
|
|
|
|
|
|
|
|
|
ret = re_compile_internal (&re_comp_buf, s, strlen (s), re_syntax_options);
|
|
|
|
|
|
|
|
|
|
if (!ret)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
/* Yes, we're discarding `const' here if !HAVE_LIBINTL. */
|
2002-03-13 08:59:47 +00:00
|
|
|
|
return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
2002-10-24 00:22:27 +00:00
|
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
2002-11-01 20:44:15 +00:00
|
|
|
|
libc_freeres_fn (free_mem)
|
2002-10-24 00:22:27 +00:00
|
|
|
|
{
|
|
|
|
|
__regfree (&re_comp_buf);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
#endif /* _REGEX_RE_COMP */
|
|
|
|
|
|
|
|
|
|
/* Internal entry point.
|
|
|
|
|
Compile the regular expression PATTERN, whose length is LENGTH.
|
|
|
|
|
SYNTAX indicate regular expression's syntax. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
|
|
|
|
re_compile_internal (preg, pattern, length, syntax)
|
|
|
|
|
regex_t *preg;
|
|
|
|
|
const char * pattern;
|
|
|
|
|
int length;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
{
|
|
|
|
|
reg_errcode_t err = REG_NOERROR;
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
re_string_t regexp;
|
|
|
|
|
|
|
|
|
|
/* Initialize the pattern buffer. */
|
|
|
|
|
preg->fastmap_accurate = 0;
|
|
|
|
|
preg->syntax = syntax;
|
|
|
|
|
preg->not_bol = preg->not_eol = 0;
|
|
|
|
|
preg->used = 0;
|
|
|
|
|
preg->re_nsub = 0;
|
2002-11-06 19:57:50 +00:00
|
|
|
|
preg->can_be_null = 0;
|
|
|
|
|
preg->regs_allocated = REGS_UNALLOCATED;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
/* Initialize the dfa. */
|
|
|
|
|
dfa = (re_dfa_t *) preg->buffer;
|
2003-11-23 19:21:23 +00:00
|
|
|
|
if (BE (preg->allocated < sizeof (re_dfa_t), 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
/* If zero allocated, but buffer is non-null, try to realloc
|
|
|
|
|
enough space. This loses if buffer's address is bogus, but
|
|
|
|
|
that is the user's responsibility. If ->buffer is NULL this
|
|
|
|
|
is a simple allocation. */
|
|
|
|
|
dfa = re_realloc (preg->buffer, re_dfa_t, 1);
|
|
|
|
|
if (dfa == NULL)
|
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
preg->allocated = sizeof (re_dfa_t);
|
2003-11-23 19:21:23 +00:00
|
|
|
|
preg->buffer = (unsigned char *) dfa;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
preg->used = sizeof (re_dfa_t);
|
|
|
|
|
|
|
|
|
|
err = init_dfa (dfa, length);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
free_dfa_content (dfa);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
preg->buffer = NULL;
|
2003-01-16 17:27:50 +00:00
|
|
|
|
preg->allocated = 0;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return err;
|
|
|
|
|
}
|
2002-09-28 05:28:44 +00:00
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
dfa->re_str = re_malloc (char, length + 1);
|
|
|
|
|
strncpy (dfa->re_str, pattern, length + 1);
|
|
|
|
|
#endif
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
2002-04-24 21:54:53 +00:00
|
|
|
|
err = re_string_construct (®exp, pattern, length, preg->translate,
|
2003-11-16 07:14:28 +00:00
|
|
|
|
syntax & RE_ICASE, dfa);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
re_compile_internal_free_return:
|
|
|
|
|
free_workarea_compile (preg);
|
|
|
|
|
re_string_destruct (®exp);
|
|
|
|
|
free_dfa_content (dfa);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
preg->buffer = NULL;
|
2003-01-16 17:27:50 +00:00
|
|
|
|
preg->allocated = 0;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse the regular expression, and build a structure tree. */
|
|
|
|
|
preg->re_nsub = 0;
|
|
|
|
|
dfa->str_tree = parse (®exp, preg, syntax, &err);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (dfa->str_tree == NULL, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
goto re_compile_internal_free_return;
|
|
|
|
|
|
2003-11-12 19:09:20 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
/* If possible, do searching in single byte encoding to speed things up. */
|
2003-11-18 23:40:59 +00:00
|
|
|
|
if (dfa->is_utf8 && !(syntax & RE_ICASE) && preg->translate == NULL)
|
2003-11-12 19:09:20 +00:00
|
|
|
|
optimize_utf8 (dfa);
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Analyze the tree and collect information which is necessary to
|
|
|
|
|
create the dfa. */
|
|
|
|
|
err = analyze (dfa);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
goto re_compile_internal_free_return;
|
|
|
|
|
|
|
|
|
|
/* Then create the initial state of the dfa. */
|
|
|
|
|
err = create_initial_state (dfa);
|
|
|
|
|
|
|
|
|
|
/* Release work areas. */
|
|
|
|
|
free_workarea_compile (preg);
|
|
|
|
|
re_string_destruct (®exp);
|
|
|
|
|
|
2002-11-06 08:34:35 +00:00
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
|
|
|
|
{
|
|
|
|
|
free_dfa_content (dfa);
|
|
|
|
|
preg->buffer = NULL;
|
2003-01-16 17:27:50 +00:00
|
|
|
|
preg->allocated = 0;
|
2002-11-06 08:34:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initialize DFA. We use the length of the regular expression PAT_LEN
|
|
|
|
|
as the initial length of some arrays. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
|
|
|
|
init_dfa (dfa, pat_len)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
int pat_len;
|
|
|
|
|
{
|
|
|
|
|
int table_size;
|
2002-07-10 23:09:16 +00:00
|
|
|
|
|
|
|
|
|
memset (dfa, '\0', sizeof (re_dfa_t));
|
|
|
|
|
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
/* Force allocation of str_tree_storage the first time. */
|
|
|
|
|
dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE;
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
dfa->nodes_alloc = pat_len + 1;
|
|
|
|
|
dfa->nodes = re_malloc (re_token_t, dfa->nodes_alloc);
|
|
|
|
|
|
|
|
|
|
dfa->states_alloc = pat_len + 1;
|
|
|
|
|
|
|
|
|
|
/* table_size = 2 ^ ceil(log pat_len) */
|
|
|
|
|
for (table_size = 1; table_size > 0; table_size <<= 1)
|
|
|
|
|
if (table_size > pat_len)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size);
|
|
|
|
|
dfa->state_hash_mask = table_size - 1;
|
|
|
|
|
|
|
|
|
|
dfa->subexps_alloc = 1;
|
|
|
|
|
dfa->subexps = re_malloc (re_subexp_t, dfa->subexps_alloc);
|
|
|
|
|
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
dfa->mb_cur_max = MB_CUR_MAX;
|
|
|
|
|
#ifdef _LIBC
|
Update.
2003-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/fpu/libm-test-ulps: Add some more minor changes
to compensate other setup.
2003-11-27 Andreas Jaeger <aj@suse.de>
* sysdeps/x86_64/fpu/libm-test-ulps: Add ulps for new atan2 test.
* math/libm-test.inc (atan2_test): Add test that run infinitly.
Reported by "Willus" <etc231etc231@willus.com>.
2003-11-27 Michael Matz <matz@suse.de>
* sysdeps/ieee754/dbl-64/mpsqrt.c (fastiroot): Fix 64-bit problem
with wrong types.
2003-11-28 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (acquire_init_state_context): Make inline.
Add always_inline attribute.
(check_matching): Add BE macro. Move if (cur_state->has_backref)
into if (dfa->nbackref).
(sift_states_backward): Fix comment.
(transit_state): Add BE macro. Move if (next_state->has_backref)
into if (dfa->nbackref && next_state). Don't check for next_state
!= NULL twice.
* posix/regcomp.c (peek_token): Use opr.ctx_type instead of opr.idx
for ANCHOR.
(parse_expression): Only call init_word_char if word context will be
needed.
* posix/bug-regex11.c (tests): Add new tests.
* posix/tst-regex.c: Include getopt.h.
(timing): New variable.
(main): Set timing to 1 if --timing argument is present.
Add 2 new tests.
(run_test, run_test_backwards): Handle timing.
2003-11-27 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (re_string_t): Remove mbs_case field.
Add offsets, valid_raw_len, raw_len, raw_stop, mbs_allocated and
offsets_needed fields. Change icase, is_utf8 and map_notascii
type from int bitfield to unsigned char.
(MBS_ALLOCATED, MBS_CASE_ALLOCATED): Remove.
(build_wcs_upper_buffer): Change prototype to return int.
(re_string_peek_byte_case, re_string_fetch_byte_case): Remove
defines, add prototypes.
* posix/regex_internal.c (re_string_allocate): Don't initialize
stop here. Don't initialize mbs_case. Set valid_raw_len.
Use mbs_allocated instead of MBS_* macros.
(re_string_construct): Don't initialize stop and valid_len here.
Don't initialize mbs_case. Use mbs_allocated instead of MBS_*
macros. Reallocate buffers if build_wcs_upper_buffer converted
too few bytes. Set valid_len to bufs_len only for single byte
no translation and set in that case valid_raw_len as well.
(re_string_realloc_buffers): Reallocate offsets if not NULL.
Use mbs_allocated instead of MBS_ALLOCATED. Don't reallocate
mbs_case.
(re_string_construct_common): Initialize raw_len, mbs_allocated,
stop and raw_stop.
(build_wcs_buffer): Apply pstr->trans before mbrtowc instead of
after it. Set valid_raw_len. Don't set mbs_case.
(build_wcs_upper_buffer): Return REG_NOERROR or REG_ESPACE.
Only use the fast path if !pstr->offsets_needed. Apply pstr->trans
before mbrtowc instead of after it. If upper case character
uses different number of bytes than lower case, goto to the
slow path. Don't call towupper unnecessarily twice. Set
valid_raw_len as well. Handle in the slow path the case if
lower and upper case use different number of characters.
Don't set mbs_case.
(re_string_skip_chars): Use valid_raw_len instead of valid_len.
(build_upper_buffer): Don't set mbs_case. Add BE macro. Set
valid_raw_len.
(re_string_translate_buffer): Set mbs instead of mbs_case. Set
valid_raw_len.
(re_string_reconstruct): Use raw_len/raw_stop to initialize
len/stop. Clear valid_raw_len and offsets_needed when clearing
valid_len. Use mbs_allocated instead of MBS_* macros.
Check original offset against valid_raw_len instead of valid_len.
Remove mbs_case handling. Adjust valid_raw_len together with
valid_len. If is_utf8 and looking for tip context, apply
pstr->trans first. If buffers start with partial multi-byte
character, initialize mbs array as well if mbs_allocated.
Check return value of build_wcs_upper_buffer.
(re_string_peek_byte_case): New function.
(re_string_fetch_byte_case): New function.
(re_string_destruct): Use mbs_allocated instead of MBS_ALLOCATED.
Don't free mbs_case. Free offsets.
* posix/regcomp.c (init_dfa): Only check if charset name is UTF-8
if mb_cur_max == 6.
* posix/regexec.c (re_search_internal): Initialize input.raw_stop
as well. Use valid_raw_len instead of valid_len when looking
through fastmap. Adjust registers through input.offsets.
(extend_buffers): Allow build_wcs_upper_buffer to fail.
* posix/bug-regex18.c (tests): Enable #ifdefed out tests. Add new
tests.
2003-11-29 06:13:09 +00:00
|
|
|
|
if (dfa->mb_cur_max == 6
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
&& strcmp (_NL_CURRENT (LC_CTYPE, _NL_CTYPE_CODESET_NAME), "UTF-8") == 0)
|
|
|
|
|
dfa->is_utf8 = 1;
|
2003-11-16 07:14:28 +00:00
|
|
|
|
dfa->map_notascii = (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_TO_NONASCII)
|
|
|
|
|
!= 0);
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
#endif
|
2003-11-24 19:30:51 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
if (dfa->mb_cur_max > 1)
|
|
|
|
|
{
|
|
|
|
|
int i, j, ch;
|
|
|
|
|
|
|
|
|
|
dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset), 1);
|
|
|
|
|
if (BE (dfa->sb_char == NULL, 0))
|
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
if (dfa->is_utf8)
|
|
|
|
|
memset (dfa->sb_char, 255, sizeof (unsigned int) * BITSET_UINTS / 2);
|
|
|
|
|
else
|
|
|
|
|
for (i = 0, ch = 0; i < BITSET_UINTS; ++i)
|
|
|
|
|
for (j = 0; j < UINT_BITS; ++j, ++ch)
|
2004-03-05 10:54:16 +00:00
|
|
|
|
if (__btowc (ch) != WEOF)
|
2003-11-24 19:30:51 +00:00
|
|
|
|
dfa->sb_char[i] |= 1 << j;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (dfa->nodes == NULL || dfa->state_table == NULL
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|| dfa->subexps == NULL, 0))
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
return REG_ESPACE;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initialize WORD_CHAR table, which indicate which character is
|
|
|
|
|
"word". In this case "word" means that it is the word construction
|
|
|
|
|
character used by some operators like "\<", "\>", etc. */
|
|
|
|
|
|
Update.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.c (re_node_set_insert): Remove unused variables.
* posix/regex_internal.h (re_dfa_t): Add syntax field.
* posix/regcomp.c (parse): Initialize dfa->syntax.
* posix/regexec.c (acquire_init_state_context,
prune_impossible_nodes, check_matching, check_halt_state_context,
proceed_next_node, sift_states_iter_mb, sift_states_backward,
update_cur_sifted_state, sift_states_bkref, transit_state,
transit_state_sb, transit_state_mb, transit_state_bkref,
get_subexp, get_subexp_sub, check_arrival, expand_bkref_cache,
build_trtable): Remove preg argument, add dfa argument instead
and remove dfa = preg->buffer initialization in the body.
Adjust all callers.
(check_node_accept_bytes, group_nodes_into_DFAstates,
check_node_accept): Likewise. Use dfa->syntax instead of
preg->syntax.
(check_arrival_add_next_nodes): Remove preg argument.
* posix/regex_internal.h (re_match_context_t): Make input
re_string_t instead of a pointer to it.
* posix/regex_internal.c (re_string_construct_common): Don't clear
pstr here...
(re_string_construct): ... but only here.
* posix/regexec.c (match_ctx_init): Remove input argument. Don't
initialize fields to zero.
(re_search_internal): Move input into mctx.input.
(acquire_init_state_context, check_matching,
check_halt_state_context, proceed_next_node,
clean_state_log_if_needed, sift_states_bkref, sift_states_iter_mb,
transit_state, transit_state_sb, transit_state_mb,
transit_state_bkref, get_subexp, check_arrival,
check_arrival_add_next_nodes, check_node_accept, extend_buffers):
Change mctx->input into &mctx->input and mctx->input->field into
mctx->input.field.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
Paolo Bonzini <bonzini@gnu.org>
* posix/regex_internal.h (re_const_bitset_ptr_t): New type.
(re_string_t): Add newline_anchor, word_char and word_ops_used fields.
(re_dfa_t): Change word_char type to bitset. Add word_ops_used field.
(re_string_context_at, re_string_reconstruct): Remove last argument.
* posix/regex_internal.c (re_string_allocate): Initialize
pstr->word_char and pstr->word_ops_used.
(re_string_context_at): Remove newline_anchor argument.
Use input->newline_anchor instead, swap && conditions.
Only use IS_WIDE_WORD_CHAR if input->word_ops_used != 0.
Use input->word_char bitmap instead of IS_WORD_CHAR.
(re_string_reconstruct): Likewise.
Adjust re_string_context_at caller.
* posix/regexec.c (acquire_init_state_context,
check_halt_state_context, transit_state, transit_state_sb,
transit_state_mb, transit_state_bkref, check_arrival,
check_node_accept): Adjust re_string_context_at and
re_string_reconstruct callers.
(re_search_internal): Likewise. Set input.newline_anchor.
(build_trtable): Use dfa->word_char bitmap instead of IS_WORD_CHAR.
* posix/regcomp.c (init_word_char): Change return type to void.
Set dfa->word_ops_used.
(free_dfa_content): Don't free dfa->word_char.
(parse_expression): Remove error handling for init_word_char.
2004-01-02 21:20:51 +00:00
|
|
|
|
static void
|
2002-02-26 19:06:03 +00:00
|
|
|
|
init_word_char (dfa)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
{
|
|
|
|
|
int i, j, ch;
|
Update.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.c (re_node_set_insert): Remove unused variables.
* posix/regex_internal.h (re_dfa_t): Add syntax field.
* posix/regcomp.c (parse): Initialize dfa->syntax.
* posix/regexec.c (acquire_init_state_context,
prune_impossible_nodes, check_matching, check_halt_state_context,
proceed_next_node, sift_states_iter_mb, sift_states_backward,
update_cur_sifted_state, sift_states_bkref, transit_state,
transit_state_sb, transit_state_mb, transit_state_bkref,
get_subexp, get_subexp_sub, check_arrival, expand_bkref_cache,
build_trtable): Remove preg argument, add dfa argument instead
and remove dfa = preg->buffer initialization in the body.
Adjust all callers.
(check_node_accept_bytes, group_nodes_into_DFAstates,
check_node_accept): Likewise. Use dfa->syntax instead of
preg->syntax.
(check_arrival_add_next_nodes): Remove preg argument.
* posix/regex_internal.h (re_match_context_t): Make input
re_string_t instead of a pointer to it.
* posix/regex_internal.c (re_string_construct_common): Don't clear
pstr here...
(re_string_construct): ... but only here.
* posix/regexec.c (match_ctx_init): Remove input argument. Don't
initialize fields to zero.
(re_search_internal): Move input into mctx.input.
(acquire_init_state_context, check_matching,
check_halt_state_context, proceed_next_node,
clean_state_log_if_needed, sift_states_bkref, sift_states_iter_mb,
transit_state, transit_state_sb, transit_state_mb,
transit_state_bkref, get_subexp, check_arrival,
check_arrival_add_next_nodes, check_node_accept, extend_buffers):
Change mctx->input into &mctx->input and mctx->input->field into
mctx->input.field.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
Paolo Bonzini <bonzini@gnu.org>
* posix/regex_internal.h (re_const_bitset_ptr_t): New type.
(re_string_t): Add newline_anchor, word_char and word_ops_used fields.
(re_dfa_t): Change word_char type to bitset. Add word_ops_used field.
(re_string_context_at, re_string_reconstruct): Remove last argument.
* posix/regex_internal.c (re_string_allocate): Initialize
pstr->word_char and pstr->word_ops_used.
(re_string_context_at): Remove newline_anchor argument.
Use input->newline_anchor instead, swap && conditions.
Only use IS_WIDE_WORD_CHAR if input->word_ops_used != 0.
Use input->word_char bitmap instead of IS_WORD_CHAR.
(re_string_reconstruct): Likewise.
Adjust re_string_context_at caller.
* posix/regexec.c (acquire_init_state_context,
check_halt_state_context, transit_state, transit_state_sb,
transit_state_mb, transit_state_bkref, check_arrival,
check_node_accept): Adjust re_string_context_at and
re_string_reconstruct callers.
(re_search_internal): Likewise. Set input.newline_anchor.
(build_trtable): Use dfa->word_char bitmap instead of IS_WORD_CHAR.
* posix/regcomp.c (init_word_char): Change return type to void.
Set dfa->word_ops_used.
(free_dfa_content): Don't free dfa->word_char.
(parse_expression): Remove error handling for init_word_char.
2004-01-02 21:20:51 +00:00
|
|
|
|
dfa->word_ops_used = 1;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
for (i = 0, ch = 0; i < BITSET_UINTS; ++i)
|
|
|
|
|
for (j = 0; j < UINT_BITS; ++j, ++ch)
|
|
|
|
|
if (isalnum (ch) || ch == '_')
|
2002-11-06 20:36:47 +00:00
|
|
|
|
dfa->word_char[i] |= 1 << j;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free the work area which are only used while compiling. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
free_workarea_compile (preg)
|
|
|
|
|
regex_t *preg;
|
|
|
|
|
{
|
|
|
|
|
re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
bin_tree_storage_t *storage, *next;
|
|
|
|
|
for (storage = dfa->str_tree_storage; storage; storage = next)
|
|
|
|
|
{
|
|
|
|
|
next = storage->next;
|
|
|
|
|
re_free (storage);
|
|
|
|
|
}
|
|
|
|
|
dfa->str_tree_storage = NULL;
|
|
|
|
|
dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
dfa->str_tree = NULL;
|
2002-12-17 10:58:04 +00:00
|
|
|
|
re_free (dfa->org_indices);
|
|
|
|
|
dfa->org_indices = NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create initial states for all contexts. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
|
|
|
|
create_initial_state (dfa)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
{
|
|
|
|
|
int first, i;
|
|
|
|
|
reg_errcode_t err;
|
|
|
|
|
re_node_set init_nodes;
|
|
|
|
|
|
|
|
|
|
/* Initial states have the epsilon closure of the node which is
|
|
|
|
|
the first node of the regular expression. */
|
|
|
|
|
first = dfa->str_tree->first;
|
|
|
|
|
dfa->init_node = first;
|
|
|
|
|
err = re_node_set_init_copy (&init_nodes, dfa->eclosures + first);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
/* The back-references which are in initial states can epsilon transit,
|
|
|
|
|
since in this case all of the subexpressions can be null.
|
|
|
|
|
Then we add epsilon closures of the nodes which are the next nodes of
|
|
|
|
|
the back-references. */
|
|
|
|
|
if (dfa->nbackref > 0)
|
|
|
|
|
for (i = 0; i < init_nodes.nelem; ++i)
|
|
|
|
|
{
|
2002-11-06 20:36:47 +00:00
|
|
|
|
int node_idx = init_nodes.elems[i];
|
|
|
|
|
re_token_type_t type = dfa->nodes[node_idx].type;
|
|
|
|
|
|
|
|
|
|
int clexp_idx;
|
|
|
|
|
if (type != OP_BACK_REF)
|
|
|
|
|
continue;
|
|
|
|
|
for (clexp_idx = 0; clexp_idx < init_nodes.nelem; ++clexp_idx)
|
|
|
|
|
{
|
|
|
|
|
re_token_t *clexp_node;
|
|
|
|
|
clexp_node = dfa->nodes + init_nodes.elems[clexp_idx];
|
|
|
|
|
if (clexp_node->type == OP_CLOSE_SUBEXP
|
|
|
|
|
&& clexp_node->opr.idx + 1 == dfa->nodes[node_idx].opr.idx)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (clexp_idx == init_nodes.nelem)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (type == OP_BACK_REF)
|
|
|
|
|
{
|
|
|
|
|
int dest_idx = dfa->edests[node_idx].elems[0];
|
|
|
|
|
if (!re_node_set_contains (&init_nodes, dest_idx))
|
|
|
|
|
{
|
|
|
|
|
re_node_set_merge (&init_nodes, dfa->eclosures + dest_idx);
|
|
|
|
|
i = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* It must be the first time to invoke acquire_state. */
|
2002-02-28 07:43:13 +00:00
|
|
|
|
dfa->init_state = re_acquire_state_context (&err, dfa, &init_nodes, 0);
|
|
|
|
|
/* We don't check ERR here, since the initial state must not be NULL. */
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (dfa->init_state == NULL, 0))
|
2002-02-28 07:43:13 +00:00
|
|
|
|
return err;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (dfa->init_state->has_constraint)
|
|
|
|
|
{
|
2002-02-28 07:43:13 +00:00
|
|
|
|
dfa->init_state_word = re_acquire_state_context (&err, dfa, &init_nodes,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
CONTEXT_WORD);
|
2002-02-28 07:43:13 +00:00
|
|
|
|
dfa->init_state_nl = re_acquire_state_context (&err, dfa, &init_nodes,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
CONTEXT_NEWLINE);
|
2002-02-28 07:43:13 +00:00
|
|
|
|
dfa->init_state_begbuf = re_acquire_state_context (&err, dfa,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
&init_nodes,
|
|
|
|
|
CONTEXT_NEWLINE
|
|
|
|
|
| CONTEXT_BEGBUF);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (dfa->init_state_word == NULL || dfa->init_state_nl == NULL
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|| dfa->init_state_begbuf == NULL, 0))
|
|
|
|
|
return err;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
dfa->init_state_word = dfa->init_state_nl
|
|
|
|
|
= dfa->init_state_begbuf = dfa->init_state;
|
|
|
|
|
|
|
|
|
|
re_node_set_free (&init_nodes);
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-12 19:09:20 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
/* If it is possible to do searching in single byte encoding instead of UTF-8
|
|
|
|
|
to speed things up, set dfa->mb_cur_max to 1, clear is_utf8 and change
|
|
|
|
|
DFA nodes where needed. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
optimize_utf8 (dfa)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
{
|
2003-11-18 23:40:59 +00:00
|
|
|
|
int node, i, mb_chars = 0, has_period = 0;
|
2003-11-12 19:09:20 +00:00
|
|
|
|
|
|
|
|
|
for (node = 0; node < dfa->nodes_len; ++node)
|
|
|
|
|
switch (dfa->nodes[node].type)
|
|
|
|
|
{
|
|
|
|
|
case CHARACTER:
|
|
|
|
|
if (dfa->nodes[node].opr.c >= 0x80)
|
2003-11-18 07:25:02 +00:00
|
|
|
|
mb_chars = 1;
|
2003-11-12 19:09:20 +00:00
|
|
|
|
break;
|
|
|
|
|
case ANCHOR:
|
|
|
|
|
switch (dfa->nodes[node].opr.idx)
|
|
|
|
|
{
|
|
|
|
|
case LINE_FIRST:
|
|
|
|
|
case LINE_LAST:
|
|
|
|
|
case BUF_FIRST:
|
|
|
|
|
case BUF_LAST:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
/* Word anchors etc. cannot be handled. */
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2003-11-18 23:40:59 +00:00
|
|
|
|
case OP_PERIOD:
|
|
|
|
|
has_period = 1;
|
|
|
|
|
break;
|
2003-11-12 19:09:20 +00:00
|
|
|
|
case OP_BACK_REF:
|
|
|
|
|
case OP_ALT:
|
|
|
|
|
case END_OF_RE:
|
|
|
|
|
case OP_DUP_ASTERISK:
|
|
|
|
|
case OP_DUP_QUESTION:
|
|
|
|
|
case OP_OPEN_SUBEXP:
|
|
|
|
|
case OP_CLOSE_SUBEXP:
|
|
|
|
|
break;
|
2003-11-13 21:23:11 +00:00
|
|
|
|
case SIMPLE_BRACKET:
|
|
|
|
|
/* Just double check. */
|
|
|
|
|
for (i = 0x80 / UINT_BITS; i < BITSET_UINTS; ++i)
|
|
|
|
|
if (dfa->nodes[node].opr.sbcset[i])
|
|
|
|
|
return;
|
|
|
|
|
break;
|
2003-11-12 19:09:20 +00:00
|
|
|
|
default:
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-18 23:40:59 +00:00
|
|
|
|
if (mb_chars || has_period)
|
2003-11-18 07:25:02 +00:00
|
|
|
|
for (node = 0; node < dfa->nodes_len; ++node)
|
2003-11-18 23:40:59 +00:00
|
|
|
|
{
|
|
|
|
|
if (dfa->nodes[node].type == CHARACTER
|
|
|
|
|
&& dfa->nodes[node].opr.c >= 0x80)
|
|
|
|
|
dfa->nodes[node].mb_partial = 0;
|
|
|
|
|
else if (dfa->nodes[node].type == OP_PERIOD)
|
|
|
|
|
dfa->nodes[node].type = OP_UTF8_PERIOD;
|
|
|
|
|
}
|
2003-11-18 07:25:02 +00:00
|
|
|
|
|
2003-11-12 19:09:20 +00:00
|
|
|
|
/* The search can be in single byte locale. */
|
|
|
|
|
dfa->mb_cur_max = 1;
|
|
|
|
|
dfa->is_utf8 = 0;
|
2003-11-18 23:40:59 +00:00
|
|
|
|
dfa->has_mb_node = dfa->nbackref > 0 || has_period;
|
2003-11-12 19:09:20 +00:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Analyze the structure tree, and calculate "first", "next", "edest",
|
|
|
|
|
"eclosure", and "inveclosure". */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
|
|
|
|
analyze (dfa)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
reg_errcode_t ret;
|
|
|
|
|
|
|
|
|
|
/* Allocate arrays. */
|
|
|
|
|
dfa->nexts = re_malloc (int, dfa->nodes_alloc);
|
2002-12-17 10:58:04 +00:00
|
|
|
|
dfa->org_indices = re_malloc (int, dfa->nodes_alloc);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
dfa->edests = re_malloc (re_node_set, dfa->nodes_alloc);
|
|
|
|
|
dfa->eclosures = re_malloc (re_node_set, dfa->nodes_alloc);
|
|
|
|
|
dfa->inveclosures = re_malloc (re_node_set, dfa->nodes_alloc);
|
2002-12-17 10:58:04 +00:00
|
|
|
|
if (BE (dfa->nexts == NULL || dfa->org_indices == NULL || dfa->edests == NULL
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|| dfa->eclosures == NULL || dfa->inveclosures == NULL, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
/* Initialize them. */
|
|
|
|
|
for (i = 0; i < dfa->nodes_len; ++i)
|
|
|
|
|
{
|
|
|
|
|
dfa->nexts[i] = -1;
|
|
|
|
|
re_node_set_init_empty (dfa->edests + i);
|
|
|
|
|
re_node_set_init_empty (dfa->eclosures + i);
|
|
|
|
|
re_node_set_init_empty (dfa->inveclosures + i);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = analyze_tree (dfa, dfa->str_tree);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (ret == REG_NOERROR, 1))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
ret = calc_eclosure (dfa);
|
|
|
|
|
if (ret == REG_NOERROR)
|
|
|
|
|
calc_inveclosure (dfa);
|
|
|
|
|
}
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper functions for analyze.
|
|
|
|
|
This function calculate "first", "next", and "edest" for the subtree
|
|
|
|
|
whose root is NODE. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
|
|
|
|
analyze_tree (dfa, node)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
bin_tree_t *node;
|
|
|
|
|
{
|
|
|
|
|
reg_errcode_t ret;
|
|
|
|
|
if (node->first == -1)
|
|
|
|
|
calc_first (dfa, node);
|
|
|
|
|
if (node->next == -1)
|
|
|
|
|
calc_next (dfa, node);
|
|
|
|
|
if (node->eclosure.nelem == 0)
|
|
|
|
|
calc_epsdest (dfa, node);
|
|
|
|
|
/* Calculate "first" etc. for the left child. */
|
|
|
|
|
if (node->left != NULL)
|
|
|
|
|
{
|
|
|
|
|
ret = analyze_tree (dfa, node->left);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (ret != REG_NOERROR, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return ret;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
/* Calculate "first" etc. for the right child. */
|
|
|
|
|
if (node->right != NULL)
|
|
|
|
|
{
|
|
|
|
|
ret = analyze_tree (dfa, node->right);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (ret != REG_NOERROR, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return ret;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Calculate "first" for the node NODE. */
|
|
|
|
|
static void
|
|
|
|
|
calc_first (dfa, node)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
bin_tree_t *node;
|
|
|
|
|
{
|
|
|
|
|
int idx, type;
|
|
|
|
|
idx = node->node_idx;
|
|
|
|
|
type = (node->type == 0) ? dfa->nodes[idx].type : node->type;
|
|
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
|
{
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
case OP_OPEN_BRACKET:
|
|
|
|
|
case OP_CLOSE_BRACKET:
|
|
|
|
|
case OP_OPEN_DUP_NUM:
|
|
|
|
|
case OP_CLOSE_DUP_NUM:
|
2003-12-27 23:40:06 +00:00
|
|
|
|
case OP_DUP_PLUS:
|
2002-02-26 19:06:03 +00:00
|
|
|
|
case OP_NON_MATCH_LIST:
|
|
|
|
|
case OP_OPEN_COLL_ELEM:
|
|
|
|
|
case OP_CLOSE_COLL_ELEM:
|
|
|
|
|
case OP_OPEN_EQUIV_CLASS:
|
|
|
|
|
case OP_CLOSE_EQUIV_CLASS:
|
|
|
|
|
case OP_OPEN_CHAR_CLASS:
|
|
|
|
|
case OP_CLOSE_CHAR_CLASS:
|
2003-12-22 06:45:04 +00:00
|
|
|
|
/* These must not appear here. */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
assert (0);
|
|
|
|
|
#endif
|
|
|
|
|
case END_OF_RE:
|
|
|
|
|
case CHARACTER:
|
|
|
|
|
case OP_PERIOD:
|
|
|
|
|
case OP_DUP_ASTERISK:
|
|
|
|
|
case OP_DUP_QUESTION:
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2003-11-18 23:40:59 +00:00
|
|
|
|
case OP_UTF8_PERIOD:
|
2002-02-26 19:06:03 +00:00
|
|
|
|
case COMPLEX_BRACKET:
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
case SIMPLE_BRACKET:
|
|
|
|
|
case OP_BACK_REF:
|
|
|
|
|
case ANCHOR:
|
2002-07-10 23:09:16 +00:00
|
|
|
|
case OP_OPEN_SUBEXP:
|
|
|
|
|
case OP_CLOSE_SUBEXP:
|
2002-02-26 19:06:03 +00:00
|
|
|
|
node->first = idx;
|
|
|
|
|
break;
|
|
|
|
|
case OP_ALT:
|
|
|
|
|
node->first = idx;
|
|
|
|
|
break;
|
|
|
|
|
/* else fall through */
|
|
|
|
|
default:
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
assert (node->left != NULL);
|
|
|
|
|
#endif
|
|
|
|
|
if (node->left->first == -1)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
calc_first (dfa, node->left);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
node->first = node->left->first;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Calculate "next" for the node NODE. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
calc_next (dfa, node)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
bin_tree_t *node;
|
|
|
|
|
{
|
|
|
|
|
int idx, type;
|
|
|
|
|
bin_tree_t *parent = node->parent;
|
|
|
|
|
if (parent == NULL)
|
|
|
|
|
{
|
|
|
|
|
node->next = -1;
|
|
|
|
|
idx = node->node_idx;
|
|
|
|
|
if (node->type == 0)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
dfa->nexts[idx] = node->next;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
idx = parent->node_idx;
|
|
|
|
|
type = (parent->type == 0) ? dfa->nodes[idx].type : parent->type;
|
|
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
|
{
|
|
|
|
|
case OP_DUP_ASTERISK:
|
|
|
|
|
node->next = idx;
|
|
|
|
|
break;
|
|
|
|
|
case CONCAT:
|
|
|
|
|
if (parent->left == node)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
if (parent->right->first == -1)
|
|
|
|
|
calc_first (dfa, parent->right);
|
|
|
|
|
node->next = parent->right->first;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* else fall through */
|
|
|
|
|
default:
|
|
|
|
|
if (parent->next == -1)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
calc_next (dfa, parent);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
node->next = parent->next;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
idx = node->node_idx;
|
|
|
|
|
if (node->type == 0)
|
|
|
|
|
dfa->nexts[idx] = node->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Calculate "edest" for the node NODE. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
calc_epsdest (dfa, node)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
bin_tree_t *node;
|
|
|
|
|
{
|
|
|
|
|
int idx;
|
|
|
|
|
idx = node->node_idx;
|
|
|
|
|
if (node->type == 0)
|
|
|
|
|
{
|
|
|
|
|
if (dfa->nodes[idx].type == OP_DUP_ASTERISK
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|| dfa->nodes[idx].type == OP_DUP_QUESTION)
|
|
|
|
|
{
|
|
|
|
|
if (node->left->first == -1)
|
|
|
|
|
calc_first (dfa, node->left);
|
|
|
|
|
if (node->next == -1)
|
|
|
|
|
calc_next (dfa, node);
|
|
|
|
|
re_node_set_init_2 (dfa->edests + idx, node->left->first,
|
|
|
|
|
node->next);
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else if (dfa->nodes[idx].type == OP_ALT)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
int left, right;
|
|
|
|
|
if (node->left != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (node->left->first == -1)
|
|
|
|
|
calc_first (dfa, node->left);
|
|
|
|
|
left = node->left->first;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (node->next == -1)
|
|
|
|
|
calc_next (dfa, node);
|
|
|
|
|
left = node->next;
|
|
|
|
|
}
|
|
|
|
|
if (node->right != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (node->right->first == -1)
|
|
|
|
|
calc_first (dfa, node->right);
|
|
|
|
|
right = node->right->first;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (node->next == -1)
|
|
|
|
|
calc_next (dfa, node);
|
|
|
|
|
right = node->next;
|
|
|
|
|
}
|
|
|
|
|
re_node_set_init_2 (dfa->edests + idx, left, right);
|
|
|
|
|
}
|
2002-07-10 23:09:16 +00:00
|
|
|
|
else if (dfa->nodes[idx].type == ANCHOR
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|| dfa->nodes[idx].type == OP_OPEN_SUBEXP
|
|
|
|
|
|| dfa->nodes[idx].type == OP_CLOSE_SUBEXP
|
|
|
|
|
|| dfa->nodes[idx].type == OP_BACK_REF)
|
|
|
|
|
re_node_set_init_1 (dfa->edests + idx, node->next);
|
2003-10-15 05:47:36 +00:00
|
|
|
|
else
|
|
|
|
|
assert (!IS_EPSILON_NODE (dfa->nodes[idx].type));
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-12 08:34:26 +00:00
|
|
|
|
/* Duplicate the epsilon closure of the node ROOT_NODE.
|
|
|
|
|
Note that duplicated nodes have constraint INIT_CONSTRAINT in addition
|
|
|
|
|
to their own constraint. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
|
|
|
|
duplicate_node_closure (dfa, top_org_node, top_clone_node, root_node,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
init_constraint)
|
2002-10-12 08:34:26 +00:00
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
int top_org_node, top_clone_node, root_node;
|
|
|
|
|
unsigned int init_constraint;
|
|
|
|
|
{
|
|
|
|
|
reg_errcode_t err;
|
|
|
|
|
int org_node, clone_node, ret;
|
|
|
|
|
unsigned int constraint = init_constraint;
|
|
|
|
|
for (org_node = top_org_node, clone_node = top_clone_node;;)
|
|
|
|
|
{
|
|
|
|
|
int org_dest, clone_dest;
|
|
|
|
|
if (dfa->nodes[org_node].type == OP_BACK_REF)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2002-10-12 08:34:26 +00:00
|
|
|
|
/* If the back reference epsilon-transit, its destination must
|
|
|
|
|
also have the constraint. Then duplicate the epsilon closure
|
|
|
|
|
of the destination of the back reference, and store it in
|
|
|
|
|
edests of the back reference. */
|
2002-11-06 20:36:47 +00:00
|
|
|
|
org_dest = dfa->nexts[org_node];
|
|
|
|
|
re_node_set_empty (dfa->edests + clone_node);
|
|
|
|
|
err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
|
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
|
|
|
|
return err;
|
|
|
|
|
dfa->nexts[clone_node] = dfa->nexts[org_node];
|
|
|
|
|
ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
|
|
|
|
|
if (BE (ret < 0, 0))
|
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
}
|
2002-10-12 08:34:26 +00:00
|
|
|
|
else if (dfa->edests[org_node].nelem == 0)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2002-10-12 08:34:26 +00:00
|
|
|
|
/* In case of the node can't epsilon-transit, don't duplicate the
|
|
|
|
|
destination and store the original destination as the
|
|
|
|
|
destination of the node. */
|
2002-11-06 20:36:47 +00:00
|
|
|
|
dfa->nexts[clone_node] = dfa->nexts[org_node];
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-10-12 08:34:26 +00:00
|
|
|
|
else if (dfa->edests[org_node].nelem == 1)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2002-10-12 08:34:26 +00:00
|
|
|
|
/* In case of the node can epsilon-transit, and it has only one
|
|
|
|
|
destination. */
|
2002-11-06 20:36:47 +00:00
|
|
|
|
org_dest = dfa->edests[org_node].elems[0];
|
|
|
|
|
re_node_set_empty (dfa->edests + clone_node);
|
|
|
|
|
if (dfa->nodes[org_node].type == ANCHOR)
|
|
|
|
|
{
|
2002-10-12 08:34:26 +00:00
|
|
|
|
/* In case of the node has another constraint, append it. */
|
2002-11-06 20:36:47 +00:00
|
|
|
|
if (org_node == root_node && clone_node != org_node)
|
|
|
|
|
{
|
2002-10-12 08:34:26 +00:00
|
|
|
|
/* ...but if the node is root_node itself, it means the
|
|
|
|
|
epsilon closure have a loop, then tie it to the
|
|
|
|
|
destination of the root_node. */
|
2002-11-06 20:36:47 +00:00
|
|
|
|
ret = re_node_set_insert (dfa->edests + clone_node,
|
|
|
|
|
org_dest);
|
|
|
|
|
if (BE (ret < 0, 0))
|
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
constraint |= dfa->nodes[org_node].opr.ctx_type;
|
|
|
|
|
}
|
|
|
|
|
err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
|
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
|
|
|
|
return err;
|
|
|
|
|
ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
|
|
|
|
|
if (BE (ret < 0, 0))
|
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
}
|
2002-10-12 08:34:26 +00:00
|
|
|
|
else /* dfa->edests[org_node].nelem == 2 */
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2002-10-12 08:34:26 +00:00
|
|
|
|
/* In case of the node can epsilon-transit, and it has two
|
2002-12-17 10:58:04 +00:00
|
|
|
|
destinations. E.g. '|', '*', '+', '?'. */
|
2002-11-06 20:36:47 +00:00
|
|
|
|
org_dest = dfa->edests[org_node].elems[0];
|
|
|
|
|
re_node_set_empty (dfa->edests + clone_node);
|
2002-12-17 10:58:04 +00:00
|
|
|
|
/* Search for a duplicated node which satisfies the constraint. */
|
|
|
|
|
clone_dest = search_duplicated_node (dfa, org_dest, constraint);
|
|
|
|
|
if (clone_dest == -1)
|
|
|
|
|
{
|
|
|
|
|
/* There are no such a duplicated node, create a new one. */
|
|
|
|
|
err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
|
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
|
|
|
|
return err;
|
2003-12-22 06:45:04 +00:00
|
|
|
|
ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
|
|
|
|
|
if (BE (ret < 0, 0))
|
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
err = duplicate_node_closure (dfa, org_dest, clone_dest,
|
|
|
|
|
root_node, constraint);
|
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
|
|
|
|
return err;
|
2002-12-17 10:58:04 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* There are a duplicated node which satisfy the constraint,
|
|
|
|
|
use it to avoid infinite loop. */
|
|
|
|
|
ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
|
|
|
|
|
if (BE (ret < 0, 0))
|
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
}
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|
|
|
|
|
org_dest = dfa->edests[org_node].elems[1];
|
|
|
|
|
err = duplicate_node (&clone_dest, dfa, org_dest, constraint);
|
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
|
|
|
|
return err;
|
|
|
|
|
ret = re_node_set_insert (dfa->edests + clone_node, clone_dest);
|
|
|
|
|
if (BE (ret < 0, 0))
|
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
}
|
2002-10-12 08:34:26 +00:00
|
|
|
|
org_node = org_dest;
|
|
|
|
|
clone_node = clone_dest;
|
|
|
|
|
}
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2002-12-17 10:58:04 +00:00
|
|
|
|
/* Search for a node which is duplicated from the node ORG_NODE, and
|
|
|
|
|
satisfies the constraint CONSTRAINT. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
search_duplicated_node (dfa, org_node, constraint)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
int org_node;
|
|
|
|
|
unsigned int constraint;
|
|
|
|
|
{
|
|
|
|
|
int idx;
|
|
|
|
|
for (idx = dfa->nodes_len - 1; dfa->nodes[idx].duplicated && idx > 0; --idx)
|
|
|
|
|
{
|
|
|
|
|
if (org_node == dfa->org_indices[idx]
|
|
|
|
|
&& constraint == dfa->nodes[idx].constraint)
|
|
|
|
|
return idx; /* Found. */
|
|
|
|
|
}
|
|
|
|
|
return -1; /* Not found. */
|
|
|
|
|
}
|
|
|
|
|
|
2002-02-28 07:43:13 +00:00
|
|
|
|
/* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT.
|
|
|
|
|
The new index will be stored in NEW_IDX and return REG_NOERROR if succeeded,
|
|
|
|
|
otherwise return the error code. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
|
|
|
|
duplicate_node (new_idx, dfa, org_idx, constraint)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_dfa_t *dfa;
|
2002-02-28 07:43:13 +00:00
|
|
|
|
int *new_idx, org_idx;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
unsigned int constraint;
|
|
|
|
|
{
|
2003-12-22 06:45:04 +00:00
|
|
|
|
int dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx], 1);
|
2002-10-12 08:34:26 +00:00
|
|
|
|
if (BE (dup_idx == -1, 0))
|
2002-02-28 07:43:13 +00:00
|
|
|
|
return REG_ESPACE;
|
2002-10-12 08:34:26 +00:00
|
|
|
|
dfa->nodes[dup_idx].constraint = constraint;
|
|
|
|
|
if (dfa->nodes[org_idx].type == ANCHOR)
|
|
|
|
|
dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].opr.ctx_type;
|
2002-02-28 07:43:13 +00:00
|
|
|
|
dfa->nodes[dup_idx].duplicated = 1;
|
2002-10-12 08:34:26 +00:00
|
|
|
|
re_node_set_init_empty (dfa->edests + dup_idx);
|
|
|
|
|
re_node_set_init_empty (dfa->eclosures + dup_idx);
|
|
|
|
|
re_node_set_init_empty (dfa->inveclosures + dup_idx);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
2002-12-17 10:58:04 +00:00
|
|
|
|
/* Store the index of the original node. */
|
|
|
|
|
dfa->org_indices[dup_idx] = org_idx;
|
2002-02-28 07:43:13 +00:00
|
|
|
|
*new_idx = dup_idx;
|
|
|
|
|
return REG_NOERROR;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
calc_inveclosure (dfa)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
{
|
2002-10-12 08:34:26 +00:00
|
|
|
|
int src, idx, dest;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
for (src = 0; src < dfa->nodes_len; ++src)
|
|
|
|
|
{
|
|
|
|
|
for (idx = 0; idx < dfa->eclosures[src].nelem; ++idx)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
dest = dfa->eclosures[src].elems[idx];
|
|
|
|
|
re_node_set_insert (dfa->inveclosures + dest, src);
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Calculate "eclosure" for all the node in DFA. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
|
|
|
|
calc_eclosure (dfa)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
{
|
2002-10-12 08:34:26 +00:00
|
|
|
|
int node_idx, incomplete;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
assert (dfa->nodes_len > 0);
|
|
|
|
|
#endif
|
2002-10-12 08:34:26 +00:00
|
|
|
|
incomplete = 0;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* For each nodes, calculate epsilon closure. */
|
2002-10-12 08:34:26 +00:00
|
|
|
|
for (node_idx = 0; ; ++node_idx)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
2002-02-28 07:43:13 +00:00
|
|
|
|
reg_errcode_t err;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_node_set eclosure_elem;
|
2002-10-12 08:34:26 +00:00
|
|
|
|
if (node_idx == dfa->nodes_len)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
if (!incomplete)
|
|
|
|
|
break;
|
|
|
|
|
incomplete = 0;
|
|
|
|
|
node_idx = 0;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
assert (dfa->eclosures[node_idx].nelem != -1);
|
|
|
|
|
#endif
|
|
|
|
|
/* If we have already calculated, skip it. */
|
|
|
|
|
if (dfa->eclosures[node_idx].nelem != 0)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
continue;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Calculate epsilon closure of `node_idx'. */
|
2002-02-28 07:43:13 +00:00
|
|
|
|
err = calc_eclosure_iter (&eclosure_elem, dfa, node_idx, 1);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return err;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
if (dfa->eclosures[node_idx].nelem == 0)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
incomplete = 1;
|
|
|
|
|
re_node_set_free (&eclosure_elem);
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Calculate epsilon closure of NODE. */
|
|
|
|
|
|
2002-02-28 07:43:13 +00:00
|
|
|
|
static reg_errcode_t
|
|
|
|
|
calc_eclosure_iter (new_set, dfa, node, root)
|
|
|
|
|
re_node_set *new_set;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
int node, root;
|
|
|
|
|
{
|
2002-02-28 07:43:13 +00:00
|
|
|
|
reg_errcode_t err;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
unsigned int constraint;
|
2002-10-12 08:34:26 +00:00
|
|
|
|
int i, incomplete;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_node_set eclosure;
|
2002-10-12 08:34:26 +00:00
|
|
|
|
incomplete = 0;
|
2002-02-28 07:43:13 +00:00
|
|
|
|
err = re_node_set_alloc (&eclosure, dfa->edests[node].nelem + 1);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
2002-02-28 07:43:13 +00:00
|
|
|
|
return err;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
/* This indicates that we are calculating this node now.
|
|
|
|
|
We reference this value to avoid infinite loop. */
|
|
|
|
|
dfa->eclosures[node].nelem = -1;
|
|
|
|
|
|
|
|
|
|
constraint = ((dfa->nodes[node].type == ANCHOR)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
? dfa->nodes[node].opr.ctx_type : 0);
|
2002-10-12 08:34:26 +00:00
|
|
|
|
/* If the current node has constraints, duplicate all nodes.
|
|
|
|
|
Since they must inherit the constraints. */
|
|
|
|
|
if (constraint && !dfa->nodes[dfa->edests[node].elems[0]].duplicated)
|
|
|
|
|
{
|
|
|
|
|
int org_node, cur_node;
|
|
|
|
|
org_node = cur_node = node;
|
|
|
|
|
err = duplicate_node_closure (dfa, node, node, node, constraint);
|
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return err;
|
2002-10-12 08:34:26 +00:00
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
/* Expand each epsilon destination nodes. */
|
2002-10-12 08:34:26 +00:00
|
|
|
|
if (IS_EPSILON_NODE(dfa->nodes[node].type))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
for (i = 0; i < dfa->edests[node].nelem; ++i)
|
|
|
|
|
{
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_node_set eclosure_elem;
|
|
|
|
|
int edest = dfa->edests[node].elems[i];
|
|
|
|
|
/* If calculating the epsilon closure of `edest' is in progress,
|
|
|
|
|
return intermediate result. */
|
|
|
|
|
if (dfa->eclosures[edest].nelem == -1)
|
|
|
|
|
{
|
|
|
|
|
incomplete = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
/* If we haven't calculated the epsilon closure of `edest' yet,
|
|
|
|
|
calculate now. Otherwise use calculated epsilon closure. */
|
|
|
|
|
if (dfa->eclosures[edest].nelem == 0)
|
|
|
|
|
{
|
|
|
|
|
err = calc_eclosure_iter (&eclosure_elem, dfa, edest, 0);
|
|
|
|
|
if (BE (err != REG_NOERROR, 0))
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
eclosure_elem = dfa->eclosures[edest];
|
|
|
|
|
/* Merge the epsilon closure of `edest'. */
|
|
|
|
|
re_node_set_merge (&eclosure, &eclosure_elem);
|
|
|
|
|
/* If the epsilon closure of `edest' is incomplete,
|
|
|
|
|
the epsilon closure of this node is also incomplete. */
|
|
|
|
|
if (dfa->eclosures[edest].nelem == 0)
|
|
|
|
|
{
|
|
|
|
|
incomplete = 1;
|
|
|
|
|
re_node_set_free (&eclosure_elem);
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Epsilon closures include itself. */
|
|
|
|
|
re_node_set_insert (&eclosure, node);
|
|
|
|
|
if (incomplete && !root)
|
|
|
|
|
dfa->eclosures[node].nelem = 0;
|
|
|
|
|
else
|
|
|
|
|
dfa->eclosures[node] = eclosure;
|
2002-02-28 07:43:13 +00:00
|
|
|
|
*new_set = eclosure;
|
|
|
|
|
return REG_NOERROR;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Functions for token which are used in the parser. */
|
|
|
|
|
|
|
|
|
|
/* Fetch a token from INPUT.
|
|
|
|
|
We must not use this function inside bracket expressions. */
|
|
|
|
|
|
2003-11-21 23:42:18 +00:00
|
|
|
|
static void
|
|
|
|
|
fetch_token (result, input, syntax)
|
|
|
|
|
re_token_t *result;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_string_t *input;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
{
|
2003-11-21 23:42:18 +00:00
|
|
|
|
re_string_skip_bytes (input, peek_token (result, input, syntax));
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Peek a token from INPUT, and return the length of the token.
|
|
|
|
|
We must not use this function inside bracket expressions. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
peek_token (token, input, syntax)
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
re_string_t *input;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
{
|
|
|
|
|
unsigned char c;
|
|
|
|
|
|
|
|
|
|
if (re_string_eoi (input))
|
|
|
|
|
{
|
|
|
|
|
token->type = END_OF_RE;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
c = re_string_peek_byte (input, 0);
|
|
|
|
|
token->opr.c = c;
|
|
|
|
|
|
2003-11-24 19:30:51 +00:00
|
|
|
|
token->word_char = 0;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
token->mb_partial = 0;
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
if (input->mb_cur_max > 1 &&
|
2002-02-26 19:06:03 +00:00
|
|
|
|
!re_string_first_byte (input, re_string_cur_idx (input)))
|
|
|
|
|
{
|
|
|
|
|
token->type = CHARACTER;
|
|
|
|
|
token->mb_partial = 1;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
if (c == '\\')
|
|
|
|
|
{
|
|
|
|
|
unsigned char c2;
|
|
|
|
|
if (re_string_cur_idx (input) + 1 >= re_string_length (input))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
token->type = BACK_SLASH;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
c2 = re_string_peek_byte_case (input, 1);
|
|
|
|
|
token->opr.c = c2;
|
|
|
|
|
token->type = CHARACTER;
|
2003-11-24 19:30:51 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
if (input->mb_cur_max > 1)
|
|
|
|
|
{
|
|
|
|
|
wint_t wc = re_string_wchar_at (input,
|
|
|
|
|
re_string_cur_idx (input) + 1);
|
|
|
|
|
token->word_char = IS_WIDE_WORD_CHAR (wc) != 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
token->word_char = IS_WORD_CHAR (c2) != 0;
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
switch (c2)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
case '|':
|
|
|
|
|
if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_NO_BK_VBAR))
|
|
|
|
|
token->type = OP_ALT;
|
|
|
|
|
break;
|
|
|
|
|
case '1': case '2': case '3': case '4': case '5':
|
|
|
|
|
case '6': case '7': case '8': case '9':
|
|
|
|
|
if (!(syntax & RE_NO_BK_REFS))
|
|
|
|
|
{
|
|
|
|
|
token->type = OP_BACK_REF;
|
|
|
|
|
token->opr.idx = c2 - '0';
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case '<':
|
|
|
|
|
if (!(syntax & RE_NO_GNU_OPS))
|
|
|
|
|
{
|
|
|
|
|
token->type = ANCHOR;
|
Update.
2003-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/fpu/libm-test-ulps: Add some more minor changes
to compensate other setup.
2003-11-27 Andreas Jaeger <aj@suse.de>
* sysdeps/x86_64/fpu/libm-test-ulps: Add ulps for new atan2 test.
* math/libm-test.inc (atan2_test): Add test that run infinitly.
Reported by "Willus" <etc231etc231@willus.com>.
2003-11-27 Michael Matz <matz@suse.de>
* sysdeps/ieee754/dbl-64/mpsqrt.c (fastiroot): Fix 64-bit problem
with wrong types.
2003-11-28 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (acquire_init_state_context): Make inline.
Add always_inline attribute.
(check_matching): Add BE macro. Move if (cur_state->has_backref)
into if (dfa->nbackref).
(sift_states_backward): Fix comment.
(transit_state): Add BE macro. Move if (next_state->has_backref)
into if (dfa->nbackref && next_state). Don't check for next_state
!= NULL twice.
* posix/regcomp.c (peek_token): Use opr.ctx_type instead of opr.idx
for ANCHOR.
(parse_expression): Only call init_word_char if word context will be
needed.
* posix/bug-regex11.c (tests): Add new tests.
* posix/tst-regex.c: Include getopt.h.
(timing): New variable.
(main): Set timing to 1 if --timing argument is present.
Add 2 new tests.
(run_test, run_test_backwards): Handle timing.
2003-11-27 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (re_string_t): Remove mbs_case field.
Add offsets, valid_raw_len, raw_len, raw_stop, mbs_allocated and
offsets_needed fields. Change icase, is_utf8 and map_notascii
type from int bitfield to unsigned char.
(MBS_ALLOCATED, MBS_CASE_ALLOCATED): Remove.
(build_wcs_upper_buffer): Change prototype to return int.
(re_string_peek_byte_case, re_string_fetch_byte_case): Remove
defines, add prototypes.
* posix/regex_internal.c (re_string_allocate): Don't initialize
stop here. Don't initialize mbs_case. Set valid_raw_len.
Use mbs_allocated instead of MBS_* macros.
(re_string_construct): Don't initialize stop and valid_len here.
Don't initialize mbs_case. Use mbs_allocated instead of MBS_*
macros. Reallocate buffers if build_wcs_upper_buffer converted
too few bytes. Set valid_len to bufs_len only for single byte
no translation and set in that case valid_raw_len as well.
(re_string_realloc_buffers): Reallocate offsets if not NULL.
Use mbs_allocated instead of MBS_ALLOCATED. Don't reallocate
mbs_case.
(re_string_construct_common): Initialize raw_len, mbs_allocated,
stop and raw_stop.
(build_wcs_buffer): Apply pstr->trans before mbrtowc instead of
after it. Set valid_raw_len. Don't set mbs_case.
(build_wcs_upper_buffer): Return REG_NOERROR or REG_ESPACE.
Only use the fast path if !pstr->offsets_needed. Apply pstr->trans
before mbrtowc instead of after it. If upper case character
uses different number of bytes than lower case, goto to the
slow path. Don't call towupper unnecessarily twice. Set
valid_raw_len as well. Handle in the slow path the case if
lower and upper case use different number of characters.
Don't set mbs_case.
(re_string_skip_chars): Use valid_raw_len instead of valid_len.
(build_upper_buffer): Don't set mbs_case. Add BE macro. Set
valid_raw_len.
(re_string_translate_buffer): Set mbs instead of mbs_case. Set
valid_raw_len.
(re_string_reconstruct): Use raw_len/raw_stop to initialize
len/stop. Clear valid_raw_len and offsets_needed when clearing
valid_len. Use mbs_allocated instead of MBS_* macros.
Check original offset against valid_raw_len instead of valid_len.
Remove mbs_case handling. Adjust valid_raw_len together with
valid_len. If is_utf8 and looking for tip context, apply
pstr->trans first. If buffers start with partial multi-byte
character, initialize mbs array as well if mbs_allocated.
Check return value of build_wcs_upper_buffer.
(re_string_peek_byte_case): New function.
(re_string_fetch_byte_case): New function.
(re_string_destruct): Use mbs_allocated instead of MBS_ALLOCATED.
Don't free mbs_case. Free offsets.
* posix/regcomp.c (init_dfa): Only check if charset name is UTF-8
if mb_cur_max == 6.
* posix/regexec.c (re_search_internal): Initialize input.raw_stop
as well. Use valid_raw_len instead of valid_len when looking
through fastmap. Adjust registers through input.offsets.
(extend_buffers): Allow build_wcs_upper_buffer to fail.
* posix/bug-regex18.c (tests): Enable #ifdefed out tests. Add new
tests.
2003-11-29 06:13:09 +00:00
|
|
|
|
token->opr.ctx_type = WORD_FIRST;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case '>':
|
|
|
|
|
if (!(syntax & RE_NO_GNU_OPS))
|
|
|
|
|
{
|
|
|
|
|
token->type = ANCHOR;
|
Update.
2003-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/fpu/libm-test-ulps: Add some more minor changes
to compensate other setup.
2003-11-27 Andreas Jaeger <aj@suse.de>
* sysdeps/x86_64/fpu/libm-test-ulps: Add ulps for new atan2 test.
* math/libm-test.inc (atan2_test): Add test that run infinitly.
Reported by "Willus" <etc231etc231@willus.com>.
2003-11-27 Michael Matz <matz@suse.de>
* sysdeps/ieee754/dbl-64/mpsqrt.c (fastiroot): Fix 64-bit problem
with wrong types.
2003-11-28 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (acquire_init_state_context): Make inline.
Add always_inline attribute.
(check_matching): Add BE macro. Move if (cur_state->has_backref)
into if (dfa->nbackref).
(sift_states_backward): Fix comment.
(transit_state): Add BE macro. Move if (next_state->has_backref)
into if (dfa->nbackref && next_state). Don't check for next_state
!= NULL twice.
* posix/regcomp.c (peek_token): Use opr.ctx_type instead of opr.idx
for ANCHOR.
(parse_expression): Only call init_word_char if word context will be
needed.
* posix/bug-regex11.c (tests): Add new tests.
* posix/tst-regex.c: Include getopt.h.
(timing): New variable.
(main): Set timing to 1 if --timing argument is present.
Add 2 new tests.
(run_test, run_test_backwards): Handle timing.
2003-11-27 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (re_string_t): Remove mbs_case field.
Add offsets, valid_raw_len, raw_len, raw_stop, mbs_allocated and
offsets_needed fields. Change icase, is_utf8 and map_notascii
type from int bitfield to unsigned char.
(MBS_ALLOCATED, MBS_CASE_ALLOCATED): Remove.
(build_wcs_upper_buffer): Change prototype to return int.
(re_string_peek_byte_case, re_string_fetch_byte_case): Remove
defines, add prototypes.
* posix/regex_internal.c (re_string_allocate): Don't initialize
stop here. Don't initialize mbs_case. Set valid_raw_len.
Use mbs_allocated instead of MBS_* macros.
(re_string_construct): Don't initialize stop and valid_len here.
Don't initialize mbs_case. Use mbs_allocated instead of MBS_*
macros. Reallocate buffers if build_wcs_upper_buffer converted
too few bytes. Set valid_len to bufs_len only for single byte
no translation and set in that case valid_raw_len as well.
(re_string_realloc_buffers): Reallocate offsets if not NULL.
Use mbs_allocated instead of MBS_ALLOCATED. Don't reallocate
mbs_case.
(re_string_construct_common): Initialize raw_len, mbs_allocated,
stop and raw_stop.
(build_wcs_buffer): Apply pstr->trans before mbrtowc instead of
after it. Set valid_raw_len. Don't set mbs_case.
(build_wcs_upper_buffer): Return REG_NOERROR or REG_ESPACE.
Only use the fast path if !pstr->offsets_needed. Apply pstr->trans
before mbrtowc instead of after it. If upper case character
uses different number of bytes than lower case, goto to the
slow path. Don't call towupper unnecessarily twice. Set
valid_raw_len as well. Handle in the slow path the case if
lower and upper case use different number of characters.
Don't set mbs_case.
(re_string_skip_chars): Use valid_raw_len instead of valid_len.
(build_upper_buffer): Don't set mbs_case. Add BE macro. Set
valid_raw_len.
(re_string_translate_buffer): Set mbs instead of mbs_case. Set
valid_raw_len.
(re_string_reconstruct): Use raw_len/raw_stop to initialize
len/stop. Clear valid_raw_len and offsets_needed when clearing
valid_len. Use mbs_allocated instead of MBS_* macros.
Check original offset against valid_raw_len instead of valid_len.
Remove mbs_case handling. Adjust valid_raw_len together with
valid_len. If is_utf8 and looking for tip context, apply
pstr->trans first. If buffers start with partial multi-byte
character, initialize mbs array as well if mbs_allocated.
Check return value of build_wcs_upper_buffer.
(re_string_peek_byte_case): New function.
(re_string_fetch_byte_case): New function.
(re_string_destruct): Use mbs_allocated instead of MBS_ALLOCATED.
Don't free mbs_case. Free offsets.
* posix/regcomp.c (init_dfa): Only check if charset name is UTF-8
if mb_cur_max == 6.
* posix/regexec.c (re_search_internal): Initialize input.raw_stop
as well. Use valid_raw_len instead of valid_len when looking
through fastmap. Adjust registers through input.offsets.
(extend_buffers): Allow build_wcs_upper_buffer to fail.
* posix/bug-regex18.c (tests): Enable #ifdefed out tests. Add new
tests.
2003-11-29 06:13:09 +00:00
|
|
|
|
token->opr.ctx_type = WORD_LAST;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'b':
|
|
|
|
|
if (!(syntax & RE_NO_GNU_OPS))
|
|
|
|
|
{
|
|
|
|
|
token->type = ANCHOR;
|
Update.
2003-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/fpu/libm-test-ulps: Add some more minor changes
to compensate other setup.
2003-11-27 Andreas Jaeger <aj@suse.de>
* sysdeps/x86_64/fpu/libm-test-ulps: Add ulps for new atan2 test.
* math/libm-test.inc (atan2_test): Add test that run infinitly.
Reported by "Willus" <etc231etc231@willus.com>.
2003-11-27 Michael Matz <matz@suse.de>
* sysdeps/ieee754/dbl-64/mpsqrt.c (fastiroot): Fix 64-bit problem
with wrong types.
2003-11-28 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (acquire_init_state_context): Make inline.
Add always_inline attribute.
(check_matching): Add BE macro. Move if (cur_state->has_backref)
into if (dfa->nbackref).
(sift_states_backward): Fix comment.
(transit_state): Add BE macro. Move if (next_state->has_backref)
into if (dfa->nbackref && next_state). Don't check for next_state
!= NULL twice.
* posix/regcomp.c (peek_token): Use opr.ctx_type instead of opr.idx
for ANCHOR.
(parse_expression): Only call init_word_char if word context will be
needed.
* posix/bug-regex11.c (tests): Add new tests.
* posix/tst-regex.c: Include getopt.h.
(timing): New variable.
(main): Set timing to 1 if --timing argument is present.
Add 2 new tests.
(run_test, run_test_backwards): Handle timing.
2003-11-27 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (re_string_t): Remove mbs_case field.
Add offsets, valid_raw_len, raw_len, raw_stop, mbs_allocated and
offsets_needed fields. Change icase, is_utf8 and map_notascii
type from int bitfield to unsigned char.
(MBS_ALLOCATED, MBS_CASE_ALLOCATED): Remove.
(build_wcs_upper_buffer): Change prototype to return int.
(re_string_peek_byte_case, re_string_fetch_byte_case): Remove
defines, add prototypes.
* posix/regex_internal.c (re_string_allocate): Don't initialize
stop here. Don't initialize mbs_case. Set valid_raw_len.
Use mbs_allocated instead of MBS_* macros.
(re_string_construct): Don't initialize stop and valid_len here.
Don't initialize mbs_case. Use mbs_allocated instead of MBS_*
macros. Reallocate buffers if build_wcs_upper_buffer converted
too few bytes. Set valid_len to bufs_len only for single byte
no translation and set in that case valid_raw_len as well.
(re_string_realloc_buffers): Reallocate offsets if not NULL.
Use mbs_allocated instead of MBS_ALLOCATED. Don't reallocate
mbs_case.
(re_string_construct_common): Initialize raw_len, mbs_allocated,
stop and raw_stop.
(build_wcs_buffer): Apply pstr->trans before mbrtowc instead of
after it. Set valid_raw_len. Don't set mbs_case.
(build_wcs_upper_buffer): Return REG_NOERROR or REG_ESPACE.
Only use the fast path if !pstr->offsets_needed. Apply pstr->trans
before mbrtowc instead of after it. If upper case character
uses different number of bytes than lower case, goto to the
slow path. Don't call towupper unnecessarily twice. Set
valid_raw_len as well. Handle in the slow path the case if
lower and upper case use different number of characters.
Don't set mbs_case.
(re_string_skip_chars): Use valid_raw_len instead of valid_len.
(build_upper_buffer): Don't set mbs_case. Add BE macro. Set
valid_raw_len.
(re_string_translate_buffer): Set mbs instead of mbs_case. Set
valid_raw_len.
(re_string_reconstruct): Use raw_len/raw_stop to initialize
len/stop. Clear valid_raw_len and offsets_needed when clearing
valid_len. Use mbs_allocated instead of MBS_* macros.
Check original offset against valid_raw_len instead of valid_len.
Remove mbs_case handling. Adjust valid_raw_len together with
valid_len. If is_utf8 and looking for tip context, apply
pstr->trans first. If buffers start with partial multi-byte
character, initialize mbs array as well if mbs_allocated.
Check return value of build_wcs_upper_buffer.
(re_string_peek_byte_case): New function.
(re_string_fetch_byte_case): New function.
(re_string_destruct): Use mbs_allocated instead of MBS_ALLOCATED.
Don't free mbs_case. Free offsets.
* posix/regcomp.c (init_dfa): Only check if charset name is UTF-8
if mb_cur_max == 6.
* posix/regexec.c (re_search_internal): Initialize input.raw_stop
as well. Use valid_raw_len instead of valid_len when looking
through fastmap. Adjust registers through input.offsets.
(extend_buffers): Allow build_wcs_upper_buffer to fail.
* posix/bug-regex18.c (tests): Enable #ifdefed out tests. Add new
tests.
2003-11-29 06:13:09 +00:00
|
|
|
|
token->opr.ctx_type = WORD_DELIM;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'B':
|
|
|
|
|
if (!(syntax & RE_NO_GNU_OPS))
|
|
|
|
|
{
|
|
|
|
|
token->type = ANCHOR;
|
Update.
2003-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/fpu/libm-test-ulps: Add some more minor changes
to compensate other setup.
2003-11-27 Andreas Jaeger <aj@suse.de>
* sysdeps/x86_64/fpu/libm-test-ulps: Add ulps for new atan2 test.
* math/libm-test.inc (atan2_test): Add test that run infinitly.
Reported by "Willus" <etc231etc231@willus.com>.
2003-11-27 Michael Matz <matz@suse.de>
* sysdeps/ieee754/dbl-64/mpsqrt.c (fastiroot): Fix 64-bit problem
with wrong types.
2003-11-28 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (acquire_init_state_context): Make inline.
Add always_inline attribute.
(check_matching): Add BE macro. Move if (cur_state->has_backref)
into if (dfa->nbackref).
(sift_states_backward): Fix comment.
(transit_state): Add BE macro. Move if (next_state->has_backref)
into if (dfa->nbackref && next_state). Don't check for next_state
!= NULL twice.
* posix/regcomp.c (peek_token): Use opr.ctx_type instead of opr.idx
for ANCHOR.
(parse_expression): Only call init_word_char if word context will be
needed.
* posix/bug-regex11.c (tests): Add new tests.
* posix/tst-regex.c: Include getopt.h.
(timing): New variable.
(main): Set timing to 1 if --timing argument is present.
Add 2 new tests.
(run_test, run_test_backwards): Handle timing.
2003-11-27 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (re_string_t): Remove mbs_case field.
Add offsets, valid_raw_len, raw_len, raw_stop, mbs_allocated and
offsets_needed fields. Change icase, is_utf8 and map_notascii
type from int bitfield to unsigned char.
(MBS_ALLOCATED, MBS_CASE_ALLOCATED): Remove.
(build_wcs_upper_buffer): Change prototype to return int.
(re_string_peek_byte_case, re_string_fetch_byte_case): Remove
defines, add prototypes.
* posix/regex_internal.c (re_string_allocate): Don't initialize
stop here. Don't initialize mbs_case. Set valid_raw_len.
Use mbs_allocated instead of MBS_* macros.
(re_string_construct): Don't initialize stop and valid_len here.
Don't initialize mbs_case. Use mbs_allocated instead of MBS_*
macros. Reallocate buffers if build_wcs_upper_buffer converted
too few bytes. Set valid_len to bufs_len only for single byte
no translation and set in that case valid_raw_len as well.
(re_string_realloc_buffers): Reallocate offsets if not NULL.
Use mbs_allocated instead of MBS_ALLOCATED. Don't reallocate
mbs_case.
(re_string_construct_common): Initialize raw_len, mbs_allocated,
stop and raw_stop.
(build_wcs_buffer): Apply pstr->trans before mbrtowc instead of
after it. Set valid_raw_len. Don't set mbs_case.
(build_wcs_upper_buffer): Return REG_NOERROR or REG_ESPACE.
Only use the fast path if !pstr->offsets_needed. Apply pstr->trans
before mbrtowc instead of after it. If upper case character
uses different number of bytes than lower case, goto to the
slow path. Don't call towupper unnecessarily twice. Set
valid_raw_len as well. Handle in the slow path the case if
lower and upper case use different number of characters.
Don't set mbs_case.
(re_string_skip_chars): Use valid_raw_len instead of valid_len.
(build_upper_buffer): Don't set mbs_case. Add BE macro. Set
valid_raw_len.
(re_string_translate_buffer): Set mbs instead of mbs_case. Set
valid_raw_len.
(re_string_reconstruct): Use raw_len/raw_stop to initialize
len/stop. Clear valid_raw_len and offsets_needed when clearing
valid_len. Use mbs_allocated instead of MBS_* macros.
Check original offset against valid_raw_len instead of valid_len.
Remove mbs_case handling. Adjust valid_raw_len together with
valid_len. If is_utf8 and looking for tip context, apply
pstr->trans first. If buffers start with partial multi-byte
character, initialize mbs array as well if mbs_allocated.
Check return value of build_wcs_upper_buffer.
(re_string_peek_byte_case): New function.
(re_string_fetch_byte_case): New function.
(re_string_destruct): Use mbs_allocated instead of MBS_ALLOCATED.
Don't free mbs_case. Free offsets.
* posix/regcomp.c (init_dfa): Only check if charset name is UTF-8
if mb_cur_max == 6.
* posix/regexec.c (re_search_internal): Initialize input.raw_stop
as well. Use valid_raw_len instead of valid_len when looking
through fastmap. Adjust registers through input.offsets.
(extend_buffers): Allow build_wcs_upper_buffer to fail.
* posix/bug-regex18.c (tests): Enable #ifdefed out tests. Add new
tests.
2003-11-29 06:13:09 +00:00
|
|
|
|
token->opr.ctx_type = INSIDE_WORD;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'w':
|
|
|
|
|
if (!(syntax & RE_NO_GNU_OPS))
|
|
|
|
|
token->type = OP_WORD;
|
|
|
|
|
break;
|
|
|
|
|
case 'W':
|
|
|
|
|
if (!(syntax & RE_NO_GNU_OPS))
|
|
|
|
|
token->type = OP_NOTWORD;
|
|
|
|
|
break;
|
2003-09-23 05:43:03 +00:00
|
|
|
|
case 's':
|
|
|
|
|
if (!(syntax & RE_NO_GNU_OPS))
|
|
|
|
|
token->type = OP_SPACE;
|
|
|
|
|
break;
|
|
|
|
|
case 'S':
|
|
|
|
|
if (!(syntax & RE_NO_GNU_OPS))
|
|
|
|
|
token->type = OP_NOTSPACE;
|
|
|
|
|
break;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
case '`':
|
|
|
|
|
if (!(syntax & RE_NO_GNU_OPS))
|
|
|
|
|
{
|
|
|
|
|
token->type = ANCHOR;
|
Update.
2003-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/fpu/libm-test-ulps: Add some more minor changes
to compensate other setup.
2003-11-27 Andreas Jaeger <aj@suse.de>
* sysdeps/x86_64/fpu/libm-test-ulps: Add ulps for new atan2 test.
* math/libm-test.inc (atan2_test): Add test that run infinitly.
Reported by "Willus" <etc231etc231@willus.com>.
2003-11-27 Michael Matz <matz@suse.de>
* sysdeps/ieee754/dbl-64/mpsqrt.c (fastiroot): Fix 64-bit problem
with wrong types.
2003-11-28 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (acquire_init_state_context): Make inline.
Add always_inline attribute.
(check_matching): Add BE macro. Move if (cur_state->has_backref)
into if (dfa->nbackref).
(sift_states_backward): Fix comment.
(transit_state): Add BE macro. Move if (next_state->has_backref)
into if (dfa->nbackref && next_state). Don't check for next_state
!= NULL twice.
* posix/regcomp.c (peek_token): Use opr.ctx_type instead of opr.idx
for ANCHOR.
(parse_expression): Only call init_word_char if word context will be
needed.
* posix/bug-regex11.c (tests): Add new tests.
* posix/tst-regex.c: Include getopt.h.
(timing): New variable.
(main): Set timing to 1 if --timing argument is present.
Add 2 new tests.
(run_test, run_test_backwards): Handle timing.
2003-11-27 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (re_string_t): Remove mbs_case field.
Add offsets, valid_raw_len, raw_len, raw_stop, mbs_allocated and
offsets_needed fields. Change icase, is_utf8 and map_notascii
type from int bitfield to unsigned char.
(MBS_ALLOCATED, MBS_CASE_ALLOCATED): Remove.
(build_wcs_upper_buffer): Change prototype to return int.
(re_string_peek_byte_case, re_string_fetch_byte_case): Remove
defines, add prototypes.
* posix/regex_internal.c (re_string_allocate): Don't initialize
stop here. Don't initialize mbs_case. Set valid_raw_len.
Use mbs_allocated instead of MBS_* macros.
(re_string_construct): Don't initialize stop and valid_len here.
Don't initialize mbs_case. Use mbs_allocated instead of MBS_*
macros. Reallocate buffers if build_wcs_upper_buffer converted
too few bytes. Set valid_len to bufs_len only for single byte
no translation and set in that case valid_raw_len as well.
(re_string_realloc_buffers): Reallocate offsets if not NULL.
Use mbs_allocated instead of MBS_ALLOCATED. Don't reallocate
mbs_case.
(re_string_construct_common): Initialize raw_len, mbs_allocated,
stop and raw_stop.
(build_wcs_buffer): Apply pstr->trans before mbrtowc instead of
after it. Set valid_raw_len. Don't set mbs_case.
(build_wcs_upper_buffer): Return REG_NOERROR or REG_ESPACE.
Only use the fast path if !pstr->offsets_needed. Apply pstr->trans
before mbrtowc instead of after it. If upper case character
uses different number of bytes than lower case, goto to the
slow path. Don't call towupper unnecessarily twice. Set
valid_raw_len as well. Handle in the slow path the case if
lower and upper case use different number of characters.
Don't set mbs_case.
(re_string_skip_chars): Use valid_raw_len instead of valid_len.
(build_upper_buffer): Don't set mbs_case. Add BE macro. Set
valid_raw_len.
(re_string_translate_buffer): Set mbs instead of mbs_case. Set
valid_raw_len.
(re_string_reconstruct): Use raw_len/raw_stop to initialize
len/stop. Clear valid_raw_len and offsets_needed when clearing
valid_len. Use mbs_allocated instead of MBS_* macros.
Check original offset against valid_raw_len instead of valid_len.
Remove mbs_case handling. Adjust valid_raw_len together with
valid_len. If is_utf8 and looking for tip context, apply
pstr->trans first. If buffers start with partial multi-byte
character, initialize mbs array as well if mbs_allocated.
Check return value of build_wcs_upper_buffer.
(re_string_peek_byte_case): New function.
(re_string_fetch_byte_case): New function.
(re_string_destruct): Use mbs_allocated instead of MBS_ALLOCATED.
Don't free mbs_case. Free offsets.
* posix/regcomp.c (init_dfa): Only check if charset name is UTF-8
if mb_cur_max == 6.
* posix/regexec.c (re_search_internal): Initialize input.raw_stop
as well. Use valid_raw_len instead of valid_len when looking
through fastmap. Adjust registers through input.offsets.
(extend_buffers): Allow build_wcs_upper_buffer to fail.
* posix/bug-regex18.c (tests): Enable #ifdefed out tests. Add new
tests.
2003-11-29 06:13:09 +00:00
|
|
|
|
token->opr.ctx_type = BUF_FIRST;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case '\'':
|
|
|
|
|
if (!(syntax & RE_NO_GNU_OPS))
|
|
|
|
|
{
|
|
|
|
|
token->type = ANCHOR;
|
Update.
2003-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/fpu/libm-test-ulps: Add some more minor changes
to compensate other setup.
2003-11-27 Andreas Jaeger <aj@suse.de>
* sysdeps/x86_64/fpu/libm-test-ulps: Add ulps for new atan2 test.
* math/libm-test.inc (atan2_test): Add test that run infinitly.
Reported by "Willus" <etc231etc231@willus.com>.
2003-11-27 Michael Matz <matz@suse.de>
* sysdeps/ieee754/dbl-64/mpsqrt.c (fastiroot): Fix 64-bit problem
with wrong types.
2003-11-28 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (acquire_init_state_context): Make inline.
Add always_inline attribute.
(check_matching): Add BE macro. Move if (cur_state->has_backref)
into if (dfa->nbackref).
(sift_states_backward): Fix comment.
(transit_state): Add BE macro. Move if (next_state->has_backref)
into if (dfa->nbackref && next_state). Don't check for next_state
!= NULL twice.
* posix/regcomp.c (peek_token): Use opr.ctx_type instead of opr.idx
for ANCHOR.
(parse_expression): Only call init_word_char if word context will be
needed.
* posix/bug-regex11.c (tests): Add new tests.
* posix/tst-regex.c: Include getopt.h.
(timing): New variable.
(main): Set timing to 1 if --timing argument is present.
Add 2 new tests.
(run_test, run_test_backwards): Handle timing.
2003-11-27 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (re_string_t): Remove mbs_case field.
Add offsets, valid_raw_len, raw_len, raw_stop, mbs_allocated and
offsets_needed fields. Change icase, is_utf8 and map_notascii
type from int bitfield to unsigned char.
(MBS_ALLOCATED, MBS_CASE_ALLOCATED): Remove.
(build_wcs_upper_buffer): Change prototype to return int.
(re_string_peek_byte_case, re_string_fetch_byte_case): Remove
defines, add prototypes.
* posix/regex_internal.c (re_string_allocate): Don't initialize
stop here. Don't initialize mbs_case. Set valid_raw_len.
Use mbs_allocated instead of MBS_* macros.
(re_string_construct): Don't initialize stop and valid_len here.
Don't initialize mbs_case. Use mbs_allocated instead of MBS_*
macros. Reallocate buffers if build_wcs_upper_buffer converted
too few bytes. Set valid_len to bufs_len only for single byte
no translation and set in that case valid_raw_len as well.
(re_string_realloc_buffers): Reallocate offsets if not NULL.
Use mbs_allocated instead of MBS_ALLOCATED. Don't reallocate
mbs_case.
(re_string_construct_common): Initialize raw_len, mbs_allocated,
stop and raw_stop.
(build_wcs_buffer): Apply pstr->trans before mbrtowc instead of
after it. Set valid_raw_len. Don't set mbs_case.
(build_wcs_upper_buffer): Return REG_NOERROR or REG_ESPACE.
Only use the fast path if !pstr->offsets_needed. Apply pstr->trans
before mbrtowc instead of after it. If upper case character
uses different number of bytes than lower case, goto to the
slow path. Don't call towupper unnecessarily twice. Set
valid_raw_len as well. Handle in the slow path the case if
lower and upper case use different number of characters.
Don't set mbs_case.
(re_string_skip_chars): Use valid_raw_len instead of valid_len.
(build_upper_buffer): Don't set mbs_case. Add BE macro. Set
valid_raw_len.
(re_string_translate_buffer): Set mbs instead of mbs_case. Set
valid_raw_len.
(re_string_reconstruct): Use raw_len/raw_stop to initialize
len/stop. Clear valid_raw_len and offsets_needed when clearing
valid_len. Use mbs_allocated instead of MBS_* macros.
Check original offset against valid_raw_len instead of valid_len.
Remove mbs_case handling. Adjust valid_raw_len together with
valid_len. If is_utf8 and looking for tip context, apply
pstr->trans first. If buffers start with partial multi-byte
character, initialize mbs array as well if mbs_allocated.
Check return value of build_wcs_upper_buffer.
(re_string_peek_byte_case): New function.
(re_string_fetch_byte_case): New function.
(re_string_destruct): Use mbs_allocated instead of MBS_ALLOCATED.
Don't free mbs_case. Free offsets.
* posix/regcomp.c (init_dfa): Only check if charset name is UTF-8
if mb_cur_max == 6.
* posix/regexec.c (re_search_internal): Initialize input.raw_stop
as well. Use valid_raw_len instead of valid_len when looking
through fastmap. Adjust registers through input.offsets.
(extend_buffers): Allow build_wcs_upper_buffer to fail.
* posix/bug-regex18.c (tests): Enable #ifdefed out tests. Add new
tests.
2003-11-29 06:13:09 +00:00
|
|
|
|
token->opr.ctx_type = BUF_LAST;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case '(':
|
|
|
|
|
if (!(syntax & RE_NO_BK_PARENS))
|
|
|
|
|
token->type = OP_OPEN_SUBEXP;
|
|
|
|
|
break;
|
|
|
|
|
case ')':
|
|
|
|
|
if (!(syntax & RE_NO_BK_PARENS))
|
|
|
|
|
token->type = OP_CLOSE_SUBEXP;
|
|
|
|
|
break;
|
|
|
|
|
case '+':
|
|
|
|
|
if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_BK_PLUS_QM))
|
|
|
|
|
token->type = OP_DUP_PLUS;
|
|
|
|
|
break;
|
|
|
|
|
case '?':
|
|
|
|
|
if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_BK_PLUS_QM))
|
|
|
|
|
token->type = OP_DUP_QUESTION;
|
|
|
|
|
break;
|
|
|
|
|
case '{':
|
|
|
|
|
if ((syntax & RE_INTERVALS) && (!(syntax & RE_NO_BK_BRACES)))
|
|
|
|
|
token->type = OP_OPEN_DUP_NUM;
|
|
|
|
|
break;
|
|
|
|
|
case '}':
|
|
|
|
|
if ((syntax & RE_INTERVALS) && (!(syntax & RE_NO_BK_BRACES)))
|
|
|
|
|
token->type = OP_CLOSE_DUP_NUM;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
token->type = CHARACTER;
|
2003-11-24 19:30:51 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
if (input->mb_cur_max > 1)
|
|
|
|
|
{
|
|
|
|
|
wint_t wc = re_string_wchar_at (input, re_string_cur_idx (input));
|
|
|
|
|
token->word_char = IS_WIDE_WORD_CHAR (wc) != 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
token->word_char = IS_WORD_CHAR (token->opr.c);
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case '\n':
|
|
|
|
|
if (syntax & RE_NEWLINE_ALT)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
token->type = OP_ALT;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case '|':
|
|
|
|
|
if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_NO_BK_VBAR))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
token->type = OP_ALT;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case '*':
|
|
|
|
|
token->type = OP_DUP_ASTERISK;
|
|
|
|
|
break;
|
|
|
|
|
case '+':
|
|
|
|
|
if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_BK_PLUS_QM))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
token->type = OP_DUP_PLUS;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case '?':
|
|
|
|
|
if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_BK_PLUS_QM))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
token->type = OP_DUP_QUESTION;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case '{':
|
|
|
|
|
if ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
token->type = OP_OPEN_DUP_NUM;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case '}':
|
|
|
|
|
if ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
token->type = OP_CLOSE_DUP_NUM;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case '(':
|
|
|
|
|
if (syntax & RE_NO_BK_PARENS)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
token->type = OP_OPEN_SUBEXP;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case ')':
|
|
|
|
|
if (syntax & RE_NO_BK_PARENS)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
token->type = OP_CLOSE_SUBEXP;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case '[':
|
|
|
|
|
token->type = OP_OPEN_BRACKET;
|
|
|
|
|
break;
|
|
|
|
|
case '.':
|
|
|
|
|
token->type = OP_PERIOD;
|
|
|
|
|
break;
|
|
|
|
|
case '^':
|
2003-10-02 22:41:11 +00:00
|
|
|
|
if (!(syntax & (RE_CONTEXT_INDEP_ANCHORS | RE_CARET_ANCHORS_HERE)) &&
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_string_cur_idx (input) != 0)
|
|
|
|
|
{
|
|
|
|
|
char prev = re_string_peek_byte (input, -1);
|
2003-10-02 22:41:11 +00:00
|
|
|
|
if (!(syntax & RE_NEWLINE_ALT) || prev != '\n')
|
2002-11-06 20:36:47 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
token->type = ANCHOR;
|
Update.
2003-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/fpu/libm-test-ulps: Add some more minor changes
to compensate other setup.
2003-11-27 Andreas Jaeger <aj@suse.de>
* sysdeps/x86_64/fpu/libm-test-ulps: Add ulps for new atan2 test.
* math/libm-test.inc (atan2_test): Add test that run infinitly.
Reported by "Willus" <etc231etc231@willus.com>.
2003-11-27 Michael Matz <matz@suse.de>
* sysdeps/ieee754/dbl-64/mpsqrt.c (fastiroot): Fix 64-bit problem
with wrong types.
2003-11-28 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (acquire_init_state_context): Make inline.
Add always_inline attribute.
(check_matching): Add BE macro. Move if (cur_state->has_backref)
into if (dfa->nbackref).
(sift_states_backward): Fix comment.
(transit_state): Add BE macro. Move if (next_state->has_backref)
into if (dfa->nbackref && next_state). Don't check for next_state
!= NULL twice.
* posix/regcomp.c (peek_token): Use opr.ctx_type instead of opr.idx
for ANCHOR.
(parse_expression): Only call init_word_char if word context will be
needed.
* posix/bug-regex11.c (tests): Add new tests.
* posix/tst-regex.c: Include getopt.h.
(timing): New variable.
(main): Set timing to 1 if --timing argument is present.
Add 2 new tests.
(run_test, run_test_backwards): Handle timing.
2003-11-27 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (re_string_t): Remove mbs_case field.
Add offsets, valid_raw_len, raw_len, raw_stop, mbs_allocated and
offsets_needed fields. Change icase, is_utf8 and map_notascii
type from int bitfield to unsigned char.
(MBS_ALLOCATED, MBS_CASE_ALLOCATED): Remove.
(build_wcs_upper_buffer): Change prototype to return int.
(re_string_peek_byte_case, re_string_fetch_byte_case): Remove
defines, add prototypes.
* posix/regex_internal.c (re_string_allocate): Don't initialize
stop here. Don't initialize mbs_case. Set valid_raw_len.
Use mbs_allocated instead of MBS_* macros.
(re_string_construct): Don't initialize stop and valid_len here.
Don't initialize mbs_case. Use mbs_allocated instead of MBS_*
macros. Reallocate buffers if build_wcs_upper_buffer converted
too few bytes. Set valid_len to bufs_len only for single byte
no translation and set in that case valid_raw_len as well.
(re_string_realloc_buffers): Reallocate offsets if not NULL.
Use mbs_allocated instead of MBS_ALLOCATED. Don't reallocate
mbs_case.
(re_string_construct_common): Initialize raw_len, mbs_allocated,
stop and raw_stop.
(build_wcs_buffer): Apply pstr->trans before mbrtowc instead of
after it. Set valid_raw_len. Don't set mbs_case.
(build_wcs_upper_buffer): Return REG_NOERROR or REG_ESPACE.
Only use the fast path if !pstr->offsets_needed. Apply pstr->trans
before mbrtowc instead of after it. If upper case character
uses different number of bytes than lower case, goto to the
slow path. Don't call towupper unnecessarily twice. Set
valid_raw_len as well. Handle in the slow path the case if
lower and upper case use different number of characters.
Don't set mbs_case.
(re_string_skip_chars): Use valid_raw_len instead of valid_len.
(build_upper_buffer): Don't set mbs_case. Add BE macro. Set
valid_raw_len.
(re_string_translate_buffer): Set mbs instead of mbs_case. Set
valid_raw_len.
(re_string_reconstruct): Use raw_len/raw_stop to initialize
len/stop. Clear valid_raw_len and offsets_needed when clearing
valid_len. Use mbs_allocated instead of MBS_* macros.
Check original offset against valid_raw_len instead of valid_len.
Remove mbs_case handling. Adjust valid_raw_len together with
valid_len. If is_utf8 and looking for tip context, apply
pstr->trans first. If buffers start with partial multi-byte
character, initialize mbs array as well if mbs_allocated.
Check return value of build_wcs_upper_buffer.
(re_string_peek_byte_case): New function.
(re_string_fetch_byte_case): New function.
(re_string_destruct): Use mbs_allocated instead of MBS_ALLOCATED.
Don't free mbs_case. Free offsets.
* posix/regcomp.c (init_dfa): Only check if charset name is UTF-8
if mb_cur_max == 6.
* posix/regexec.c (re_search_internal): Initialize input.raw_stop
as well. Use valid_raw_len instead of valid_len when looking
through fastmap. Adjust registers through input.offsets.
(extend_buffers): Allow build_wcs_upper_buffer to fail.
* posix/bug-regex18.c (tests): Enable #ifdefed out tests. Add new
tests.
2003-11-29 06:13:09 +00:00
|
|
|
|
token->opr.ctx_type = LINE_FIRST;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case '$':
|
|
|
|
|
if (!(syntax & RE_CONTEXT_INDEP_ANCHORS) &&
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_string_cur_idx (input) + 1 != re_string_length (input))
|
|
|
|
|
{
|
|
|
|
|
re_token_t next;
|
|
|
|
|
re_string_skip_bytes (input, 1);
|
|
|
|
|
peek_token (&next, input, syntax);
|
|
|
|
|
re_string_skip_bytes (input, -1);
|
|
|
|
|
if (next.type != OP_ALT && next.type != OP_CLOSE_SUBEXP)
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
token->type = ANCHOR;
|
Update.
2003-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/fpu/libm-test-ulps: Add some more minor changes
to compensate other setup.
2003-11-27 Andreas Jaeger <aj@suse.de>
* sysdeps/x86_64/fpu/libm-test-ulps: Add ulps for new atan2 test.
* math/libm-test.inc (atan2_test): Add test that run infinitly.
Reported by "Willus" <etc231etc231@willus.com>.
2003-11-27 Michael Matz <matz@suse.de>
* sysdeps/ieee754/dbl-64/mpsqrt.c (fastiroot): Fix 64-bit problem
with wrong types.
2003-11-28 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (acquire_init_state_context): Make inline.
Add always_inline attribute.
(check_matching): Add BE macro. Move if (cur_state->has_backref)
into if (dfa->nbackref).
(sift_states_backward): Fix comment.
(transit_state): Add BE macro. Move if (next_state->has_backref)
into if (dfa->nbackref && next_state). Don't check for next_state
!= NULL twice.
* posix/regcomp.c (peek_token): Use opr.ctx_type instead of opr.idx
for ANCHOR.
(parse_expression): Only call init_word_char if word context will be
needed.
* posix/bug-regex11.c (tests): Add new tests.
* posix/tst-regex.c: Include getopt.h.
(timing): New variable.
(main): Set timing to 1 if --timing argument is present.
Add 2 new tests.
(run_test, run_test_backwards): Handle timing.
2003-11-27 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (re_string_t): Remove mbs_case field.
Add offsets, valid_raw_len, raw_len, raw_stop, mbs_allocated and
offsets_needed fields. Change icase, is_utf8 and map_notascii
type from int bitfield to unsigned char.
(MBS_ALLOCATED, MBS_CASE_ALLOCATED): Remove.
(build_wcs_upper_buffer): Change prototype to return int.
(re_string_peek_byte_case, re_string_fetch_byte_case): Remove
defines, add prototypes.
* posix/regex_internal.c (re_string_allocate): Don't initialize
stop here. Don't initialize mbs_case. Set valid_raw_len.
Use mbs_allocated instead of MBS_* macros.
(re_string_construct): Don't initialize stop and valid_len here.
Don't initialize mbs_case. Use mbs_allocated instead of MBS_*
macros. Reallocate buffers if build_wcs_upper_buffer converted
too few bytes. Set valid_len to bufs_len only for single byte
no translation and set in that case valid_raw_len as well.
(re_string_realloc_buffers): Reallocate offsets if not NULL.
Use mbs_allocated instead of MBS_ALLOCATED. Don't reallocate
mbs_case.
(re_string_construct_common): Initialize raw_len, mbs_allocated,
stop and raw_stop.
(build_wcs_buffer): Apply pstr->trans before mbrtowc instead of
after it. Set valid_raw_len. Don't set mbs_case.
(build_wcs_upper_buffer): Return REG_NOERROR or REG_ESPACE.
Only use the fast path if !pstr->offsets_needed. Apply pstr->trans
before mbrtowc instead of after it. If upper case character
uses different number of bytes than lower case, goto to the
slow path. Don't call towupper unnecessarily twice. Set
valid_raw_len as well. Handle in the slow path the case if
lower and upper case use different number of characters.
Don't set mbs_case.
(re_string_skip_chars): Use valid_raw_len instead of valid_len.
(build_upper_buffer): Don't set mbs_case. Add BE macro. Set
valid_raw_len.
(re_string_translate_buffer): Set mbs instead of mbs_case. Set
valid_raw_len.
(re_string_reconstruct): Use raw_len/raw_stop to initialize
len/stop. Clear valid_raw_len and offsets_needed when clearing
valid_len. Use mbs_allocated instead of MBS_* macros.
Check original offset against valid_raw_len instead of valid_len.
Remove mbs_case handling. Adjust valid_raw_len together with
valid_len. If is_utf8 and looking for tip context, apply
pstr->trans first. If buffers start with partial multi-byte
character, initialize mbs array as well if mbs_allocated.
Check return value of build_wcs_upper_buffer.
(re_string_peek_byte_case): New function.
(re_string_fetch_byte_case): New function.
(re_string_destruct): Use mbs_allocated instead of MBS_ALLOCATED.
Don't free mbs_case. Free offsets.
* posix/regcomp.c (init_dfa): Only check if charset name is UTF-8
if mb_cur_max == 6.
* posix/regexec.c (re_search_internal): Initialize input.raw_stop
as well. Use valid_raw_len instead of valid_len when looking
through fastmap. Adjust registers through input.offsets.
(extend_buffers): Allow build_wcs_upper_buffer to fail.
* posix/bug-regex18.c (tests): Enable #ifdefed out tests. Add new
tests.
2003-11-29 06:13:09 +00:00
|
|
|
|
token->opr.ctx_type = LINE_LAST;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Peek a token from INPUT, and return the length of the token.
|
|
|
|
|
We must not use this function out of bracket expressions. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
peek_token_bracket (token, input, syntax)
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
re_string_t *input;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
{
|
|
|
|
|
unsigned char c;
|
|
|
|
|
if (re_string_eoi (input))
|
|
|
|
|
{
|
|
|
|
|
token->type = END_OF_RE;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
c = re_string_peek_byte (input, 0);
|
|
|
|
|
token->opr.c = c;
|
|
|
|
|
|
|
|
|
|
#ifdef RE_ENABLE_I18N
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
if (input->mb_cur_max > 1 &&
|
2002-02-26 19:06:03 +00:00
|
|
|
|
!re_string_first_byte (input, re_string_cur_idx (input)))
|
|
|
|
|
{
|
|
|
|
|
token->type = CHARACTER;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
|
|
|
|
|
2004-01-14 01:45:37 +00:00
|
|
|
|
if (c == '\\' && (syntax & RE_BACKSLASH_ESCAPE_IN_LISTS)
|
|
|
|
|
&& re_string_cur_idx (input) + 1 < re_string_length (input))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
/* In this case, '\' escape a character. */
|
|
|
|
|
unsigned char c2;
|
2002-10-21 18:19:01 +00:00
|
|
|
|
re_string_skip_bytes (input, 1);
|
|
|
|
|
c2 = re_string_peek_byte (input, 0);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
token->opr.c = c2;
|
|
|
|
|
token->type = CHARACTER;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (c == '[') /* '[' is a special char in a bracket exps. */
|
|
|
|
|
{
|
|
|
|
|
unsigned char c2;
|
|
|
|
|
int token_len;
|
2004-01-14 01:45:37 +00:00
|
|
|
|
if (re_string_cur_idx (input) + 1 < re_string_length (input))
|
|
|
|
|
c2 = re_string_peek_byte (input, 1);
|
|
|
|
|
else
|
|
|
|
|
c2 = 0;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
token->opr.c = c2;
|
|
|
|
|
token_len = 2;
|
|
|
|
|
switch (c2)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
case '.':
|
|
|
|
|
token->type = OP_OPEN_COLL_ELEM;
|
|
|
|
|
break;
|
|
|
|
|
case '=':
|
|
|
|
|
token->type = OP_OPEN_EQUIV_CLASS;
|
|
|
|
|
break;
|
|
|
|
|
case ':':
|
|
|
|
|
if (syntax & RE_CHAR_CLASSES)
|
|
|
|
|
{
|
|
|
|
|
token->type = OP_OPEN_CHAR_CLASS;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* else fall through. */
|
|
|
|
|
default:
|
|
|
|
|
token->type = CHARACTER;
|
|
|
|
|
token->opr.c = c;
|
|
|
|
|
token_len = 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return token_len;
|
|
|
|
|
}
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case '-':
|
|
|
|
|
token->type = OP_CHARSET_RANGE;
|
|
|
|
|
break;
|
|
|
|
|
case ']':
|
|
|
|
|
token->type = OP_CLOSE_BRACKET;
|
|
|
|
|
break;
|
|
|
|
|
case '^':
|
|
|
|
|
token->type = OP_NON_MATCH_LIST;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
token->type = CHARACTER;
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Functions for parser. */
|
|
|
|
|
|
|
|
|
|
/* Entry point of the parser.
|
|
|
|
|
Parse the regular expression REGEXP and return the structure tree.
|
|
|
|
|
If an error is occured, ERR is set by error code, and return NULL.
|
|
|
|
|
This function build the following tree, from regular expression <reg_exp>:
|
2002-11-06 20:36:47 +00:00
|
|
|
|
CAT
|
|
|
|
|
/ \
|
|
|
|
|
/ \
|
2002-02-26 19:06:03 +00:00
|
|
|
|
<reg_exp> EOR
|
|
|
|
|
|
|
|
|
|
CAT means concatenation.
|
|
|
|
|
EOR means end of regular expression. */
|
|
|
|
|
|
|
|
|
|
static bin_tree_t *
|
|
|
|
|
parse (regexp, preg, syntax, err)
|
|
|
|
|
re_string_t *regexp;
|
|
|
|
|
regex_t *preg;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
reg_errcode_t *err;
|
|
|
|
|
{
|
|
|
|
|
re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
|
|
|
|
|
bin_tree_t *tree, *eor, *root;
|
|
|
|
|
re_token_t current_token;
|
Update.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.c (re_node_set_insert): Remove unused variables.
* posix/regex_internal.h (re_dfa_t): Add syntax field.
* posix/regcomp.c (parse): Initialize dfa->syntax.
* posix/regexec.c (acquire_init_state_context,
prune_impossible_nodes, check_matching, check_halt_state_context,
proceed_next_node, sift_states_iter_mb, sift_states_backward,
update_cur_sifted_state, sift_states_bkref, transit_state,
transit_state_sb, transit_state_mb, transit_state_bkref,
get_subexp, get_subexp_sub, check_arrival, expand_bkref_cache,
build_trtable): Remove preg argument, add dfa argument instead
and remove dfa = preg->buffer initialization in the body.
Adjust all callers.
(check_node_accept_bytes, group_nodes_into_DFAstates,
check_node_accept): Likewise. Use dfa->syntax instead of
preg->syntax.
(check_arrival_add_next_nodes): Remove preg argument.
* posix/regex_internal.h (re_match_context_t): Make input
re_string_t instead of a pointer to it.
* posix/regex_internal.c (re_string_construct_common): Don't clear
pstr here...
(re_string_construct): ... but only here.
* posix/regexec.c (match_ctx_init): Remove input argument. Don't
initialize fields to zero.
(re_search_internal): Move input into mctx.input.
(acquire_init_state_context, check_matching,
check_halt_state_context, proceed_next_node,
clean_state_log_if_needed, sift_states_bkref, sift_states_iter_mb,
transit_state, transit_state_sb, transit_state_mb,
transit_state_bkref, get_subexp, check_arrival,
check_arrival_add_next_nodes, check_node_accept, extend_buffers):
Change mctx->input into &mctx->input and mctx->input->field into
mctx->input.field.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
Paolo Bonzini <bonzini@gnu.org>
* posix/regex_internal.h (re_const_bitset_ptr_t): New type.
(re_string_t): Add newline_anchor, word_char and word_ops_used fields.
(re_dfa_t): Change word_char type to bitset. Add word_ops_used field.
(re_string_context_at, re_string_reconstruct): Remove last argument.
* posix/regex_internal.c (re_string_allocate): Initialize
pstr->word_char and pstr->word_ops_used.
(re_string_context_at): Remove newline_anchor argument.
Use input->newline_anchor instead, swap && conditions.
Only use IS_WIDE_WORD_CHAR if input->word_ops_used != 0.
Use input->word_char bitmap instead of IS_WORD_CHAR.
(re_string_reconstruct): Likewise.
Adjust re_string_context_at caller.
* posix/regexec.c (acquire_init_state_context,
check_halt_state_context, transit_state, transit_state_sb,
transit_state_mb, transit_state_bkref, check_arrival,
check_node_accept): Adjust re_string_context_at and
re_string_reconstruct callers.
(re_search_internal): Likewise. Set input.newline_anchor.
(build_trtable): Use dfa->word_char bitmap instead of IS_WORD_CHAR.
* posix/regcomp.c (init_word_char): Change return type to void.
Set dfa->word_ops_used.
(free_dfa_content): Don't free dfa->word_char.
(parse_expression): Remove error handling for init_word_char.
2004-01-02 21:20:51 +00:00
|
|
|
|
dfa->syntax = syntax;
|
2003-11-21 23:42:18 +00:00
|
|
|
|
fetch_token (¤t_token, regexp, syntax | RE_CARET_ANCHORS_HERE);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
tree = parse_reg_exp (regexp, preg, ¤t_token, syntax, 0, err);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR && tree == NULL, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return NULL;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
eor = re_dfa_add_tree_node (dfa, NULL, NULL, ¤t_token);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (tree != NULL)
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
root = create_tree (dfa, tree, eor, CONCAT, 0);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else
|
|
|
|
|
root = eor;
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (eor == NULL || root == NULL, 0))
|
2002-10-12 08:34:26 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return root;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function build the following tree, from regular expression
|
|
|
|
|
<branch1>|<branch2>:
|
2002-11-06 20:36:47 +00:00
|
|
|
|
ALT
|
|
|
|
|
/ \
|
|
|
|
|
/ \
|
2002-02-26 19:06:03 +00:00
|
|
|
|
<branch1> <branch2>
|
|
|
|
|
|
|
|
|
|
ALT means alternative, which represents the operator `|'. */
|
|
|
|
|
|
|
|
|
|
static bin_tree_t *
|
|
|
|
|
parse_reg_exp (regexp, preg, token, syntax, nest, err)
|
|
|
|
|
re_string_t *regexp;
|
|
|
|
|
regex_t *preg;
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
int nest;
|
|
|
|
|
reg_errcode_t *err;
|
|
|
|
|
{
|
|
|
|
|
re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
|
|
|
|
|
bin_tree_t *tree, *branch = NULL;
|
|
|
|
|
tree = parse_branch (regexp, preg, token, syntax, nest, err);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR && tree == NULL, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
while (token->type == OP_ALT)
|
|
|
|
|
{
|
|
|
|
|
re_token_t alt_token = *token;
|
2003-11-21 23:42:18 +00:00
|
|
|
|
fetch_token (token, regexp, syntax | RE_CARET_ANCHORS_HERE);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (token->type != OP_ALT && token->type != END_OF_RE
|
2002-11-06 20:36:47 +00:00
|
|
|
|
&& (nest == 0 || token->type != OP_CLOSE_SUBEXP))
|
|
|
|
|
{
|
|
|
|
|
branch = parse_branch (regexp, preg, token, syntax, nest, err);
|
|
|
|
|
if (BE (*err != REG_NOERROR && branch == NULL, 0))
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
return NULL;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
2002-08-12 19:18:45 +00:00
|
|
|
|
else
|
|
|
|
|
branch = NULL;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree = re_dfa_add_tree_node (dfa, tree, branch, &alt_token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-09-28 05:28:44 +00:00
|
|
|
|
dfa->has_plural_match = 1;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
return tree;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function build the following tree, from regular expression
|
|
|
|
|
<exp1><exp2>:
|
2002-11-06 20:36:47 +00:00
|
|
|
|
CAT
|
|
|
|
|
/ \
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/ \
|
|
|
|
|
<exp1> <exp2>
|
|
|
|
|
|
|
|
|
|
CAT means concatenation. */
|
|
|
|
|
|
|
|
|
|
static bin_tree_t *
|
|
|
|
|
parse_branch (regexp, preg, token, syntax, nest, err)
|
|
|
|
|
re_string_t *regexp;
|
|
|
|
|
regex_t *preg;
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
int nest;
|
|
|
|
|
reg_errcode_t *err;
|
|
|
|
|
{
|
|
|
|
|
bin_tree_t *tree, *exp;
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
tree = parse_expression (regexp, preg, token, syntax, nest, err);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR && tree == NULL, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
while (token->type != OP_ALT && token->type != END_OF_RE
|
2002-11-06 20:36:47 +00:00
|
|
|
|
&& (nest == 0 || token->type != OP_CLOSE_SUBEXP))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
exp = parse_expression (regexp, preg, token, syntax, nest, err);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR && exp == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (tree != NULL && exp != NULL)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
tree = create_tree (dfa, tree, exp, CONCAT, 0);
|
2002-11-06 20:36:47 +00:00
|
|
|
|
if (tree == NULL)
|
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else if (tree == NULL)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
tree = exp;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Otherwise exp == NULL, we don't need to create new tree. */
|
|
|
|
|
}
|
|
|
|
|
return tree;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function build the following tree, from regular expression a*:
|
2002-11-06 20:36:47 +00:00
|
|
|
|
*
|
|
|
|
|
|
|
|
|
|
|
a
|
2002-02-26 19:06:03 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static bin_tree_t *
|
|
|
|
|
parse_expression (regexp, preg, token, syntax, nest, err)
|
|
|
|
|
re_string_t *regexp;
|
|
|
|
|
regex_t *preg;
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
int nest;
|
|
|
|
|
reg_errcode_t *err;
|
|
|
|
|
{
|
|
|
|
|
re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
|
|
|
|
|
bin_tree_t *tree;
|
|
|
|
|
switch (token->type)
|
|
|
|
|
{
|
|
|
|
|
case CHARACTER:
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree = re_dfa_add_tree_node (dfa, NULL, NULL, token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
if (dfa->mb_cur_max > 1)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
while (!re_string_eoi (regexp)
|
|
|
|
|
&& !re_string_first_byte (regexp, re_string_cur_idx (regexp)))
|
|
|
|
|
{
|
2002-11-06 20:36:47 +00:00
|
|
|
|
bin_tree_t *mbc_remain;
|
2003-11-21 23:42:18 +00:00
|
|
|
|
fetch_token (token, regexp, syntax);
|
2003-11-22 00:00:56 +00:00
|
|
|
|
mbc_remain = re_dfa_add_tree_node (dfa, NULL, NULL, token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
tree = create_tree (dfa, tree, mbc_remain, CONCAT, 0);
|
|
|
|
|
if (BE (mbc_remain == NULL || tree == NULL, 0))
|
2003-02-21 01:52:32 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
break;
|
|
|
|
|
case OP_OPEN_SUBEXP:
|
|
|
|
|
tree = parse_sub_exp (regexp, preg, token, syntax, nest + 1, err);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR && tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case OP_OPEN_BRACKET:
|
|
|
|
|
tree = parse_bracket_exp (regexp, dfa, token, syntax, err);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR && tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case OP_BACK_REF:
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (preg->re_nsub < token->opr.idx
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|| dfa->subexps[token->opr.idx - 1].end == -1, 0))
|
|
|
|
|
{
|
|
|
|
|
*err = REG_ESUBREG;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-11-27 23:00:16 +00:00
|
|
|
|
dfa->used_bkref_map |= 1 << (token->opr.idx - 1);
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree = re_dfa_add_tree_node (dfa, NULL, NULL, token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
++dfa->nbackref;
|
|
|
|
|
dfa->has_mb_node = 1;
|
|
|
|
|
break;
|
2003-11-13 06:01:46 +00:00
|
|
|
|
case OP_OPEN_DUP_NUM:
|
|
|
|
|
if (syntax & RE_CONTEXT_INVALID_DUP)
|
|
|
|
|
{
|
|
|
|
|
*err = REG_BADRPT;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
/* FALLTHROUGH */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
case OP_DUP_ASTERISK:
|
|
|
|
|
case OP_DUP_PLUS:
|
|
|
|
|
case OP_DUP_QUESTION:
|
|
|
|
|
if (syntax & RE_CONTEXT_INVALID_OPS)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_BADRPT;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else if (syntax & RE_CONTEXT_INDEP_OPS)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2003-11-21 23:42:18 +00:00
|
|
|
|
fetch_token (token, regexp, syntax);
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return parse_expression (regexp, preg, token, syntax, nest, err);
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* else fall through */
|
|
|
|
|
case OP_CLOSE_SUBEXP:
|
|
|
|
|
if ((token->type == OP_CLOSE_SUBEXP) &&
|
2002-11-06 20:36:47 +00:00
|
|
|
|
!(syntax & RE_UNMATCHED_RIGHT_PAREN_ORD))
|
|
|
|
|
{
|
|
|
|
|
*err = REG_ERPAREN;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* else fall through */
|
|
|
|
|
case OP_CLOSE_DUP_NUM:
|
|
|
|
|
/* We treat it as a normal character. */
|
|
|
|
|
|
|
|
|
|
/* Then we can these characters as normal characters. */
|
|
|
|
|
token->type = CHARACTER;
|
2003-11-24 19:30:51 +00:00
|
|
|
|
/* mb_partial and word_char bits should be initialized already
|
|
|
|
|
by peek_token. */
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree = re_dfa_add_tree_node (dfa, NULL, NULL, token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case ANCHOR:
|
Update.
2003-11-28 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/fpu/libm-test-ulps: Add some more minor changes
to compensate other setup.
2003-11-27 Andreas Jaeger <aj@suse.de>
* sysdeps/x86_64/fpu/libm-test-ulps: Add ulps for new atan2 test.
* math/libm-test.inc (atan2_test): Add test that run infinitly.
Reported by "Willus" <etc231etc231@willus.com>.
2003-11-27 Michael Matz <matz@suse.de>
* sysdeps/ieee754/dbl-64/mpsqrt.c (fastiroot): Fix 64-bit problem
with wrong types.
2003-11-28 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (acquire_init_state_context): Make inline.
Add always_inline attribute.
(check_matching): Add BE macro. Move if (cur_state->has_backref)
into if (dfa->nbackref).
(sift_states_backward): Fix comment.
(transit_state): Add BE macro. Move if (next_state->has_backref)
into if (dfa->nbackref && next_state). Don't check for next_state
!= NULL twice.
* posix/regcomp.c (peek_token): Use opr.ctx_type instead of opr.idx
for ANCHOR.
(parse_expression): Only call init_word_char if word context will be
needed.
* posix/bug-regex11.c (tests): Add new tests.
* posix/tst-regex.c: Include getopt.h.
(timing): New variable.
(main): Set timing to 1 if --timing argument is present.
Add 2 new tests.
(run_test, run_test_backwards): Handle timing.
2003-11-27 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (re_string_t): Remove mbs_case field.
Add offsets, valid_raw_len, raw_len, raw_stop, mbs_allocated and
offsets_needed fields. Change icase, is_utf8 and map_notascii
type from int bitfield to unsigned char.
(MBS_ALLOCATED, MBS_CASE_ALLOCATED): Remove.
(build_wcs_upper_buffer): Change prototype to return int.
(re_string_peek_byte_case, re_string_fetch_byte_case): Remove
defines, add prototypes.
* posix/regex_internal.c (re_string_allocate): Don't initialize
stop here. Don't initialize mbs_case. Set valid_raw_len.
Use mbs_allocated instead of MBS_* macros.
(re_string_construct): Don't initialize stop and valid_len here.
Don't initialize mbs_case. Use mbs_allocated instead of MBS_*
macros. Reallocate buffers if build_wcs_upper_buffer converted
too few bytes. Set valid_len to bufs_len only for single byte
no translation and set in that case valid_raw_len as well.
(re_string_realloc_buffers): Reallocate offsets if not NULL.
Use mbs_allocated instead of MBS_ALLOCATED. Don't reallocate
mbs_case.
(re_string_construct_common): Initialize raw_len, mbs_allocated,
stop and raw_stop.
(build_wcs_buffer): Apply pstr->trans before mbrtowc instead of
after it. Set valid_raw_len. Don't set mbs_case.
(build_wcs_upper_buffer): Return REG_NOERROR or REG_ESPACE.
Only use the fast path if !pstr->offsets_needed. Apply pstr->trans
before mbrtowc instead of after it. If upper case character
uses different number of bytes than lower case, goto to the
slow path. Don't call towupper unnecessarily twice. Set
valid_raw_len as well. Handle in the slow path the case if
lower and upper case use different number of characters.
Don't set mbs_case.
(re_string_skip_chars): Use valid_raw_len instead of valid_len.
(build_upper_buffer): Don't set mbs_case. Add BE macro. Set
valid_raw_len.
(re_string_translate_buffer): Set mbs instead of mbs_case. Set
valid_raw_len.
(re_string_reconstruct): Use raw_len/raw_stop to initialize
len/stop. Clear valid_raw_len and offsets_needed when clearing
valid_len. Use mbs_allocated instead of MBS_* macros.
Check original offset against valid_raw_len instead of valid_len.
Remove mbs_case handling. Adjust valid_raw_len together with
valid_len. If is_utf8 and looking for tip context, apply
pstr->trans first. If buffers start with partial multi-byte
character, initialize mbs array as well if mbs_allocated.
Check return value of build_wcs_upper_buffer.
(re_string_peek_byte_case): New function.
(re_string_fetch_byte_case): New function.
(re_string_destruct): Use mbs_allocated instead of MBS_ALLOCATED.
Don't free mbs_case. Free offsets.
* posix/regcomp.c (init_dfa): Only check if charset name is UTF-8
if mb_cur_max == 6.
* posix/regexec.c (re_search_internal): Initialize input.raw_stop
as well. Use valid_raw_len instead of valid_len when looking
through fastmap. Adjust registers through input.offsets.
(extend_buffers): Allow build_wcs_upper_buffer to fail.
* posix/bug-regex18.c (tests): Enable #ifdefed out tests. Add new
tests.
2003-11-29 06:13:09 +00:00
|
|
|
|
if ((token->opr.ctx_type
|
|
|
|
|
& (WORD_DELIM | INSIDE_WORD | WORD_FIRST | WORD_LAST))
|
Update.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.c (re_node_set_insert): Remove unused variables.
* posix/regex_internal.h (re_dfa_t): Add syntax field.
* posix/regcomp.c (parse): Initialize dfa->syntax.
* posix/regexec.c (acquire_init_state_context,
prune_impossible_nodes, check_matching, check_halt_state_context,
proceed_next_node, sift_states_iter_mb, sift_states_backward,
update_cur_sifted_state, sift_states_bkref, transit_state,
transit_state_sb, transit_state_mb, transit_state_bkref,
get_subexp, get_subexp_sub, check_arrival, expand_bkref_cache,
build_trtable): Remove preg argument, add dfa argument instead
and remove dfa = preg->buffer initialization in the body.
Adjust all callers.
(check_node_accept_bytes, group_nodes_into_DFAstates,
check_node_accept): Likewise. Use dfa->syntax instead of
preg->syntax.
(check_arrival_add_next_nodes): Remove preg argument.
* posix/regex_internal.h (re_match_context_t): Make input
re_string_t instead of a pointer to it.
* posix/regex_internal.c (re_string_construct_common): Don't clear
pstr here...
(re_string_construct): ... but only here.
* posix/regexec.c (match_ctx_init): Remove input argument. Don't
initialize fields to zero.
(re_search_internal): Move input into mctx.input.
(acquire_init_state_context, check_matching,
check_halt_state_context, proceed_next_node,
clean_state_log_if_needed, sift_states_bkref, sift_states_iter_mb,
transit_state, transit_state_sb, transit_state_mb,
transit_state_bkref, get_subexp, check_arrival,
check_arrival_add_next_nodes, check_node_accept, extend_buffers):
Change mctx->input into &mctx->input and mctx->input->field into
mctx->input.field.
2004-01-02 Jakub Jelinek <jakub@redhat.com>
Paolo Bonzini <bonzini@gnu.org>
* posix/regex_internal.h (re_const_bitset_ptr_t): New type.
(re_string_t): Add newline_anchor, word_char and word_ops_used fields.
(re_dfa_t): Change word_char type to bitset. Add word_ops_used field.
(re_string_context_at, re_string_reconstruct): Remove last argument.
* posix/regex_internal.c (re_string_allocate): Initialize
pstr->word_char and pstr->word_ops_used.
(re_string_context_at): Remove newline_anchor argument.
Use input->newline_anchor instead, swap && conditions.
Only use IS_WIDE_WORD_CHAR if input->word_ops_used != 0.
Use input->word_char bitmap instead of IS_WORD_CHAR.
(re_string_reconstruct): Likewise.
Adjust re_string_context_at caller.
* posix/regexec.c (acquire_init_state_context,
check_halt_state_context, transit_state, transit_state_sb,
transit_state_mb, transit_state_bkref, check_arrival,
check_node_accept): Adjust re_string_context_at and
re_string_reconstruct callers.
(re_search_internal): Likewise. Set input.newline_anchor.
(build_trtable): Use dfa->word_char bitmap instead of IS_WORD_CHAR.
* posix/regcomp.c (init_word_char): Change return type to void.
Set dfa->word_ops_used.
(free_dfa_content): Don't free dfa->word_char.
(parse_expression): Remove error handling for init_word_char.
2004-01-02 21:20:51 +00:00
|
|
|
|
&& dfa->word_ops_used == 0)
|
|
|
|
|
init_word_char (dfa);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (token->opr.ctx_type == WORD_DELIM)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
bin_tree_t *tree_first, *tree_last;
|
|
|
|
|
token->opr.ctx_type = WORD_FIRST;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree_first = re_dfa_add_tree_node (dfa, NULL, NULL, token);
|
2002-11-06 20:36:47 +00:00
|
|
|
|
token->opr.ctx_type = WORD_LAST;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree_last = re_dfa_add_tree_node (dfa, NULL, NULL, token);
|
2002-11-06 20:36:47 +00:00
|
|
|
|
token->type = OP_ALT;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree = re_dfa_add_tree_node (dfa, tree_first, tree_last, token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (tree_first == NULL || tree_last == NULL || tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree = re_dfa_add_tree_node (dfa, NULL, NULL, token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (tree == NULL, 0))
|
2003-02-21 01:52:32 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* We must return here, since ANCHORs can't be followed
|
2002-11-06 20:36:47 +00:00
|
|
|
|
by repetition operators.
|
|
|
|
|
eg. RE"^*" is invalid or "<ANCHOR(^)><CHAR(*)>",
|
|
|
|
|
it must not be "<ANCHOR(^)><REPEAT(*)>". */
|
2003-11-21 23:42:18 +00:00
|
|
|
|
fetch_token (token, regexp, syntax);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return tree;
|
|
|
|
|
case OP_PERIOD:
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree = re_dfa_add_tree_node (dfa, NULL, NULL, token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
if (dfa->mb_cur_max > 1)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
dfa->has_mb_node = 1;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case OP_WORD:
|
|
|
|
|
case OP_NOTWORD:
|
2004-02-26 20:33:23 +00:00
|
|
|
|
tree = build_charclass_op (dfa, regexp->trans,
|
|
|
|
|
(const unsigned char *) "alnum",
|
|
|
|
|
(const unsigned char *) "_",
|
|
|
|
|
token->type == OP_NOTWORD, err);
|
2003-09-23 05:43:03 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR && tree == NULL, 0))
|
|
|
|
|
return NULL;
|
|
|
|
|
break;
|
|
|
|
|
case OP_SPACE:
|
|
|
|
|
case OP_NOTSPACE:
|
2004-02-26 20:33:23 +00:00
|
|
|
|
tree = build_charclass_op (dfa, regexp->trans,
|
|
|
|
|
(const unsigned char *) "space",
|
|
|
|
|
(const unsigned char *) "",
|
|
|
|
|
token->type == OP_NOTSPACE, err);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR && tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
break;
|
|
|
|
|
case OP_ALT:
|
|
|
|
|
case END_OF_RE:
|
|
|
|
|
return NULL;
|
|
|
|
|
case BACK_SLASH:
|
|
|
|
|
*err = REG_EESCAPE;
|
|
|
|
|
return NULL;
|
|
|
|
|
default:
|
|
|
|
|
/* Must not happen? */
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
assert (0);
|
|
|
|
|
#endif
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2003-11-21 23:42:18 +00:00
|
|
|
|
fetch_token (token, regexp, syntax);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
while (token->type == OP_DUP_ASTERISK || token->type == OP_DUP_PLUS
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|| token->type == OP_DUP_QUESTION || token->type == OP_OPEN_DUP_NUM)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
tree = parse_dup_op (tree, regexp, dfa, token, syntax, err);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR && tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return NULL;
|
2003-11-13 09:54:39 +00:00
|
|
|
|
/* In BRE consecutive duplications are not allowed. */
|
|
|
|
|
if ((syntax & RE_CONTEXT_INVALID_DUP)
|
|
|
|
|
&& (token->type == OP_DUP_ASTERISK
|
|
|
|
|
|| token->type == OP_OPEN_DUP_NUM))
|
|
|
|
|
{
|
|
|
|
|
*err = REG_BADRPT;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-09-28 05:28:44 +00:00
|
|
|
|
dfa->has_plural_match = 1;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return tree;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function build the following tree, from regular expression
|
|
|
|
|
(<reg_exp>):
|
2002-11-06 20:36:47 +00:00
|
|
|
|
SUBEXP
|
|
|
|
|
|
|
|
|
|
|
<reg_exp>
|
2002-02-26 19:06:03 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static bin_tree_t *
|
|
|
|
|
parse_sub_exp (regexp, preg, token, syntax, nest, err)
|
|
|
|
|
re_string_t *regexp;
|
|
|
|
|
regex_t *preg;
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
int nest;
|
|
|
|
|
reg_errcode_t *err;
|
|
|
|
|
{
|
|
|
|
|
re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
|
2002-07-10 23:09:16 +00:00
|
|
|
|
bin_tree_t *tree, *left_par, *right_par;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
size_t cur_nsub;
|
|
|
|
|
cur_nsub = preg->re_nsub++;
|
2003-11-23 19:21:23 +00:00
|
|
|
|
if (BE (dfa->subexps_alloc < preg->re_nsub, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
re_subexp_t *new_array;
|
|
|
|
|
dfa->subexps_alloc *= 2;
|
|
|
|
|
new_array = re_realloc (dfa->subexps, re_subexp_t, dfa->subexps_alloc);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (new_array == NULL, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
dfa->subexps_alloc /= 2;
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
dfa->subexps = new_array;
|
|
|
|
|
}
|
|
|
|
|
dfa->subexps[cur_nsub].start = dfa->nodes_len;
|
|
|
|
|
dfa->subexps[cur_nsub].end = -1;
|
2002-07-10 23:09:16 +00:00
|
|
|
|
|
2003-11-22 00:00:56 +00:00
|
|
|
|
left_par = re_dfa_add_tree_node (dfa, NULL, NULL, token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (left_par == NULL, 0))
|
2002-10-12 08:34:26 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
dfa->nodes[left_par->node_idx].opr.idx = cur_nsub;
|
2003-11-21 23:42:18 +00:00
|
|
|
|
fetch_token (token, regexp, syntax | RE_CARET_ANCHORS_HERE);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
/* The subexpression may be a null string. */
|
|
|
|
|
if (token->type == OP_CLOSE_SUBEXP)
|
2002-07-10 23:09:16 +00:00
|
|
|
|
tree = NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tree = parse_reg_exp (regexp, preg, token, syntax, nest, err);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR && tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
2002-07-10 23:09:16 +00:00
|
|
|
|
if (BE (token->type != OP_CLOSE_SUBEXP, 0))
|
|
|
|
|
{
|
2003-11-13 06:01:46 +00:00
|
|
|
|
*err = REG_EPAREN;
|
2002-07-10 23:09:16 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2003-11-22 00:00:56 +00:00
|
|
|
|
right_par = re_dfa_add_tree_node (dfa, NULL, NULL, token);
|
2002-07-10 23:09:16 +00:00
|
|
|
|
dfa->subexps[cur_nsub].end = dfa->nodes_len;
|
|
|
|
|
tree = ((tree == NULL) ? right_par
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
: create_tree (dfa, tree, right_par, CONCAT, 0));
|
|
|
|
|
tree = create_tree (dfa, left_par, tree, CONCAT, 0);
|
|
|
|
|
if (BE (right_par == NULL || tree == NULL, 0))
|
2002-10-12 08:34:26 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
dfa->nodes[right_par->node_idx].opr.idx = cur_nsub;
|
2002-07-10 23:09:16 +00:00
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return tree;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function parse repetition operators like "*", "+", "{1,3}" etc. */
|
|
|
|
|
|
|
|
|
|
static bin_tree_t *
|
2003-12-27 23:40:06 +00:00
|
|
|
|
parse_dup_op (elem, regexp, dfa, token, syntax, err)
|
|
|
|
|
bin_tree_t *elem;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_string_t *regexp;
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
reg_errcode_t *err;
|
|
|
|
|
{
|
|
|
|
|
re_token_t dup_token;
|
2003-12-27 23:40:06 +00:00
|
|
|
|
bin_tree_t *tree = NULL;
|
|
|
|
|
int i, start, end, start_idx = re_string_cur_idx (regexp);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_token_t start_token = *token;
|
2003-12-27 23:40:06 +00:00
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (token->type == OP_OPEN_DUP_NUM)
|
|
|
|
|
{
|
2003-12-27 23:40:06 +00:00
|
|
|
|
end = 0;
|
|
|
|
|
start = fetch_number (regexp, token, syntax);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (start == -1)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
if (token->type == CHARACTER && token->opr.c == ',')
|
|
|
|
|
start = 0; /* We treat "{,m}" as "{0,m}". */
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*err = REG_BADBR; /* <re>{} is invalid. */
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-04-20 00:57:03 +00:00
|
|
|
|
if (BE (start != -2, 1))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
/* We treat "{n}" as "{n,n}". */
|
|
|
|
|
end = ((token->type == OP_CLOSE_DUP_NUM) ? start
|
|
|
|
|
: ((token->type == CHARACTER && token->opr.c == ',')
|
|
|
|
|
? fetch_number (regexp, token, syntax) : -2));
|
|
|
|
|
}
|
2002-04-20 00:57:03 +00:00
|
|
|
|
if (BE (start == -2 || end == -2, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
/* Invalid sequence. */
|
2003-12-27 23:40:06 +00:00
|
|
|
|
if (BE (!(syntax & RE_INVALID_INTERVAL_ORD), 0))
|
|
|
|
|
{
|
|
|
|
|
if (token->type == END_OF_RE)
|
|
|
|
|
*err = REG_EBRACE;
|
|
|
|
|
else
|
|
|
|
|
*err = REG_BADBR;
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the syntax bit is set, rollback. */
|
|
|
|
|
re_string_set_index (regexp, start_idx);
|
|
|
|
|
*token = start_token;
|
|
|
|
|
token->type = CHARACTER;
|
|
|
|
|
/* mb_partial and word_char bits should be already initialized by
|
|
|
|
|
peek_token. */
|
|
|
|
|
return elem;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
2003-12-27 23:40:06 +00:00
|
|
|
|
|
|
|
|
|
if (BE (end != -1 && start > end, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2003-12-27 23:40:06 +00:00
|
|
|
|
/* First number greater than second. */
|
|
|
|
|
*err = REG_BADBR;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2003-12-27 23:40:06 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
start = (token->type == OP_DUP_PLUS) ? 1 : 0;
|
|
|
|
|
end = (token->type == OP_DUP_QUESTION) ? 1 : -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Treat "<re>{0}*" etc. as "<re>{0}". */
|
|
|
|
|
if (BE (elem == NULL, 0))
|
|
|
|
|
start = end = 0;
|
2002-04-20 00:57:03 +00:00
|
|
|
|
|
2003-12-27 23:40:06 +00:00
|
|
|
|
/* Extract "<re>{n,m}" to "<re><re>...<re><re>{0,<m-n>}". */
|
|
|
|
|
else if (BE (start > 0, 0))
|
|
|
|
|
{
|
|
|
|
|
tree = elem;
|
|
|
|
|
for (i = 2; i <= start; ++i)
|
2003-12-22 06:45:04 +00:00
|
|
|
|
{
|
2003-12-27 23:40:06 +00:00
|
|
|
|
elem = duplicate_tree (elem, dfa);
|
|
|
|
|
tree = create_tree (dfa, tree, elem, CONCAT, 0);
|
|
|
|
|
if (BE (elem == NULL || tree == NULL, 0))
|
2003-12-22 06:45:04 +00:00
|
|
|
|
goto parse_dup_op_espace;
|
|
|
|
|
}
|
2003-12-27 23:40:06 +00:00
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
2003-12-27 23:40:06 +00:00
|
|
|
|
if (BE (end != start, 1))
|
|
|
|
|
{
|
|
|
|
|
dup_token.type = (end == -1 ? OP_DUP_ASTERISK : OP_DUP_QUESTION);
|
|
|
|
|
if (BE (start > 0, 0))
|
2003-11-13 17:25:46 +00:00
|
|
|
|
{
|
2003-12-27 23:40:06 +00:00
|
|
|
|
elem = duplicate_tree (elem, dfa);
|
|
|
|
|
if (BE (elem == NULL, 0))
|
|
|
|
|
goto parse_dup_op_espace;
|
|
|
|
|
|
|
|
|
|
/* This subexpression will be marked as optional, so that
|
|
|
|
|
empty matches do not touch the registers. */
|
|
|
|
|
mark_opt_subexp (elem, dfa);
|
|
|
|
|
|
|
|
|
|
/* Prepare the tree with the modifier. */
|
|
|
|
|
elem = re_dfa_add_tree_node (dfa, elem, NULL, &dup_token);
|
|
|
|
|
tree = create_tree (dfa, tree, elem, CONCAT, 0);
|
2003-11-13 17:25:46 +00:00
|
|
|
|
}
|
2003-12-27 23:40:06 +00:00
|
|
|
|
else
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2003-12-27 23:40:06 +00:00
|
|
|
|
/* We do not need to duplicate the tree because we have not
|
|
|
|
|
created it yet. */
|
|
|
|
|
mark_opt_subexp (elem, dfa);
|
|
|
|
|
tree = elem = re_dfa_add_tree_node (dfa, elem, NULL, &dup_token);
|
|
|
|
|
}
|
2003-12-29 00:42:16 +00:00
|
|
|
|
|
2003-12-27 23:40:06 +00:00
|
|
|
|
if (BE (elem == NULL || tree == NULL, 0))
|
|
|
|
|
goto parse_dup_op_espace;
|
|
|
|
|
|
|
|
|
|
/* This loop is actually executed only when end != -1,
|
|
|
|
|
to rewrite <re>{0,n} as <re>?<re>?<re>?... We have
|
|
|
|
|
already created the start+1-th copy. */
|
|
|
|
|
for (i = start + 2; i <= end; ++i)
|
|
|
|
|
{
|
|
|
|
|
elem = duplicate_tree (elem, dfa);
|
|
|
|
|
tree = create_tree (dfa, tree, elem, CONCAT, 0);
|
|
|
|
|
if (BE (elem == NULL || tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2003-12-27 23:40:06 +00:00
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
2003-12-27 23:40:06 +00:00
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
2003-12-27 23:40:06 +00:00
|
|
|
|
|
2003-11-21 23:42:18 +00:00
|
|
|
|
fetch_token (token, regexp, syntax);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return tree;
|
|
|
|
|
|
|
|
|
|
parse_dup_op_espace:
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Size of the names for collating symbol/equivalence_class/character_class.
|
|
|
|
|
I'm not sure, but maybe enough. */
|
|
|
|
|
#define BRACKET_NAME_BUF_SIZE 32
|
|
|
|
|
|
2002-04-26 20:52:02 +00:00
|
|
|
|
#ifndef _LIBC
|
|
|
|
|
/* Local function for parse_bracket_exp only used in case of NOT _LIBC.
|
|
|
|
|
Build the range expression which starts from START_ELEM, and ends
|
|
|
|
|
at END_ELEM. The result are written to MBCSET and SBCSET.
|
|
|
|
|
RANGE_ALLOC is the allocated size of mbcset->range_starts, and
|
|
|
|
|
mbcset->range_ends, is a pointer argument sinse we may
|
|
|
|
|
update it. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# ifdef RE_ENABLE_I18N
|
|
|
|
|
build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
|
2002-04-26 20:52:02 +00:00
|
|
|
|
re_charset_t *mbcset;
|
|
|
|
|
int *range_alloc;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# else /* not RE_ENABLE_I18N */
|
|
|
|
|
build_range_exp (sbcset, start_elem, end_elem)
|
|
|
|
|
# endif /* not RE_ENABLE_I18N */
|
|
|
|
|
re_bitset_ptr_t sbcset;
|
2002-04-26 20:52:02 +00:00
|
|
|
|
bracket_elem_t *start_elem, *end_elem;
|
|
|
|
|
{
|
|
|
|
|
unsigned int start_ch, end_ch;
|
|
|
|
|
/* Equivalence Classes and Character Classes can't be a range start/end. */
|
|
|
|
|
if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|| end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS,
|
|
|
|
|
0))
|
2002-04-26 20:52:02 +00:00
|
|
|
|
return REG_ERANGE;
|
|
|
|
|
|
|
|
|
|
/* We can handle no multi character collating elements without libc
|
|
|
|
|
support. */
|
2002-09-10 17:39:58 +00:00
|
|
|
|
if (BE ((start_elem->type == COLL_SYM
|
2002-11-06 20:36:47 +00:00
|
|
|
|
&& strlen ((char *) start_elem->opr.name) > 1)
|
|
|
|
|
|| (end_elem->type == COLL_SYM
|
|
|
|
|
&& strlen ((char *) end_elem->opr.name) > 1), 0))
|
2002-04-26 20:52:02 +00:00
|
|
|
|
return REG_ECOLLATE;
|
|
|
|
|
|
|
|
|
|
# ifdef RE_ENABLE_I18N
|
|
|
|
|
{
|
|
|
|
|
wchar_t wc, start_wc, end_wc;
|
|
|
|
|
wchar_t cmp_buf[6] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'};
|
|
|
|
|
|
|
|
|
|
start_ch = ((start_elem->type == SB_CHAR) ? start_elem->opr.ch
|
2002-11-06 20:36:47 +00:00
|
|
|
|
: ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0]
|
|
|
|
|
: 0));
|
2002-04-26 20:52:02 +00:00
|
|
|
|
end_ch = ((end_elem->type == SB_CHAR) ? end_elem->opr.ch
|
2002-11-06 20:36:47 +00:00
|
|
|
|
: ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0]
|
|
|
|
|
: 0));
|
2002-04-26 20:52:02 +00:00
|
|
|
|
start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
? __btowc (start_ch) : start_elem->opr.wch);
|
2002-04-26 20:52:02 +00:00
|
|
|
|
end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
? __btowc (end_ch) : end_elem->opr.wch);
|
2004-01-30 05:19:45 +00:00
|
|
|
|
if (start_wc == WEOF || end_wc == WEOF)
|
|
|
|
|
return REG_ECOLLATE;
|
2002-04-26 20:52:02 +00:00
|
|
|
|
cmp_buf[0] = start_wc;
|
|
|
|
|
cmp_buf[4] = end_wc;
|
|
|
|
|
if (wcscoll (cmp_buf, cmp_buf + 4) > 0)
|
|
|
|
|
return REG_ERANGE;
|
|
|
|
|
|
2004-01-14 02:42:20 +00:00
|
|
|
|
/* Got valid collation sequence values, add them as a new entry.
|
|
|
|
|
However, for !_LIBC we have no collation elements: if the
|
|
|
|
|
character set is single byte, the single byte character set
|
|
|
|
|
that we build below suffices. parse_bracket_exp passes
|
|
|
|
|
no MBCSET if dfa->mb_cur_max == 1. */
|
|
|
|
|
if (mbcset)
|
2002-04-26 20:52:02 +00:00
|
|
|
|
{
|
2004-01-14 02:42:20 +00:00
|
|
|
|
/* Check the space of the arrays. */
|
|
|
|
|
if (BE (*range_alloc == mbcset->nranges, 0))
|
|
|
|
|
{
|
|
|
|
|
/* There is not enough space, need realloc. */
|
|
|
|
|
wchar_t *new_array_start, *new_array_end;
|
|
|
|
|
int new_nranges;
|
|
|
|
|
|
|
|
|
|
/* +1 in case of mbcset->nranges is 0. */
|
|
|
|
|
new_nranges = 2 * mbcset->nranges + 1;
|
|
|
|
|
/* Use realloc since mbcset->range_starts and mbcset->range_ends
|
|
|
|
|
are NULL if *range_alloc == 0. */
|
|
|
|
|
new_array_start = re_realloc (mbcset->range_starts, wchar_t,
|
|
|
|
|
new_nranges);
|
|
|
|
|
new_array_end = re_realloc (mbcset->range_ends, wchar_t,
|
|
|
|
|
new_nranges);
|
|
|
|
|
|
|
|
|
|
if (BE (new_array_start == NULL || new_array_end == NULL, 0))
|
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
|
|
|
|
|
mbcset->range_starts = new_array_start;
|
|
|
|
|
mbcset->range_ends = new_array_end;
|
|
|
|
|
*range_alloc = new_nranges;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mbcset->range_starts[mbcset->nranges] = start_wc;
|
|
|
|
|
mbcset->range_ends[mbcset->nranges++] = end_wc;
|
2002-04-26 20:52:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Build the table for single byte characters. */
|
2004-02-06 18:30:34 +00:00
|
|
|
|
for (wc = 0; wc < SBC_MAX; ++wc)
|
2002-04-26 20:52:02 +00:00
|
|
|
|
{
|
2002-11-06 20:36:47 +00:00
|
|
|
|
cmp_buf[2] = wc;
|
|
|
|
|
if (wcscoll (cmp_buf, cmp_buf + 2) <= 0
|
|
|
|
|
&& wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0)
|
|
|
|
|
bitset_set (sbcset, wc);
|
2002-04-26 20:52:02 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
# else /* not RE_ENABLE_I18N */
|
|
|
|
|
{
|
|
|
|
|
unsigned int ch;
|
|
|
|
|
start_ch = ((start_elem->type == SB_CHAR ) ? start_elem->opr.ch
|
2002-11-06 20:36:47 +00:00
|
|
|
|
: ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0]
|
|
|
|
|
: 0));
|
2002-04-26 20:52:02 +00:00
|
|
|
|
end_ch = ((end_elem->type == SB_CHAR ) ? end_elem->opr.ch
|
2002-11-06 20:36:47 +00:00
|
|
|
|
: ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0]
|
|
|
|
|
: 0));
|
2002-04-26 20:52:02 +00:00
|
|
|
|
if (start_ch > end_ch)
|
|
|
|
|
return REG_ERANGE;
|
|
|
|
|
/* Build the table for single byte characters. */
|
2004-02-06 18:30:34 +00:00
|
|
|
|
for (ch = 0; ch < SBC_MAX; ++ch)
|
2002-04-26 20:52:02 +00:00
|
|
|
|
if (start_ch <= ch && ch <= end_ch)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
bitset_set (sbcset, ch);
|
2002-04-26 20:52:02 +00:00
|
|
|
|
}
|
|
|
|
|
# endif /* not RE_ENABLE_I18N */
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
#endif /* not _LIBC */
|
|
|
|
|
|
|
|
|
|
#ifndef _LIBC
|
|
|
|
|
/* Helper function for parse_bracket_exp only used in case of NOT _LIBC..
|
|
|
|
|
Build the collating element which is represented by NAME.
|
|
|
|
|
The result are written to MBCSET and SBCSET.
|
|
|
|
|
COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
|
|
|
|
|
pointer argument since we may update it. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# ifdef RE_ENABLE_I18N
|
|
|
|
|
build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
|
2002-04-26 20:52:02 +00:00
|
|
|
|
re_charset_t *mbcset;
|
|
|
|
|
int *coll_sym_alloc;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# else /* not RE_ENABLE_I18N */
|
|
|
|
|
build_collating_symbol (sbcset, name)
|
|
|
|
|
# endif /* not RE_ENABLE_I18N */
|
|
|
|
|
re_bitset_ptr_t sbcset;
|
2002-09-10 17:39:58 +00:00
|
|
|
|
const unsigned char *name;
|
2002-04-26 20:52:02 +00:00
|
|
|
|
{
|
2002-09-10 17:39:58 +00:00
|
|
|
|
size_t name_len = strlen ((const char *) name);
|
|
|
|
|
if (BE (name_len != 1, 0))
|
2002-04-26 20:52:02 +00:00
|
|
|
|
return REG_ECOLLATE;
|
|
|
|
|
else
|
|
|
|
|
{
|
2002-09-10 17:39:58 +00:00
|
|
|
|
bitset_set (sbcset, name[0]);
|
2002-04-26 20:52:02 +00:00
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif /* not _LIBC */
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* This function parse bracket expression like "[abc]", "[a-c]",
|
|
|
|
|
"[[.a-a.]]" etc. */
|
|
|
|
|
|
|
|
|
|
static bin_tree_t *
|
|
|
|
|
parse_bracket_exp (regexp, dfa, token, syntax, err)
|
|
|
|
|
re_string_t *regexp;
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
reg_errcode_t *err;
|
|
|
|
|
{
|
|
|
|
|
#ifdef _LIBC
|
2002-09-10 17:39:58 +00:00
|
|
|
|
const unsigned char *collseqmb;
|
|
|
|
|
const char *collseqwc;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
uint32_t nrules;
|
|
|
|
|
int32_t table_size;
|
|
|
|
|
const int32_t *symb_table;
|
|
|
|
|
const unsigned char *extra;
|
|
|
|
|
|
2002-04-26 20:52:02 +00:00
|
|
|
|
/* Local function for parse_bracket_exp used in _LIBC environement.
|
2002-02-26 19:06:03 +00:00
|
|
|
|
Seek the collating symbol entry correspondings to NAME.
|
|
|
|
|
Return the index of the symbol in the SYMB_TABLE. */
|
|
|
|
|
|
2004-09-24 17:09:04 +00:00
|
|
|
|
auto inline int32_t
|
2003-06-13 21:05:42 +00:00
|
|
|
|
__attribute ((always_inline))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
seek_collating_symbol_entry (name, name_len)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
const unsigned char *name;
|
|
|
|
|
size_t name_len;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
2002-09-10 17:39:58 +00:00
|
|
|
|
int32_t hash = elem_hash ((const char *) name, name_len);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
int32_t elem = hash % table_size;
|
|
|
|
|
int32_t second = hash % (table_size - 2);
|
|
|
|
|
while (symb_table[2 * elem] != 0)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
/* First compare the hashing value. */
|
|
|
|
|
if (symb_table[2 * elem] == hash
|
|
|
|
|
/* Compare the length of the name. */
|
|
|
|
|
&& name_len == extra[symb_table[2 * elem + 1]]
|
|
|
|
|
/* Compare the name. */
|
|
|
|
|
&& memcmp (name, &extra[symb_table[2 * elem + 1] + 1],
|
|
|
|
|
name_len) == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Yep, this is the entry. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Next entry. */
|
|
|
|
|
elem += second;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return elem;
|
|
|
|
|
}
|
|
|
|
|
|
2002-04-26 20:52:02 +00:00
|
|
|
|
/* Local function for parse_bracket_exp used in _LIBC environement.
|
2002-02-26 19:06:03 +00:00
|
|
|
|
Look up the collation sequence value of BR_ELEM.
|
|
|
|
|
Return the value if succeeded, UINT_MAX otherwise. */
|
|
|
|
|
|
2004-09-24 17:09:04 +00:00
|
|
|
|
auto inline unsigned int
|
2003-06-13 21:05:42 +00:00
|
|
|
|
__attribute ((always_inline))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
lookup_collation_sequence_value (br_elem)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
bracket_elem_t *br_elem;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
if (br_elem->type == SB_CHAR)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
if (MB_CUR_MAX == 1)
|
|
|
|
|
*/
|
|
|
|
|
if (nrules == 0)
|
|
|
|
|
return collseqmb[br_elem->opr.ch];
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
wint_t wc = __btowc (br_elem->opr.ch);
|
2003-06-13 21:05:42 +00:00
|
|
|
|
return __collseq_table_lookup (collseqwc, wc);
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else if (br_elem->type == MB_CHAR)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2003-06-13 21:05:42 +00:00
|
|
|
|
return __collseq_table_lookup (collseqwc, br_elem->opr.wch);
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else if (br_elem->type == COLL_SYM)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
size_t sym_name_len = strlen ((char *) br_elem->opr.name);
|
|
|
|
|
if (nrules != 0)
|
|
|
|
|
{
|
|
|
|
|
int32_t elem, idx;
|
|
|
|
|
elem = seek_collating_symbol_entry (br_elem->opr.name,
|
|
|
|
|
sym_name_len);
|
|
|
|
|
if (symb_table[2 * elem] != 0)
|
|
|
|
|
{
|
|
|
|
|
/* We found the entry. */
|
|
|
|
|
idx = symb_table[2 * elem + 1];
|
|
|
|
|
/* Skip the name of collating element name. */
|
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
|
/* Skip the byte sequence of the collating element. */
|
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
|
/* Adjust for the alignment. */
|
|
|
|
|
idx = (idx + 3) & ~3;
|
|
|
|
|
/* Skip the multibyte collation sequence value. */
|
|
|
|
|
idx += sizeof (unsigned int);
|
|
|
|
|
/* Skip the wide char sequence of the collating element. */
|
|
|
|
|
idx += sizeof (unsigned int) *
|
|
|
|
|
(1 + *(unsigned int *) (extra + idx));
|
|
|
|
|
/* Return the collation sequence value. */
|
|
|
|
|
return *(unsigned int *) (extra + idx);
|
|
|
|
|
}
|
|
|
|
|
else if (symb_table[2 * elem] == 0 && sym_name_len == 1)
|
|
|
|
|
{
|
|
|
|
|
/* No valid character. Match it as a single byte
|
|
|
|
|
character. */
|
|
|
|
|
return collseqmb[br_elem->opr.name[0]];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (sym_name_len == 1)
|
|
|
|
|
return collseqmb[br_elem->opr.name[0]];
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return UINT_MAX;
|
|
|
|
|
}
|
|
|
|
|
|
2002-04-26 20:52:02 +00:00
|
|
|
|
/* Local function for parse_bracket_exp used in _LIBC environement.
|
2002-02-26 19:06:03 +00:00
|
|
|
|
Build the range expression which starts from START_ELEM, and ends
|
|
|
|
|
at END_ELEM. The result are written to MBCSET and SBCSET.
|
|
|
|
|
RANGE_ALLOC is the allocated size of mbcset->range_starts, and
|
|
|
|
|
mbcset->range_ends, is a pointer argument sinse we may
|
|
|
|
|
update it. */
|
|
|
|
|
|
2004-09-24 17:09:04 +00:00
|
|
|
|
auto inline reg_errcode_t
|
2003-06-13 21:05:42 +00:00
|
|
|
|
__attribute ((always_inline))
|
2002-05-24 08:49:00 +00:00
|
|
|
|
build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_charset_t *mbcset;
|
|
|
|
|
int *range_alloc;
|
|
|
|
|
re_bitset_ptr_t sbcset;
|
|
|
|
|
bracket_elem_t *start_elem, *end_elem;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned int ch;
|
|
|
|
|
uint32_t start_collseq;
|
|
|
|
|
uint32_t end_collseq;
|
|
|
|
|
|
2002-04-26 20:52:02 +00:00
|
|
|
|
/* Equivalence Classes and Character Classes can't be a range
|
2002-11-06 20:36:47 +00:00
|
|
|
|
start/end. */
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS
|
2002-11-06 20:36:47 +00:00
|
|
|
|
|| end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS,
|
|
|
|
|
0))
|
|
|
|
|
return REG_ERANGE;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
start_collseq = lookup_collation_sequence_value (start_elem);
|
|
|
|
|
end_collseq = lookup_collation_sequence_value (end_elem);
|
|
|
|
|
/* Check start/end collation sequence values. */
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (start_collseq == UINT_MAX || end_collseq == UINT_MAX, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return REG_ECOLLATE;
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_collseq > end_collseq, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return REG_ERANGE;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
2004-01-14 02:42:20 +00:00
|
|
|
|
/* Got valid collation sequence values, add them as a new entry.
|
|
|
|
|
However, if we have no collation elements, and the character set
|
|
|
|
|
is single byte, the single byte character set that we
|
|
|
|
|
build below suffices. */
|
|
|
|
|
if (nrules > 0 || dfa->mb_cur_max > 1)
|
|
|
|
|
{
|
|
|
|
|
/* Check the space of the arrays. */
|
|
|
|
|
if (BE (*range_alloc == mbcset->nranges, 0))
|
|
|
|
|
{
|
|
|
|
|
/* There is not enough space, need realloc. */
|
|
|
|
|
uint32_t *new_array_start;
|
|
|
|
|
uint32_t *new_array_end;
|
|
|
|
|
int new_nranges;
|
|
|
|
|
|
|
|
|
|
/* +1 in case of mbcset->nranges is 0. */
|
|
|
|
|
new_nranges = 2 * mbcset->nranges + 1;
|
|
|
|
|
new_array_start = re_realloc (mbcset->range_starts, uint32_t,
|
|
|
|
|
new_nranges);
|
|
|
|
|
new_array_end = re_realloc (mbcset->range_ends, uint32_t,
|
|
|
|
|
new_nranges);
|
|
|
|
|
|
|
|
|
|
if (BE (new_array_start == NULL || new_array_end == NULL, 0))
|
|
|
|
|
return REG_ESPACE;
|
|
|
|
|
|
|
|
|
|
mbcset->range_starts = new_array_start;
|
|
|
|
|
mbcset->range_ends = new_array_end;
|
|
|
|
|
*range_alloc = new_nranges;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mbcset->range_starts[mbcset->nranges] = start_collseq;
|
|
|
|
|
mbcset->range_ends[mbcset->nranges++] = end_collseq;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
/* Build the table for single byte characters. */
|
2004-02-06 18:30:34 +00:00
|
|
|
|
for (ch = 0; ch < SBC_MAX; ch++)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
uint32_t ch_collseq;
|
|
|
|
|
/*
|
|
|
|
|
if (MB_CUR_MAX == 1)
|
|
|
|
|
*/
|
|
|
|
|
if (nrules == 0)
|
|
|
|
|
ch_collseq = collseqmb[ch];
|
|
|
|
|
else
|
2003-06-13 21:05:42 +00:00
|
|
|
|
ch_collseq = __collseq_table_lookup (collseqwc, __btowc (ch));
|
2002-11-06 20:36:47 +00:00
|
|
|
|
if (start_collseq <= ch_collseq && ch_collseq <= end_collseq)
|
|
|
|
|
bitset_set (sbcset, ch);
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2002-04-26 20:52:02 +00:00
|
|
|
|
/* Local function for parse_bracket_exp used in _LIBC environement.
|
2002-02-26 19:06:03 +00:00
|
|
|
|
Build the collating element which is represented by NAME.
|
|
|
|
|
The result are written to MBCSET and SBCSET.
|
|
|
|
|
COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
|
|
|
|
|
pointer argument sinse we may update it. */
|
|
|
|
|
|
2004-09-24 17:09:04 +00:00
|
|
|
|
auto inline reg_errcode_t
|
2003-06-13 21:05:42 +00:00
|
|
|
|
__attribute ((always_inline))
|
2002-05-24 08:49:00 +00:00
|
|
|
|
build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
re_charset_t *mbcset;
|
|
|
|
|
int *coll_sym_alloc;
|
|
|
|
|
re_bitset_ptr_t sbcset;
|
|
|
|
|
const unsigned char *name;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
int32_t elem, idx;
|
2002-09-10 17:39:58 +00:00
|
|
|
|
size_t name_len = strlen ((const char *) name);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (nrules != 0)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
elem = seek_collating_symbol_entry (name, name_len);
|
|
|
|
|
if (symb_table[2 * elem] != 0)
|
|
|
|
|
{
|
|
|
|
|
/* We found the entry. */
|
|
|
|
|
idx = symb_table[2 * elem + 1];
|
|
|
|
|
/* Skip the name of collating element name. */
|
|
|
|
|
idx += 1 + extra[idx];
|
|
|
|
|
}
|
|
|
|
|
else if (symb_table[2 * elem] == 0 && name_len == 1)
|
|
|
|
|
{
|
|
|
|
|
/* No valid character, treat it as a normal
|
|
|
|
|
character. */
|
|
|
|
|
bitset_set (sbcset, name[0]);
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return REG_ECOLLATE;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
2002-11-06 20:36:47 +00:00
|
|
|
|
/* Got valid collation sequence, add it as a new entry. */
|
|
|
|
|
/* Check the space of the arrays. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
if (BE (*coll_sym_alloc == mbcset->ncoll_syms, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
/* Not enough, realloc it. */
|
|
|
|
|
/* +1 in case of mbcset->ncoll_syms is 0. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
int new_coll_sym_alloc = 2 * mbcset->ncoll_syms + 1;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
/* Use realloc since mbcset->coll_syms is NULL
|
|
|
|
|
if *alloc == 0. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t,
|
|
|
|
|
new_coll_sym_alloc);
|
|
|
|
|
if (BE (new_coll_syms == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return REG_ESPACE;
|
2003-11-23 19:21:23 +00:00
|
|
|
|
mbcset->coll_syms = new_coll_syms;
|
|
|
|
|
*coll_sym_alloc = new_coll_sym_alloc;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
mbcset->coll_syms[mbcset->ncoll_syms++] = idx;
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
if (BE (name_len != 1, 0))
|
|
|
|
|
return REG_ECOLLATE;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bitset_set (sbcset, name[0]);
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
2002-04-26 20:52:02 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_token_t br_token;
|
|
|
|
|
re_bitset_ptr_t sbcset;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_charset_t *mbcset;
|
|
|
|
|
int coll_sym_alloc = 0, range_alloc = 0, mbchar_alloc = 0;
|
|
|
|
|
int equiv_class_alloc = 0, char_class_alloc = 0;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* not RE_ENABLE_I18N */
|
2004-01-14 02:42:20 +00:00
|
|
|
|
int non_match = 0;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
bin_tree_t *work_tree;
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
int token_len;
|
Update.
2003-12-22 Jakub Jelinek <jakub@redhat.com>
* posix/regcomp.c: Remove C99-ism.
* posix/tst-rxspencer.c: Likewise.
Based on a patch by Alex Davis <alex14641@yahoo.com>.
2002-12-17 Paolo Bonzini <bonzini@gnu.org>
* posix/regex_internal.h [!_LIBC] (internal_function): Define.
(re_string_allocate, re_string_construct, re_string_reconstruct,
re_string_realloc_buffers, build_wcs_buffer,
build_wcs_upper_buffer, build_upper_buffer,
re_string_translate_buffer, re_string_destruct,
re_string_elem_size_at, re_string_char_size_at,
re_string_wchar_at, re_string_context_at,
re_node_set_alloc, re_node_set_init_1
re_node_set_init_2, re_node_set_init_copy,
re_node_set_add_intersect, re_node_set_init_union,
re_node_set_merge, re_node_set_insert
re_node_set_compare, re_node_set_contains
re_node_set_remove_at, re_dfa_add_node,
re_acquire_state, re_acquire_state_context,
free_state): Add internal_function to declaration.
* posix/regexec.c (match_ctx_init, match_ctx_clean,
match_ctx_free, match_ctx_free_subtops,
match_ctx_add_entry, search_cur_bkref_entry,
match_ctx_clear_flag, match_ctx_add_subtop,
match_ctx_add_sublast, sift_ctx_init,
re_search_internal, re_search_2_stub, re_search_stub,
re_copy_regs, acquire_init_state_context,
prune_impossible_nodes, check_matching,
check_halt_node_context, check_halt_state_context
update_regs, proceed_next_node, push_fail_stack,
pop_fail_stack, set_regs, free_fail_stack_return,
sift_states_iter_mb, sift_states_backward
update_cur_sifted_state, add_epsilon_src_nodes,
sub_epsilon_src_nodes, check_dst_limits,
check_dst_limits_calc_pos, check_subexp_limits,
sift_states_bkref, clean_state_log_if_need,
merge_state_array, transit_state,
check_subexp_matching_top, transit_state_sb,
transit_state_mb, transit_state_bkref,
get_subexp, get_subexp_sub, find_subexp_node,
check_arrival, check_arrival_add_next_nodes,
find_collation_sequence_value, check_arrival_expand_ecl,
check_arrival_expand_ecl_sub, expand_bkref_cache,
build_trtable, check_node_accept_bytes, extend_buffers,
group_nodes_into_DFAstates, check_node_accept): Likewise.
* posix/regex_internal.c (re_string_construct_common,
re_string_skip_chars, create_newstate_common,
register_state, create_ci_newstate, create_cd_newstate,
calc_state_hash): Likewise.
(re_string_peek_byte_case, re_fetch_byte_case): Change
declaration from ANSI to K&R.
2002-12-16 Paolo Bonzini <bonzini@gnu.org>
* posix/regexec.c (build_trtable): Don't allocate the trtable
until state->word_trtable is known. Don't hardcode UINT_BITS
iterations on each bitset item.
2003-12-23 02:29:44 +00:00
|
|
|
|
int first_round = 1;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
#ifdef _LIBC
|
2002-09-10 17:39:58 +00:00
|
|
|
|
collseqmb = (const unsigned char *)
|
|
|
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQMB);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
|
|
|
|
|
if (nrules)
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
if (MB_CUR_MAX > 1)
|
|
|
|
|
*/
|
2002-11-06 20:36:47 +00:00
|
|
|
|
collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
table_size = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_SYMB_HASH_SIZEMB);
|
|
|
|
|
symb_table = (const int32_t *) _NL_CURRENT (LC_COLLATE,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
_NL_COLLATE_SYMB_TABLEMB);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
extra = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
_NL_COLLATE_SYMB_EXTRAMB);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
sbcset = (re_bitset_ptr_t) calloc (sizeof (unsigned int), BITSET_UINTS);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (sbcset == NULL || mbcset == NULL, 0))
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#else
|
|
|
|
|
if (BE (sbcset == NULL, 0))
|
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
token_len = peek_token_bracket (token, regexp, syntax);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (token->type == END_OF_RE, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_BADPAT;
|
2002-04-26 20:52:02 +00:00
|
|
|
|
goto parse_bracket_exp_free_return;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
if (token->type == OP_NON_MATCH_LIST)
|
|
|
|
|
{
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
mbcset->non_match = 1;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* not RE_ENABLE_I18N */
|
2004-01-14 02:42:20 +00:00
|
|
|
|
non_match = 1;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (syntax & RE_HAT_LISTS_NOT_NEWLINE)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
bitset_set (sbcset, '\0');
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_string_skip_bytes (regexp, token_len); /* Skip a token. */
|
|
|
|
|
token_len = peek_token_bracket (token, regexp, syntax);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (token->type == END_OF_RE, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_BADPAT;
|
|
|
|
|
goto parse_bracket_exp_free_return;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We treat the first ']' as a normal character. */
|
|
|
|
|
if (token->type == OP_CLOSE_BRACKET)
|
|
|
|
|
token->type = CHARACTER;
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
bracket_elem_t start_elem, end_elem;
|
2002-09-10 17:39:58 +00:00
|
|
|
|
unsigned char start_name_buf[BRACKET_NAME_BUF_SIZE];
|
|
|
|
|
unsigned char end_name_buf[BRACKET_NAME_BUF_SIZE];
|
2002-02-26 19:06:03 +00:00
|
|
|
|
reg_errcode_t ret;
|
|
|
|
|
int token_len2 = 0, is_range_exp = 0;
|
|
|
|
|
re_token_t token2;
|
|
|
|
|
|
|
|
|
|
start_elem.opr.name = start_name_buf;
|
|
|
|
|
ret = parse_bracket_element (&start_elem, regexp, token, token_len, dfa,
|
2003-11-13 20:04:16 +00:00
|
|
|
|
syntax, first_round);
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (ret != REG_NOERROR, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
*err = ret;
|
|
|
|
|
goto parse_bracket_exp_free_return;
|
|
|
|
|
}
|
2003-11-13 20:04:16 +00:00
|
|
|
|
first_round = 0;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
2003-11-13 20:04:16 +00:00
|
|
|
|
/* Get information about the next token. We need it in any case. */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
token_len = peek_token_bracket (token, regexp, syntax);
|
2003-11-13 20:04:16 +00:00
|
|
|
|
|
|
|
|
|
/* Do not check for ranges if we know they are not allowed. */
|
|
|
|
|
if (start_elem.type != CHAR_CLASS && start_elem.type != EQUIV_CLASS)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
if (BE (token->type == END_OF_RE, 0))
|
|
|
|
|
{
|
2003-11-13 20:04:16 +00:00
|
|
|
|
*err = REG_EBRACK;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
goto parse_bracket_exp_free_return;
|
|
|
|
|
}
|
2003-11-13 20:04:16 +00:00
|
|
|
|
if (token->type == OP_CHARSET_RANGE)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2003-11-13 20:04:16 +00:00
|
|
|
|
re_string_skip_bytes (regexp, token_len); /* Skip '-'. */
|
|
|
|
|
token_len2 = peek_token_bracket (&token2, regexp, syntax);
|
|
|
|
|
if (BE (token2.type == END_OF_RE, 0))
|
|
|
|
|
{
|
|
|
|
|
*err = REG_EBRACK;
|
|
|
|
|
goto parse_bracket_exp_free_return;
|
|
|
|
|
}
|
|
|
|
|
if (token2.type == OP_CLOSE_BRACKET)
|
|
|
|
|
{
|
|
|
|
|
/* We treat the last '-' as a normal character. */
|
|
|
|
|
re_string_skip_bytes (regexp, -token_len);
|
|
|
|
|
token->type = CHARACTER;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
is_range_exp = 1;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
if (is_range_exp == 1)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
end_elem.opr.name = end_name_buf;
|
|
|
|
|
ret = parse_bracket_element (&end_elem, regexp, &token2, token_len2,
|
2003-11-13 20:04:16 +00:00
|
|
|
|
dfa, syntax, 1);
|
2002-11-06 20:36:47 +00:00
|
|
|
|
if (BE (ret != REG_NOERROR, 0))
|
|
|
|
|
{
|
|
|
|
|
*err = ret;
|
|
|
|
|
goto parse_bracket_exp_free_return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
token_len = peek_token_bracket (token, regexp, syntax);
|
2003-11-13 20:04:16 +00:00
|
|
|
|
|
2004-01-14 02:42:20 +00:00
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
*err = build_range_exp (sbcset, mbcset, &range_alloc,
|
|
|
|
|
&start_elem, &end_elem);
|
|
|
|
|
#else
|
|
|
|
|
# ifdef RE_ENABLE_I18N
|
2002-11-06 20:36:47 +00:00
|
|
|
|
*err = build_range_exp (sbcset,
|
2004-01-14 02:42:20 +00:00
|
|
|
|
dfa->mb_cur_max > 1 ? mbcset : NULL,
|
|
|
|
|
&range_alloc, &start_elem, &end_elem);
|
|
|
|
|
# else
|
|
|
|
|
*err = build_range_exp (sbcset, &start_elem, &end_elem);
|
|
|
|
|
# endif
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-11-06 20:36:47 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR, 0))
|
|
|
|
|
goto parse_bracket_exp_free_return;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
switch (start_elem.type)
|
|
|
|
|
{
|
|
|
|
|
case SB_CHAR:
|
|
|
|
|
bitset_set (sbcset, start_elem.opr.ch);
|
|
|
|
|
break;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-11-06 20:36:47 +00:00
|
|
|
|
case MB_CHAR:
|
|
|
|
|
/* Check whether the array has enough space. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
if (BE (mbchar_alloc == mbcset->nmbchars, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
2003-11-23 19:21:23 +00:00
|
|
|
|
wchar_t *new_mbchars;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
/* Not enough, realloc it. */
|
|
|
|
|
/* +1 in case of mbcset->nmbchars is 0. */
|
|
|
|
|
mbchar_alloc = 2 * mbcset->nmbchars + 1;
|
|
|
|
|
/* Use realloc since array is NULL if *alloc == 0. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
new_mbchars = re_realloc (mbcset->mbchars, wchar_t,
|
|
|
|
|
mbchar_alloc);
|
|
|
|
|
if (BE (new_mbchars == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
goto parse_bracket_exp_espace;
|
2003-11-23 19:21:23 +00:00
|
|
|
|
mbcset->mbchars = new_mbchars;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
|
|
|
|
mbcset->mbchars[mbcset->nmbchars++] = start_elem.opr.wch;
|
|
|
|
|
break;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-11-06 20:36:47 +00:00
|
|
|
|
case EQUIV_CLASS:
|
|
|
|
|
*err = build_equiv_class (sbcset,
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-11-06 20:36:47 +00:00
|
|
|
|
mbcset, &equiv_class_alloc,
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
start_elem.opr.name);
|
2002-11-06 20:36:47 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR, 0))
|
|
|
|
|
goto parse_bracket_exp_free_return;
|
|
|
|
|
break;
|
|
|
|
|
case COLL_SYM:
|
|
|
|
|
*err = build_collating_symbol (sbcset,
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-11-06 20:36:47 +00:00
|
|
|
|
mbcset, &coll_sym_alloc,
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
start_elem.opr.name);
|
2002-11-06 20:36:47 +00:00
|
|
|
|
if (BE (*err != REG_NOERROR, 0))
|
|
|
|
|
goto parse_bracket_exp_free_return;
|
|
|
|
|
break;
|
|
|
|
|
case CHAR_CLASS:
|
2003-06-12 18:29:52 +00:00
|
|
|
|
*err = build_charclass (regexp->trans, sbcset,
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2003-01-16 19:20:36 +00:00
|
|
|
|
mbcset, &char_class_alloc,
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2003-01-16 19:20:36 +00:00
|
|
|
|
start_elem.opr.name, syntax);
|
|
|
|
|
if (BE (*err != REG_NOERROR, 0))
|
|
|
|
|
goto parse_bracket_exp_free_return;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
assert (0);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-11-13 20:04:16 +00:00
|
|
|
|
if (BE (token->type == END_OF_RE, 0))
|
|
|
|
|
{
|
|
|
|
|
*err = REG_EBRACK;
|
|
|
|
|
goto parse_bracket_exp_free_return;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (token->type == OP_CLOSE_BRACKET)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
break;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
re_string_skip_bytes (regexp, token_len); /* Skip a token. */
|
|
|
|
|
|
|
|
|
|
/* If it is non-matching list. */
|
2002-05-24 08:49:00 +00:00
|
|
|
|
if (non_match)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
bitset_not (sbcset);
|
2004-01-14 02:42:20 +00:00
|
|
|
|
|
2003-11-24 19:30:51 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
/* Ensure only single byte characters are set. */
|
|
|
|
|
if (dfa->mb_cur_max > 1)
|
|
|
|
|
bitset_mask (sbcset, dfa->sb_char);
|
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
/* Build a tree for simple bracket. */
|
|
|
|
|
br_token.type = SIMPLE_BRACKET;
|
|
|
|
|
br_token.opr.sbcset = sbcset;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
work_tree = re_dfa_add_tree_node (dfa, NULL, NULL, &br_token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (work_tree == NULL, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
goto parse_bracket_exp_espace;
|
|
|
|
|
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (mbcset->nmbchars || mbcset->ncoll_syms || mbcset->nequiv_classes
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
|| mbcset->nranges || (dfa->mb_cur_max > 1 && (mbcset->nchar_classes
|
|
|
|
|
|| mbcset->non_match)))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
re_token_t alt_token;
|
|
|
|
|
bin_tree_t *mbc_tree;
|
2003-11-18 23:40:59 +00:00
|
|
|
|
int sbc_idx;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Build a tree for complex bracket. */
|
2003-11-18 23:40:59 +00:00
|
|
|
|
dfa->has_mb_node = 1;
|
|
|
|
|
for (sbc_idx = 0; sbc_idx < BITSET_UINTS; ++sbc_idx)
|
|
|
|
|
if (sbcset[sbc_idx])
|
|
|
|
|
break;
|
|
|
|
|
/* If there are no bits set in sbcset, there is no point
|
|
|
|
|
of having both SIMPLE_BRACKET and COMPLEX_BRACKET. */
|
|
|
|
|
if (sbc_idx == BITSET_UINTS)
|
|
|
|
|
{
|
|
|
|
|
re_free (sbcset);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
dfa->nodes[work_tree->node_idx].type = COMPLEX_BRACKET;
|
|
|
|
|
dfa->nodes[work_tree->node_idx].opr.mbcset = mbcset;
|
2003-11-18 23:40:59 +00:00
|
|
|
|
return work_tree;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
br_token.type = COMPLEX_BRACKET;
|
|
|
|
|
br_token.opr.mbcset = mbcset;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
mbc_tree = re_dfa_add_tree_node (dfa, NULL, NULL, &br_token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (mbc_tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
goto parse_bracket_exp_espace;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Then join them by ALT node. */
|
|
|
|
|
alt_token.type = OP_ALT;
|
2003-11-26 03:24:15 +00:00
|
|
|
|
dfa->has_plural_match = 1;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
work_tree = re_dfa_add_tree_node (dfa, work_tree, mbc_tree, &alt_token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (mbc_tree != NULL, 1))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return work_tree;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
free_charset (mbcset);
|
|
|
|
|
return work_tree;
|
|
|
|
|
}
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#else /* not RE_ENABLE_I18N */
|
|
|
|
|
return work_tree;
|
|
|
|
|
#endif /* not RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
parse_bracket_exp_espace:
|
|
|
|
|
*err = REG_ESPACE;
|
2002-04-26 20:52:02 +00:00
|
|
|
|
parse_bracket_exp_free_return:
|
|
|
|
|
re_free (sbcset);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-04-26 20:52:02 +00:00
|
|
|
|
free_charset (mbcset);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2002-04-26 20:52:02 +00:00
|
|
|
|
/* Parse an element in the bracket expression. */
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static reg_errcode_t
|
2003-11-13 20:04:16 +00:00
|
|
|
|
parse_bracket_element (elem, regexp, token, token_len, dfa, syntax,
|
|
|
|
|
accept_hyphen)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
bracket_elem_t *elem;
|
|
|
|
|
re_string_t *regexp;
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
int token_len;
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
reg_syntax_t syntax;
|
2003-11-13 20:04:16 +00:00
|
|
|
|
int accept_hyphen;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
int cur_char_size;
|
|
|
|
|
cur_char_size = re_string_char_size_at (regexp, re_string_cur_idx (regexp));
|
|
|
|
|
if (cur_char_size > 1)
|
|
|
|
|
{
|
|
|
|
|
elem->type = MB_CHAR;
|
|
|
|
|
elem->opr.wch = re_string_wchar_at (regexp, re_string_cur_idx (regexp));
|
|
|
|
|
re_string_skip_bytes (regexp, cur_char_size);
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
|
|
|
|
re_string_skip_bytes (regexp, token_len); /* Skip a token. */
|
|
|
|
|
if (token->type == OP_OPEN_COLL_ELEM || token->type == OP_OPEN_CHAR_CLASS
|
|
|
|
|
|| token->type == OP_OPEN_EQUIV_CLASS)
|
|
|
|
|
return parse_bracket_symbol (elem, regexp, token);
|
2003-11-13 20:04:16 +00:00
|
|
|
|
if (BE (token->type == OP_CHARSET_RANGE, 0) && !accept_hyphen)
|
|
|
|
|
{
|
|
|
|
|
/* A '-' must only appear as anything but a range indicator before
|
|
|
|
|
the closing bracket. Everything else is an error. */
|
|
|
|
|
re_token_t token2;
|
|
|
|
|
(void) peek_token_bracket (&token2, regexp, syntax);
|
|
|
|
|
if (token2.type != OP_CLOSE_BRACKET)
|
|
|
|
|
/* The actual error value is not standardized since this whole
|
|
|
|
|
case is undefined. But ERANGE makes good sense. */
|
|
|
|
|
return REG_ERANGE;
|
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
elem->type = SB_CHAR;
|
|
|
|
|
elem->opr.ch = token->opr.c;
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2002-04-26 20:52:02 +00:00
|
|
|
|
/* Parse a bracket symbol in the bracket expression. Bracket symbols are
|
|
|
|
|
such as [:<character_class>:], [.<collating_element>.], and
|
|
|
|
|
[=<equivalent_class>=]. */
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static reg_errcode_t
|
|
|
|
|
parse_bracket_symbol (elem, regexp, token)
|
|
|
|
|
bracket_elem_t *elem;
|
|
|
|
|
re_string_t *regexp;
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
{
|
|
|
|
|
unsigned char ch, delim = token->opr.c;
|
|
|
|
|
int i = 0;
|
2004-01-14 01:45:37 +00:00
|
|
|
|
if (re_string_eoi(regexp))
|
|
|
|
|
return REG_EBRACK;
|
2002-04-20 00:57:03 +00:00
|
|
|
|
for (;; ++i)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
2004-01-14 01:45:37 +00:00
|
|
|
|
if (i >= BRACKET_NAME_BUF_SIZE)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return REG_EBRACK;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (token->type == OP_OPEN_CHAR_CLASS)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
ch = re_string_fetch_byte_case (regexp);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
else
|
2002-11-06 20:36:47 +00:00
|
|
|
|
ch = re_string_fetch_byte (regexp);
|
2004-01-14 01:45:37 +00:00
|
|
|
|
if (re_string_eoi(regexp))
|
|
|
|
|
return REG_EBRACK;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (ch == delim && re_string_peek_byte (regexp, 0) == ']')
|
2002-11-06 20:36:47 +00:00
|
|
|
|
break;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
elem->opr.name[i] = ch;
|
|
|
|
|
}
|
|
|
|
|
re_string_skip_bytes (regexp, 1);
|
|
|
|
|
elem->opr.name[i] = '\0';
|
|
|
|
|
switch (token->type)
|
|
|
|
|
{
|
|
|
|
|
case OP_OPEN_COLL_ELEM:
|
|
|
|
|
elem->type = COLL_SYM;
|
|
|
|
|
break;
|
|
|
|
|
case OP_OPEN_EQUIV_CLASS:
|
|
|
|
|
elem->type = EQUIV_CLASS;
|
|
|
|
|
break;
|
|
|
|
|
case OP_OPEN_CHAR_CLASS:
|
|
|
|
|
elem->type = CHAR_CLASS;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper function for parse_bracket_exp.
|
|
|
|
|
Build the equivalence class which is represented by NAME.
|
|
|
|
|
The result are written to MBCSET and SBCSET.
|
|
|
|
|
EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes,
|
|
|
|
|
is a pointer argument sinse we may update it. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
build_equiv_class (sbcset, mbcset, equiv_class_alloc, name)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_charset_t *mbcset;
|
|
|
|
|
int *equiv_class_alloc;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#else /* not RE_ENABLE_I18N */
|
|
|
|
|
build_equiv_class (sbcset, name)
|
|
|
|
|
#endif /* not RE_ENABLE_I18N */
|
|
|
|
|
re_bitset_ptr_t sbcset;
|
2002-09-10 17:39:58 +00:00
|
|
|
|
const unsigned char *name;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
2004-01-14 02:42:20 +00:00
|
|
|
|
#if defined _LIBC
|
2002-02-26 19:06:03 +00:00
|
|
|
|
uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
|
|
|
|
|
if (nrules != 0)
|
|
|
|
|
{
|
|
|
|
|
const int32_t *table, *indirect;
|
|
|
|
|
const unsigned char *weights, *extra, *cp;
|
2002-09-10 17:39:58 +00:00
|
|
|
|
unsigned char char_buf[2];
|
2002-02-26 19:06:03 +00:00
|
|
|
|
int32_t idx1, idx2;
|
|
|
|
|
unsigned int ch;
|
|
|
|
|
size_t len;
|
|
|
|
|
/* This #include defines a local function! */
|
|
|
|
|
# include <locale/weight.h>
|
|
|
|
|
/* Calculate the index for equivalence class. */
|
2002-09-10 17:39:58 +00:00
|
|
|
|
cp = name;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
|
|
|
|
|
weights = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
|
|
|
|
|
_NL_COLLATE_WEIGHTMB);
|
|
|
|
|
extra = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
_NL_COLLATE_EXTRAMB);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
|
2002-11-06 20:36:47 +00:00
|
|
|
|
_NL_COLLATE_INDIRECTMB);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
idx1 = findidx (&cp);
|
2002-09-10 17:39:58 +00:00
|
|
|
|
if (BE (idx1 == 0 || cp < name + strlen ((const char *) name), 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
/* This isn't a valid character. */
|
|
|
|
|
return REG_ECOLLATE;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
/* Build single byte matcing table for this equivalence class. */
|
2002-09-10 17:39:58 +00:00
|
|
|
|
char_buf[1] = (unsigned char) '\0';
|
2002-02-26 19:06:03 +00:00
|
|
|
|
len = weights[idx1];
|
|
|
|
|
for (ch = 0; ch < SBC_MAX; ++ch)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
char_buf[0] = ch;
|
|
|
|
|
cp = char_buf;
|
|
|
|
|
idx2 = findidx (&cp);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/*
|
2002-11-06 20:36:47 +00:00
|
|
|
|
idx2 = table[ch];
|
2002-02-26 19:06:03 +00:00
|
|
|
|
*/
|
2002-11-06 20:36:47 +00:00
|
|
|
|
if (idx2 == 0)
|
|
|
|
|
/* This isn't a valid character. */
|
|
|
|
|
continue;
|
|
|
|
|
if (len == weights[idx2])
|
|
|
|
|
{
|
|
|
|
|
int cnt = 0;
|
|
|
|
|
while (cnt <= len &&
|
|
|
|
|
weights[idx1 + 1 + cnt] == weights[idx2 + 1 + cnt])
|
|
|
|
|
++cnt;
|
|
|
|
|
|
|
|
|
|
if (cnt > len)
|
|
|
|
|
bitset_set (sbcset, ch);
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-02-28 07:43:13 +00:00
|
|
|
|
/* Check whether the array has enough space. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
if (BE (*equiv_class_alloc == mbcset->nequiv_classes, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
{
|
|
|
|
|
/* Not enough, realloc it. */
|
|
|
|
|
/* +1 in case of mbcset->nequiv_classes is 0. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
int new_equiv_class_alloc = 2 * mbcset->nequiv_classes + 1;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
/* Use realloc since the array is NULL if *alloc == 0. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
int32_t *new_equiv_classes = re_realloc (mbcset->equiv_classes,
|
|
|
|
|
int32_t,
|
|
|
|
|
new_equiv_class_alloc);
|
|
|
|
|
if (BE (new_equiv_classes == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return REG_ESPACE;
|
2003-11-23 19:21:23 +00:00
|
|
|
|
mbcset->equiv_classes = new_equiv_classes;
|
|
|
|
|
*equiv_class_alloc = new_equiv_class_alloc;
|
2002-11-06 20:36:47 +00:00
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
mbcset->equiv_classes[mbcset->nequiv_classes++] = idx1;
|
|
|
|
|
}
|
|
|
|
|
else
|
2004-01-14 02:42:20 +00:00
|
|
|
|
#endif /* _LIBC */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
2002-09-10 17:39:58 +00:00
|
|
|
|
if (BE (strlen ((const char *) name) != 1, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return REG_ECOLLATE;
|
2002-09-10 17:39:58 +00:00
|
|
|
|
bitset_set (sbcset, *name);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper function for parse_bracket_exp.
|
|
|
|
|
Build the character class which is represented by NAME.
|
|
|
|
|
The result are written to MBCSET and SBCSET.
|
|
|
|
|
CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes,
|
|
|
|
|
is a pointer argument sinse we may update it. */
|
|
|
|
|
|
|
|
|
|
static reg_errcode_t
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2003-06-12 18:29:52 +00:00
|
|
|
|
build_charclass (trans, sbcset, mbcset, char_class_alloc, class_name, syntax)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_charset_t *mbcset;
|
|
|
|
|
int *char_class_alloc;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#else /* not RE_ENABLE_I18N */
|
2003-06-12 18:29:52 +00:00
|
|
|
|
build_charclass (trans, sbcset, class_name, syntax)
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* not RE_ENABLE_I18N */
|
2004-01-06 21:59:24 +00:00
|
|
|
|
unsigned RE_TRANSLATE_TYPE trans;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
re_bitset_ptr_t sbcset;
|
2002-09-10 17:39:58 +00:00
|
|
|
|
const unsigned char *class_name;
|
2002-04-20 00:57:03 +00:00
|
|
|
|
reg_syntax_t syntax;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
int i;
|
2002-09-10 17:39:58 +00:00
|
|
|
|
const char *name = (const char *) class_name;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
|
|
|
|
|
/* In case of REG_ICASE "upper" and "lower" match the both of
|
|
|
|
|
upper and lower cases. */
|
|
|
|
|
if ((syntax & RE_ICASE)
|
|
|
|
|
&& (strcmp (name, "upper") == 0 || strcmp (name, "lower") == 0))
|
|
|
|
|
name = "alpha";
|
|
|
|
|
|
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Check the space of the arrays. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
if (BE (*char_class_alloc == mbcset->nchar_classes, 0))
|
2002-02-28 07:43:13 +00:00
|
|
|
|
{
|
|
|
|
|
/* Not enough, realloc it. */
|
|
|
|
|
/* +1 in case of mbcset->nchar_classes is 0. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
int new_char_class_alloc = 2 * mbcset->nchar_classes + 1;
|
2002-02-28 07:43:13 +00:00
|
|
|
|
/* Use realloc since array is NULL if *alloc == 0. */
|
2003-11-23 19:21:23 +00:00
|
|
|
|
wctype_t *new_char_classes = re_realloc (mbcset->char_classes, wctype_t,
|
|
|
|
|
new_char_class_alloc);
|
|
|
|
|
if (BE (new_char_classes == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return REG_ESPACE;
|
2003-11-23 19:21:23 +00:00
|
|
|
|
mbcset->char_classes = new_char_classes;
|
|
|
|
|
*char_class_alloc = new_char_class_alloc;
|
2002-02-28 07:43:13 +00:00
|
|
|
|
}
|
2002-02-26 19:06:03 +00:00
|
|
|
|
mbcset->char_classes[mbcset->nchar_classes++] = __wctype (name);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
2003-06-12 18:29:52 +00:00
|
|
|
|
#define BUILD_CHARCLASS_LOOP(ctype_func) \
|
|
|
|
|
for (i = 0; i < SBC_MAX; ++i) \
|
|
|
|
|
{ \
|
|
|
|
|
if (ctype_func (i)) \
|
|
|
|
|
{ \
|
|
|
|
|
int ch = trans ? trans[i] : i; \
|
|
|
|
|
bitset_set (sbcset, ch); \
|
|
|
|
|
} \
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (strcmp (name, "alnum") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (isalnum)
|
|
|
|
|
else if (strcmp (name, "cntrl") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (iscntrl)
|
|
|
|
|
else if (strcmp (name, "lower") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (islower)
|
|
|
|
|
else if (strcmp (name, "space") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (isspace)
|
|
|
|
|
else if (strcmp (name, "alpha") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (isalpha)
|
|
|
|
|
else if (strcmp (name, "digit") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (isdigit)
|
|
|
|
|
else if (strcmp (name, "print") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (isprint)
|
|
|
|
|
else if (strcmp (name, "upper") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (isupper)
|
|
|
|
|
else if (strcmp (name, "blank") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (isblank)
|
|
|
|
|
else if (strcmp (name, "graph") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (isgraph)
|
|
|
|
|
else if (strcmp (name, "punct") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (ispunct)
|
|
|
|
|
else if (strcmp (name, "xdigit") == 0)
|
|
|
|
|
BUILD_CHARCLASS_LOOP (isxdigit)
|
|
|
|
|
else
|
|
|
|
|
return REG_ECTYPE;
|
|
|
|
|
|
|
|
|
|
return REG_NOERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bin_tree_t *
|
2004-01-14 02:42:20 +00:00
|
|
|
|
build_charclass_op (dfa, trans, class_name, extra, non_match, err)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_dfa_t *dfa;
|
2004-01-06 21:59:24 +00:00
|
|
|
|
unsigned RE_TRANSLATE_TYPE trans;
|
2003-09-23 05:43:03 +00:00
|
|
|
|
const unsigned char *class_name;
|
|
|
|
|
const unsigned char *extra;
|
2004-01-14 02:42:20 +00:00
|
|
|
|
int non_match;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
reg_errcode_t *err;
|
|
|
|
|
{
|
|
|
|
|
re_bitset_ptr_t sbcset;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_charset_t *mbcset;
|
2002-05-24 08:49:00 +00:00
|
|
|
|
int alloc = 0;
|
|
|
|
|
#endif /* not RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
reg_errcode_t ret;
|
|
|
|
|
re_token_t br_token;
|
|
|
|
|
bin_tree_t *tree;
|
|
|
|
|
|
|
|
|
|
sbcset = (re_bitset_ptr_t) calloc (sizeof (unsigned int), BITSET_UINTS);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
|
|
|
|
|
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (sbcset == NULL || mbcset == NULL, 0))
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#else /* not RE_ENABLE_I18N */
|
|
|
|
|
if (BE (sbcset == NULL, 0))
|
|
|
|
|
#endif /* not RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-14 02:42:20 +00:00
|
|
|
|
if (non_match)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/*
|
|
|
|
|
if (syntax & RE_HAT_LISTS_NOT_NEWLINE)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
bitset_set(cset->sbcset, '\0');
|
2002-02-26 19:06:03 +00:00
|
|
|
|
*/
|
2002-05-24 08:49:00 +00:00
|
|
|
|
mbcset->non_match = 1;
|
|
|
|
|
#endif /* not RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-04-20 00:57:03 +00:00
|
|
|
|
/* We don't care the syntax in this case. */
|
2003-06-12 18:29:52 +00:00
|
|
|
|
ret = build_charclass (trans, sbcset,
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-11-06 20:36:47 +00:00
|
|
|
|
mbcset, &alloc,
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2003-09-23 05:43:03 +00:00
|
|
|
|
class_name, 0);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (ret != REG_NOERROR, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
re_free (sbcset);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
free_charset (mbcset);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2003-01-16 19:20:36 +00:00
|
|
|
|
*err = ret;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2002-04-26 20:52:02 +00:00
|
|
|
|
/* \w match '_' also. */
|
2003-09-23 05:43:03 +00:00
|
|
|
|
for (; *extra; extra++)
|
|
|
|
|
bitset_set (sbcset, *extra);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
/* If it is non-matching list. */
|
2002-05-24 08:49:00 +00:00
|
|
|
|
if (non_match)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
bitset_not (sbcset);
|
|
|
|
|
|
2003-11-24 19:30:51 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
|
|
|
|
/* Ensure only single byte characters are set. */
|
|
|
|
|
if (dfa->mb_cur_max > 1)
|
|
|
|
|
bitset_mask (sbcset, dfa->sb_char);
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Build a tree for simple bracket. */
|
|
|
|
|
br_token.type = SIMPLE_BRACKET;
|
|
|
|
|
br_token.opr.sbcset = sbcset;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree = re_dfa_add_tree_node (dfa, NULL, NULL, &br_token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (tree == NULL, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
goto build_word_op_espace;
|
|
|
|
|
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
Update.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* io/ftw.c (NFTW_NEW_NAME, NFTW_OLD_NAME): Add prototypes.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/tst-regex.c (umemlen): New variable.
(test_expr): Add expectedicase argument. Test case insensitive
searches as well as backwards searches (case sensitive and
insensitive) too.
(run_test): Add icase argument. Use it to compute regcomp flags.
(run_test_backwards): New function.
(main): Cast read to size_t to avoid warning. Set umemlen.
Add expectedicase arguments to test_expr.
* posix/regex_internal.c (re_string_reconstruct): If is_utf8,
find previous character by walking back instead of converting
all chars from beginning.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/regex_internal.h (struct re_string_t): Add is_utf8
and mb_cur_max fields.
(struct re_dfa_t): Likewise. Reorder fields to make structure
smaller on 64-bit arches.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments.
(re_string_char_size_at, re_string_wchar_at): Use pstr->mb_cur_max
instead of MB_CUR_MAX.
* posix/regcomp.c (re_compile_fastmap_iter): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
(re_compile_internal): Pass new arguments to re_string_construct.
(init_dfa): Initialize mb_cur_max and is_utf8 fields.
(peek_token, peek_token_bracket): Use input->mb_cur_max instead
of MB_CUR_MAX.
(parse_expression, parse_bracket_exp, parse_charclass_op): Use
dfa->mb_cur_max instead of MB_CUR_MAX.
* posix/regex_internal.c (re_string_construct_common): Add
mb_cur_max and is_utf8 arguments. Initialize fields with them.
(re_string_allocate, re_string_construct): Add mb_cur_max and
is_utf8 arguments, pass them to re_string_construct_common.
Use mb_cur_max instead of MB_CUR_MAX.
(re_string_realloc_buffers): Use pstr->mb_cur_max instead of
MB_CUR_MAX.
(re_string_reconstruct): Likewise.
(re_string_context_at): Use input->mb_cur_max instead of
MB_CUR_MAX.
(create_ci_newstate, create_cd_newstate): Use dfa->mb_cur_max
instead of MB_CUR_MAX.
* posix/regexec.c (re_search_internal): Likewise.
Pass new arguments to re_string_allocate.
(check_matching, transit_state_sb): Use dfa->mb_cur_max instead of
MB_CUR_MAX.
(extend_buffers): Use pstr->mb_cur_max instead of MB_CUR_MAX.
2003-11-12 Jakub Jelinek <jakub@redhat.com>
* posix/Makefile (tests): Add bug-regex19.
(bug-regex19-ENV): Add LOCPATH.
* posix/bug-regex19.c: New test.
2003-11-12 17:47:46 +00:00
|
|
|
|
if (dfa->mb_cur_max > 1)
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
|
|
|
|
re_token_t alt_token;
|
|
|
|
|
bin_tree_t *mbc_tree;
|
|
|
|
|
/* Build a tree for complex bracket. */
|
|
|
|
|
br_token.type = COMPLEX_BRACKET;
|
|
|
|
|
br_token.opr.mbcset = mbcset;
|
|
|
|
|
dfa->has_mb_node = 1;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
mbc_tree = re_dfa_add_tree_node (dfa, NULL, NULL, &br_token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (mbc_tree == NULL, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
goto build_word_op_espace;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Then join them by ALT node. */
|
|
|
|
|
alt_token.type = OP_ALT;
|
2003-11-26 03:24:15 +00:00
|
|
|
|
dfa->has_plural_match = 1;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
tree = re_dfa_add_tree_node (dfa, tree, mbc_tree, &alt_token);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (mbc_tree != NULL, 1))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return tree;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
free_charset (mbcset);
|
|
|
|
|
return tree;
|
|
|
|
|
}
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#else /* not RE_ENABLE_I18N */
|
|
|
|
|
return tree;
|
|
|
|
|
#endif /* not RE_ENABLE_I18N */
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
build_word_op_espace:
|
|
|
|
|
re_free (sbcset);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
free_charset (mbcset);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
*err = REG_ESPACE;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is intended for the expressions like "a{1,3}".
|
|
|
|
|
Fetch a number from `input', and return the number.
|
|
|
|
|
Return -1, if the number field is empty like "{,1}".
|
|
|
|
|
Return -2, If an error is occured. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
fetch_number (input, token, syntax)
|
|
|
|
|
re_string_t *input;
|
|
|
|
|
re_token_t *token;
|
|
|
|
|
reg_syntax_t syntax;
|
|
|
|
|
{
|
|
|
|
|
int num = -1;
|
|
|
|
|
unsigned char c;
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
2003-11-21 23:42:18 +00:00
|
|
|
|
fetch_token (token, input, syntax);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
c = token->opr.c;
|
2002-04-20 00:57:03 +00:00
|
|
|
|
if (BE (token->type == END_OF_RE, 0))
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return -2;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
if (token->type == OP_CLOSE_DUP_NUM || c == ',')
|
2002-11-06 20:36:47 +00:00
|
|
|
|
break;
|
2002-04-20 00:57:03 +00:00
|
|
|
|
num = ((token->type != CHARACTER || c < '0' || '9' < c || num == -2)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
? -2 : ((num == -1) ? c - '0' : num * 10 + c - '0'));
|
2002-04-20 00:57:03 +00:00
|
|
|
|
num = (num > RE_DUP_MAX) ? -2 : num;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
return num;
|
|
|
|
|
}
|
|
|
|
|
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#ifdef RE_ENABLE_I18N
|
2002-02-26 19:06:03 +00:00
|
|
|
|
static void
|
|
|
|
|
free_charset (re_charset_t *cset)
|
|
|
|
|
{
|
|
|
|
|
re_free (cset->mbchars);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# ifdef _LIBC
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_free (cset->coll_syms);
|
|
|
|
|
re_free (cset->equiv_classes);
|
|
|
|
|
re_free (cset->range_starts);
|
|
|
|
|
re_free (cset->range_ends);
|
2002-05-24 08:49:00 +00:00
|
|
|
|
# endif
|
2002-02-26 19:06:03 +00:00
|
|
|
|
re_free (cset->char_classes);
|
|
|
|
|
re_free (cset);
|
|
|
|
|
}
|
2002-05-24 08:49:00 +00:00
|
|
|
|
#endif /* RE_ENABLE_I18N */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
/* Functions for binary tree operation. */
|
|
|
|
|
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
/* Create a tree node. */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
|
|
|
|
static bin_tree_t *
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
create_tree (dfa, left, right, type, index)
|
|
|
|
|
re_dfa_t *dfa;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
bin_tree_t *left;
|
|
|
|
|
bin_tree_t *right;
|
|
|
|
|
re_token_type_t type;
|
|
|
|
|
int index;
|
|
|
|
|
{
|
|
|
|
|
bin_tree_t *tree;
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
if (BE (dfa->str_tree_storage_idx == BIN_TREE_STORAGE_SIZE, 0))
|
2002-02-26 19:06:03 +00:00
|
|
|
|
{
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
bin_tree_storage_t *storage = re_malloc (bin_tree_storage_t, 1);
|
|
|
|
|
|
|
|
|
|
if (storage == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
storage->next = dfa->str_tree_storage;
|
|
|
|
|
dfa->str_tree_storage = storage;
|
|
|
|
|
dfa->str_tree_storage_idx = 0;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
tree = &dfa->str_tree_storage->data[dfa->str_tree_storage_idx++];
|
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
tree->parent = NULL;
|
|
|
|
|
tree->left = left;
|
|
|
|
|
tree->right = right;
|
|
|
|
|
tree->type = type;
|
|
|
|
|
tree->node_idx = index;
|
|
|
|
|
tree->first = -1;
|
|
|
|
|
tree->next = -1;
|
|
|
|
|
re_node_set_init_empty (&tree->eclosure);
|
|
|
|
|
|
|
|
|
|
if (left != NULL)
|
|
|
|
|
left->parent = tree;
|
|
|
|
|
if (right != NULL)
|
|
|
|
|
right->parent = tree;
|
|
|
|
|
return tree;
|
|
|
|
|
}
|
|
|
|
|
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
/* Create both a DFA node and a tree for it. */
|
2002-02-26 19:06:03 +00:00
|
|
|
|
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
static bin_tree_t *
|
|
|
|
|
re_dfa_add_tree_node (dfa, left, right, token)
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
bin_tree_t *left;
|
|
|
|
|
bin_tree_t *right;
|
2003-11-22 00:00:56 +00:00
|
|
|
|
const re_token_t *token;
|
2003-11-21 23:42:18 +00:00
|
|
|
|
{
|
2003-11-22 00:00:56 +00:00
|
|
|
|
int new_idx = re_dfa_add_node (dfa, *token, 0);
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
|
|
|
|
|
if (new_idx == -1)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
return create_tree (dfa, left, right, 0, new_idx);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-12-27 23:40:06 +00:00
|
|
|
|
/* Mark the tree SRC as an optional subexpression. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
mark_opt_subexp (src, dfa)
|
|
|
|
|
const bin_tree_t *src;
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
{
|
|
|
|
|
/* Pass an OPT_SUBEXP_IDX which is != 1 if the duplicated tree is
|
|
|
|
|
a subexpression. */
|
|
|
|
|
if (src->type == CONCAT
|
|
|
|
|
&& src->left->type == NON_TYPE
|
|
|
|
|
&& dfa->nodes[src->left->node_idx].type == OP_OPEN_SUBEXP)
|
|
|
|
|
mark_opt_subexp_iter (src, dfa, dfa->nodes[src->left->node_idx].opr.idx);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Recursive tree walker for mark_opt_subexp. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
mark_opt_subexp_iter (src, dfa, idx)
|
|
|
|
|
const bin_tree_t *src;
|
|
|
|
|
re_dfa_t *dfa;
|
2003-12-29 00:42:16 +00:00
|
|
|
|
int idx;
|
2003-12-27 23:40:06 +00:00
|
|
|
|
{
|
|
|
|
|
int node_idx;
|
|
|
|
|
|
|
|
|
|
if (src->type == NON_TYPE)
|
|
|
|
|
{
|
|
|
|
|
node_idx = src->node_idx;
|
|
|
|
|
if ((dfa->nodes[node_idx].type == OP_OPEN_SUBEXP
|
|
|
|
|
|| dfa->nodes[node_idx].type == OP_CLOSE_SUBEXP)
|
|
|
|
|
&& dfa->nodes[node_idx].opr.idx == idx)
|
|
|
|
|
dfa->nodes[node_idx].opt_subexp = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (src->left != NULL)
|
|
|
|
|
mark_opt_subexp_iter (src->left, dfa, idx);
|
|
|
|
|
|
|
|
|
|
if (src->right != NULL)
|
|
|
|
|
mark_opt_subexp_iter (src->right, dfa, idx);
|
|
|
|
|
}
|
|
|
|
|
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
|
2002-02-26 19:06:03 +00:00
|
|
|
|
/* Duplicate the node SRC, and return new node. */
|
|
|
|
|
|
|
|
|
|
static bin_tree_t *
|
|
|
|
|
duplicate_tree (src, dfa)
|
|
|
|
|
const bin_tree_t *src;
|
|
|
|
|
re_dfa_t *dfa;
|
|
|
|
|
{
|
|
|
|
|
bin_tree_t *left = NULL, *right = NULL, *new_tree;
|
|
|
|
|
int new_node_idx;
|
|
|
|
|
/* Since node indies must be according to Post-order of the tree,
|
|
|
|
|
we must duplicate the left at first. */
|
|
|
|
|
if (src->left != NULL)
|
|
|
|
|
{
|
|
|
|
|
left = duplicate_tree (src->left, dfa);
|
|
|
|
|
if (left == NULL)
|
2002-11-06 20:36:47 +00:00
|
|
|
|
return NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Secondaly, duplicate the right. */
|
|
|
|
|
if (src->right != NULL)
|
|
|
|
|
{
|
|
|
|
|
right = duplicate_tree (src->right, dfa);
|
|
|
|
|
if (right == NULL)
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
return NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* At last, duplicate itself. */
|
|
|
|
|
if (src->type == NON_TYPE)
|
|
|
|
|
{
|
|
|
|
|
new_node_idx = re_dfa_add_node (dfa, dfa->nodes[src->node_idx], 0);
|
|
|
|
|
dfa->nodes[new_node_idx].duplicated = 1;
|
2002-03-12 02:04:08 +00:00
|
|
|
|
if (BE (new_node_idx == -1, 0))
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
return NULL;
|
2002-02-26 19:06:03 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
new_node_idx = src->type;
|
|
|
|
|
|
Update.
2003-11-19 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (extend_buffers): Don't allocate
twice as big state_log as needed. Don't modify pstr->valid_len
for mb_cur_max == 1 !icase !trans.
* posix/regcomp.c (free_bin_tree): Removed.
(create_tree): Add dfa argument. Don't call re_malloc for
each tree, instead allocate from str_tree_storage.
(re_dfa_add_tree_node): New function.
(free_dfa_content): Handle freeing if dfa->nodes == NULL
or dfa->state_table == NULL.
(re_compile_internal): Call free_dfa_content if init_dfa
fails. Call free_workarea_compile, re_string_destruct
and free_dfa_content for most of the other failure paths.
(init_dfa): Initialize str_tree_storage_idx.
Don't clear any fields on allocation failure.
(free_workarea_compile): Free str_tree_storage chunks
instead of free_bin_tree (dfa->str_tree).
(parse): Call re_dfa_add_tree_node instead of re_dfa_add_node
followed by create_tree. Add dfa argument to remaining
create_tree calls. Remove new_idx variable. Remove calls
to free_bin_tree.
(parse_reg_exp, parse_branch, parse_expression, parse_sub_exp,
parse_dup_op, parse_bracket_exp, build_charclass_op): Likewise.
(duplicate_tree): Remove calls to free_bin_tree, add dfa
argument to create_tree.
* posix/regex_internal.h (BIN_TREE_STORAGE_SIZE): Define.
(bin_tree_storage_t): New type.
(re_dfa_t): Add str_tree_storage and str_tree_storage_idx
fields.
* posix/Makefile (tests): Add bug-regex21.
(generated): Add bug-regex21-mem, bug-regex21.mtrace,
tst-rxspencer-mem and tst-rxspencer.mtrace.
(tests): Depend on $(objpfx)bug-regex21-mem
and $(objpfx)tst-rxspencer-mem.
(bug-regex21-ENV, tst-rxspencer-ENV): Set.
($(objpfx)bug-regex21-mem, $(objpfx)tst-rxspencer-mem): New.
* posix/tst-rxspencer.c (main): Add call to mtrace.
Free line at the end.
* posix/bug-regex21.c: New test.
* posix/regexec.c (get_subexp): After calling get_subexp_sub
2003-11-19 19:37:31 +00:00
|
|
|
|
new_tree = create_tree (dfa, left, right, src->type, new_node_idx);
|
2002-02-26 19:06:03 +00:00
|
|
|
|
return new_tree;
|
|
|
|
|
}
|