mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-25 11:04:18 +08:00
2d7cc5c797
This patch replaces compile_rx_or_error and make_regfree_cleanup with a class that wraps a regex_t. gdb/ChangeLog: 2017-06-07 Pedro Alves <palves@redhat.com> * Makefile.in (SFILES): Add gdb_regex.c. (COMMON_OBS): Add gdb_regex.o. * ada-lang.c (ada_add_standard_exceptions) (ada_add_exceptions_from_frame, name_matches_regex) (ada_add_global_exceptions, ada_exceptions_list_1): Change regex parameter type to compiled_regex. Adjust. (ada_exceptions_list): Use compiled_regex. * break-catch-throw.c (exception_catchpoint::pattern): Now a std::unique_ptr<compiled_regex>. (exception_catchpoint::~exception_catchpoint): Remove regfree call. (check_status_exception_catchpoint): Adjust to use compiled_regex. (handle_gnu_v3_exceptions): Adjust to use compiled_regex. * breakpoint.c (solib_catchpoint::compiled): Now a std::unique_ptr<compiled_regex>. (solib_catchpoint::~solib_catchpoint): Remove regfree call. (check_status_catch_solib): Adjust to use compiled_regex. (add_solib_catchpoint): Adjust to use compiled_regex. * cli/cli-cmds.c (apropos_command): Use compiled_regex. * cli/cli-decode.c (apropos_cmd): Change regex parameter to compiled_regex reference. Adjust to use it. * cli/cli-decode.h: Remove struct re_pattern_buffer forward declaration. Include "gdb_regex.h". (apropos_cmd): Change regex parameter to compiled_regex reference. * gdb_regex.c: New file. * gdb_regex.h (make_regfree_cleanup, get_regcomp_error): Delete declarations. (class compiled_regex): New. * linux-tdep.c: Include "common/gdb_optional.h". (struct mapping_regexes): New, factored out from mapping_is_anonymous_p, and adjusted to use compiled_regex. (mapping_is_anonymous_p): Use mapping_regexes wrapped in a gdb::optional and remove cleanups. Adjust to compiled_regex. * probe.c: Include "common/gdb_optional.h". (collect_probes): Use compiled_regex and gdb::optional and remove cleanups. * skip.c: Include "common/gdb_optional.h". (skiplist_entry::compiled_function_regexp): Now a gdb::optional<compiled_regex>. (skiplist_entry::compiled_function_regexp_is_valid): Delete field. (free_skiplist_entry): Remove regfree call. (compile_skip_regexp, skip_rfunction_p): Adjust to use compiled_regex and gdb::optional. * symtab.c: Include "common/gdb_optional.h". (search_symbols): Use compiled_regex and gdb::optional. * utils.c (do_regfree_cleanup, make_regfree_cleanup) (get_regcomp_error, compile_rx_or_error): Delete. Some bits moved to gdb_regex.c.
66 lines
2.1 KiB
C++
66 lines
2.1 KiB
C++
/* Portable <regex.h>.
|
|
Copyright (C) 2000-2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef GDB_REGEX_H
|
|
#define GDB_REGEX_H 1
|
|
|
|
#ifdef USE_INCLUDED_REGEX
|
|
# include "xregex.h"
|
|
#else
|
|
/* Request 4.2 BSD regex functions. */
|
|
# define _REGEX_RE_COMP
|
|
# include <regex.h>
|
|
#endif
|
|
|
|
/* A compiled regex. This is mainly a wrapper around regex_t. The
|
|
the constructor throws on regcomp error and the destructor is
|
|
responsible for calling regfree. The former means that it's not
|
|
possible to create an instance of compiled_regex that isn't
|
|
compiled, hence the name. */
|
|
class compiled_regex
|
|
{
|
|
public:
|
|
/* Compile a regexp and throw an exception on error, including
|
|
MESSAGE. REGEX and MESSAGE must not be NULL. */
|
|
compiled_regex (const char *regex, int cflags,
|
|
const char *message)
|
|
ATTRIBUTE_NONNULL (2) ATTRIBUTE_NONNULL (4);
|
|
|
|
~compiled_regex ();
|
|
|
|
/* Disable copy. */
|
|
compiled_regex (const compiled_regex&) = delete;
|
|
void operator= (const compiled_regex&) = delete;
|
|
|
|
/* Wrapper around ::regexec. */
|
|
int exec (const char *string,
|
|
size_t nmatch, regmatch_t pmatch[],
|
|
int eflags) const;
|
|
|
|
/* Wrapper around ::re_search. (Not const because re_search's
|
|
regex_t parameter isn't either.) */
|
|
int search (const char *string, int size, int startpos,
|
|
int range, struct re_registers *regs);
|
|
|
|
private:
|
|
/* The compiled pattern. */
|
|
regex_t m_pattern;
|
|
};
|
|
|
|
#endif /* not GDB_REGEX_H */
|