From: Giuliano Procida <gprocida@google.com>
To: libabigail@sourceware.org
Cc: dodji@seketeli.org, kernel-team@android.com, gprocida@google.com,
maennich@google.com
Subject: [PATCH 14/21] Remove suppression types' priv class methods.
Date: Thu, 23 Apr 2020 16:44:34 +0100 [thread overview]
Message-ID: <20200423154441.170531-15-gprocida@google.com> (raw)
In-Reply-To: <20200423154441.170531-1-gprocida@google.com>
The type_suppression::set_type_name_not_regex method is the only
remaining user of all the various suppression_type::priv member
functions. This is easily remedied and all the remaining priv member
functions (regex getters and setters) can be dropped.
This patches leaves all the various suppression priv types as simple
data containers (modulo their constructors).
There are no behavioural changes.
* src/abg-suppression-priv.h (suppression_base::priv): Drop
all regex getter methods.
(function_suppression::parameter_spec::priv): Drop all regex
getter methods.
(function_suppression::priv): Drop all regex getter methods.
(variable_suppression::priv): Drop all regex getter methods.
(type_suppression::priv): Drop all regex getter and setter
methods.
* src/abg-suppression.cc (set_type_name_not_regex): Access
priv_->type_name_not_regex_ directly.
Signed-off-by: Giuliano Procida <gprocida@google.com>
---
src/abg-suppression-priv.h | 182 -------------------------------------
src/abg-suppression.cc | 2 +-
2 files changed, 1 insertion(+), 183 deletions(-)
diff --git a/src/abg-suppression-priv.h b/src/abg-suppression-priv.h
index 5c06d5d0..78f11e2f 100644
--- a/src/abg-suppression-priv.h
+++ b/src/abg-suppression-priv.h
@@ -75,38 +75,6 @@ public:
{}
friend class suppression_base;
-
- /// Get the regular expression object associated to the
- /// 'file_name_regex' property of @ref suppression_base.
- const regex::regex_t_sptr&
- get_file_name_regex() const
- {
- return file_name_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'file_name_not_regex' property of @ref suppression_base.
- const regex::regex_t_sptr&
- get_file_name_not_regex() const
- {
- return file_name_not_regex_;
- }
-
- /// Get the regular expression object associated to the 'soname_regex'
- /// property of @ref suppression_base.
- const regex::regex_t_sptr&
- get_soname_regex() const
- {
- return soname_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'soname_not_regex' property of @ref suppression_base.
- const regex::regex_t_sptr&
- get_soname_not_regex() const
- {
- return soname_not_regex_;
- }
}; // end class suppression_base::priv
// </suppression_base stuff>
@@ -133,15 +101,6 @@ class function_suppression::parameter_spec::priv
priv(size_t i, const string& tn, const regex::regex_t_sptr& tn_regex)
: index_(i), type_name_(tn), type_name_regex_(tn_regex)
{}
-
- /// Get the regular expression object associated to the
- /// 'type_name_regex' property of @ref
- /// function_suppression::parameter_spec.
- const regex::regex_t_sptr
- get_type_name_regex() const
- {
- return type_name_regex_;
- }
}; // end class function_suppression::parameter_spec::priv
@@ -191,54 +150,6 @@ struct function_suppression::priv
symbol_version_regex_(symbol_version_regex),
allow_other_aliases_(true)
{}
-
- /// Get the regular expression object associated to the 'name_regex'
- /// property of @ref function_suppression.
- const regex::regex_t_sptr
- get_name_regex() const
- {
- return name_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'name_not_regex' property of @ref function_suppression.
- const regex::regex_t_sptr
- get_name_not_regex() const
- {
- return name_not_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'return_type_regex' property of @ref function_suppression.
- const regex::regex_t_sptr
- get_return_type_regex() const
- {
- return return_type_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'symbol_name_regex' property of @ref function_suppression.
- const regex::regex_t_sptr
- get_symbol_name_regex() const
- {
- return symbol_name_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'symbol_name_not_regex' property of @ref function_suppression.
- const regex::regex_t_sptr
- get_symbol_name_not_regex() const
- {
- return symbol_name_not_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'symbol_version_regex' property of @ref function_suppression.
- const regex::regex_t_sptr
- get_symbol_version_regex() const
- {
- return symbol_version_regex_;
- }
}; // end class function_suppression::priv
bool
@@ -343,54 +254,6 @@ struct variable_suppression::priv
type_name_(type_name),
type_name_regex_(type_name_regex)
{}
-
- /// Get the regular expression object associated to the 'name_regex'
- /// property of @ref variable_suppression.
- const regex::regex_t_sptr
- get_name_regex() const
- {
- return name_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'name_not_regex' property of @ref variable_suppression.
- const regex::regex_t_sptr
- get_name_not_regex() const
- {
- return name_not_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'symbol_name_regex' property of @ref variable_suppression.
- const regex::regex_t_sptr
- get_symbol_name_regex() const
- {
- return symbol_name_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'symbol_name_not_regex' property of @ref variable_suppression.
- const regex::regex_t_sptr
- get_symbol_name_not_regex() const
- {
- return symbol_name_not_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'symbol_version_regex' property of @ref variable_suppression.
- const regex::regex_t_sptr
- get_symbol_version_regex() const
- {
- return symbol_version_regex_;
- }
-
- /// Get the regular expression object associated to the
- /// 'type_name_regex' property of @ref variable_suppression.
- const regex::regex_t_sptr
- get_type_name_regex() const
- {
- return type_name_regex_;
- }
};// end class variable_supppression::priv
template <typename ReadContextType>
@@ -454,51 +317,6 @@ public:
reach_kind_(reach_kind)
{}
- /// Get the regular expression object associated to the
- /// 'type_name_regex' property of @ref type_suppression.
- const regex::regex_t_sptr
- get_type_name_regex() const
- {
- return type_name_regex_;
- }
-
- /// Setter for the type_name_regex object.
- ///
- /// @param r the new type_name_regex object.
- void
- set_type_name_regex(regex::regex_t_sptr r)
- {type_name_regex_ = r;}
-
- /// Get the regular expression object associated to the
- /// 'type_name_not_regex' property of @ref type_suppression.
- const regex::regex_t_sptr
- get_type_name_not_regex() const
- {
- return type_name_not_regex_;
- }
-
- /// Setter for the type_name_not_regex object.
- ///
- /// @param r the new type_name_not_regex object.
- void
- set_type_name_not_regex(regex::regex_t_sptr r)
- {type_name_not_regex_ = r;}
-
- /// Get the regular expression object associated to the
- /// 'source_location_to_keep_regex' property of @ref type_suppression.
- const regex::regex_t_sptr
- get_source_location_to_keep_regex() const
- {
- return source_location_to_keep_regex_;
- }
-
- /// Setter for the source_location_to_keep_regex object.
- ///
- /// @param r the new regex object.
- void
- set_source_location_to_keep_regex(regex::regex_t_sptr r)
- {source_location_to_keep_regex_ = r;}
-
friend class type_suppression;
}; // class type_suppression::priv
diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc
index 02c3e98a..33bccbb6 100644
--- a/src/abg-suppression.cc
+++ b/src/abg-suppression.cc
@@ -519,7 +519,7 @@ type_suppression::get_type_name_regex() const
/// @param r the new regexp string.
void
type_suppression::set_type_name_not_regex(const regex_t_sptr& r)
-{priv_->set_type_name_not_regex(r);}
+{priv_->type_name_not_regex_ = r;}
/// Getter for the "type_name_not_regex" property of the type
/// suppression specification.
--
2.26.1.301.g55bc3eb7cb9-goog
next prev parent reply other threads:[~2020-04-23 15:46 UTC|newest]
Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 15:44 [PATCH 00/21] Simplify regex and suppression parsing Giuliano Procida
2020-04-23 15:44 ` [PATCH 01/21] Move regex definitions to own files Giuliano Procida
2020-04-23 15:44 ` [PATCH 02/21] Move libxml bits out of abg-sptr-utils.h Giuliano Procida
2020-04-23 15:44 ` [PATCH 03/21] Simplify generation of symbol whitelist regex Giuliano Procida
2020-04-23 15:44 ` [PATCH 04/21] Escape names used in symbol whitelisting regex Giuliano Procida
2020-04-23 15:44 ` [PATCH 05/21] abg-suppression.cc: More uniform variable naming Giuliano Procida
2020-04-23 15:44 ` [PATCH 06/21] diff suppression: Fix handling of change kinds Giuliano Procida
2020-04-23 15:44 ` [PATCH 07/21] Add POSIX regex wrapper functions Giuliano Procida
2020-04-23 18:07 ` [PATCH v2 " Giuliano Procida
2020-04-23 15:44 ` [PATCH 08/21] Use regex::compile wrapper instead of regcomp Giuliano Procida
2020-04-23 15:44 ` [PATCH 09/21] Use regex::match wrapper instead of regexec Giuliano Procida
2020-04-23 18:02 ` [PATCH v2 " Giuliano Procida
2020-04-23 15:44 ` [PATCH 10/21] Refactor read_parameter_spec_from_string logic Giuliano Procida
2020-04-23 15:44 ` [PATCH 11/21] Compile suppression regexes earlier Giuliano Procida
2020-04-23 15:44 ` [PATCH 12/21] Reduce direct access to suppression priv_ members Giuliano Procida
2020-04-23 15:44 ` [PATCH 13/21] Move match methods from priv to suppression_base Giuliano Procida
2020-04-23 15:44 ` Giuliano Procida [this message]
2020-04-23 15:44 ` [PATCH 15/21] abg-suppression.cc: More consistent regex matching Giuliano Procida
2020-04-23 15:44 ` [PATCH 16/21] abg-tools-utils.cc: Assert generated regexes OK Giuliano Procida
2020-04-23 15:44 ` [PATCH 17/21] Refactor suppression property string parsing Giuliano Procida
2020-04-23 15:44 ` [PATCH 18/21] Refactor suppression property regex parsing Giuliano Procida
2020-04-23 15:44 ` [PATCH 19/21] Warn if user-supplied regexes fail to compile Giuliano Procida
2020-04-23 18:04 ` [PATCH v2 " Giuliano Procida
2020-04-23 15:44 ` [PATCH 20/21] Default construct suppression types Giuliano Procida
2020-04-23 15:44 ` [PATCH 21/21] Remove unused suppression type priv constructors Giuliano Procida
2020-04-23 18:11 ` [PATCH 00/21] Simplify regex and suppression parsing Giuliano Procida
2020-04-24 8:54 ` Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 00/21]Simplify " Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 01/21] Move regex definitions to own files Giuliano Procida
2020-04-27 10:52 ` Matthias Maennich
2020-04-29 14:19 ` Dodji Seketeli
2020-04-29 14:35 ` Giuliano Procida
2020-05-04 9:19 ` Dodji Seketeli
2020-04-24 9:21 ` [PATCH v3 02/21] Move libxml bits out of abg-sptr-utils.h Giuliano Procida
2020-04-27 10:53 ` Matthias Maennich
2020-04-29 14:30 ` Dodji Seketeli
2020-05-04 9:20 ` Dodji Seketeli
2020-04-24 9:21 ` [PATCH v3 03/21] Simplify generation of symbol whitelist regex Giuliano Procida
2020-04-27 11:01 ` Matthias Maennich
2020-04-27 15:31 ` Giuliano Procida
2020-05-04 9:20 ` Dodji Seketeli
2020-04-24 9:21 ` [PATCH v3 04/21] Escape names used in symbol whitelisting regex Giuliano Procida
2020-04-27 11:14 ` Matthias Maennich
2020-04-27 15:37 ` Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 05/21] abg-suppression.cc: More uniform variable naming Giuliano Procida
2020-04-27 11:17 ` Matthias Maennich
2020-04-24 9:21 ` [PATCH v3 06/21] diff suppression: Fix handling of change kinds Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 07/21] Add POSIX regex wrapper functions Giuliano Procida
2020-04-27 11:23 ` Matthias Maennich
2020-04-24 9:21 ` [PATCH v3 08/21] Use regex::compile wrapper instead of regcomp Giuliano Procida
2020-04-27 11:34 ` Matthias Maennich
2020-04-27 16:01 ` Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 09/21] Use regex::match wrapper instead of regexec Giuliano Procida
2020-04-27 11:38 ` Matthias Maennich
2020-04-24 9:21 ` [PATCH v3 10/21] Refactor read_parameter_spec_from_string logic Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 11/21] Compile suppression regexes earlier Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 12/21] Reduce direct access to suppression priv_ members Giuliano Procida
2020-04-27 11:54 ` Matthias Maennich
2020-04-24 9:21 ` [PATCH v3 13/21] Move match methods from priv to suppression_base Giuliano Procida
2020-04-27 11:55 ` Matthias Maennich
2020-04-24 9:21 ` [PATCH v3 14/21] Remove suppression types' priv class methods Giuliano Procida
2020-04-27 11:57 ` Matthias Maennich
2020-04-24 9:21 ` [PATCH v3 15/21] abg-suppression.cc: More consistent regex matching Giuliano Procida
2020-04-27 12:07 ` Matthias Maennich
2020-04-27 16:18 ` Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 16/21] abg-tools-utils.cc: Assert generated regexes OK Giuliano Procida
2020-04-27 12:08 ` Matthias Maennich
2020-04-27 16:21 ` Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 17/21] Refactor suppression property string parsing Giuliano Procida
2020-04-27 12:17 ` Matthias Maennich
2020-04-27 16:42 ` Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 18/21] Refactor suppression property regex parsing Giuliano Procida
2020-04-27 14:55 ` Matthias Maennich
2020-04-27 16:59 ` Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 19/21] Warn if user-supplied regexes fail to compile Giuliano Procida
2020-04-27 15:36 ` Matthias Maennich
2020-05-01 8:49 ` Giuliano Procida
2020-04-24 9:21 ` [PATCH v3 20/21] Default construct suppression types Giuliano Procida
2020-04-27 15:40 ` Matthias Maennich
2020-04-24 9:21 ` [PATCH v3 21/21] Remove unused suppression type priv constructors Giuliano Procida
2020-04-27 15:41 ` Matthias Maennich
2020-05-04 12:34 ` [PATCH v4 00/15] Simplify regex and suppression parsing Giuliano Procida
2020-05-04 12:34 ` [PATCH v4 01/15] Tidy #includes in a few files Giuliano Procida
2020-05-04 12:49 ` Matthias Maennich
2020-05-11 13:24 ` Dodji Seketeli
2020-05-04 12:34 ` [PATCH v4 02/15] Document ^_^ regex in generate_from_strings Giuliano Procida
2020-05-04 12:49 ` Matthias Maennich
2020-05-11 13:32 ` Dodji Seketeli
2020-05-04 12:34 ` [PATCH v4 03/15] Escape names used in symbol whitelisting regex Giuliano Procida
2020-05-04 12:57 ` Matthias Maennich
2020-05-04 16:45 ` [PATCH v5 " Giuliano Procida
2020-05-11 13:59 ` Dodji Seketeli
2020-05-04 12:34 ` [PATCH v4 04/15] abg-suppression.cc: More uniform variable naming Giuliano Procida
2020-05-11 14:04 ` Dodji Seketeli
2020-05-04 12:34 ` [PATCH v4 05/15] diff suppression: Fix handling of change kinds Giuliano Procida
2020-05-04 13:04 ` Matthias Maennich
2020-05-11 14:15 ` Dodji Seketeli
2020-05-11 15:47 ` Giuliano Procida
2020-05-11 17:53 ` Dodji Seketeli
2020-05-12 9:54 ` Giuliano Procida
2020-05-12 10:14 ` [PATCH v5 05/15] Tidy checks for sufficient suppression properties Giuliano Procida
2020-05-12 16:11 ` Dodji Seketeli
2020-05-04 12:34 ` [PATCH v4 06/15] Add POSIX regex wrapper functions Giuliano Procida
2020-05-11 16:37 ` Dodji Seketeli
2020-05-04 12:34 ` [PATCH v4 07/15] Use regex::compile wrapper instead of regcomp Giuliano Procida
2020-05-11 16:38 ` Dodji Seketeli
2020-05-04 12:34 ` [PATCH v4 08/15] Use regex::match wrapper instead of regexec Giuliano Procida
2020-05-12 16:35 ` Dodji Seketeli
2020-05-04 12:34 ` [PATCH v4 09/15] Refactor read_parameter_spec_from_string logic Giuliano Procida
2020-05-13 7:51 ` Dodji Seketeli
2020-05-04 12:34 ` [PATCH v4 10/15] Compile suppression regexes earlier Giuliano Procida
2020-05-04 13:14 ` Matthias Maennich
2020-05-13 8:07 ` Dodji Seketeli
2020-05-13 15:36 ` Giuliano Procida
2020-05-04 12:34 ` [PATCH v4 11/15] Reduce direct access to suppression priv_ members Giuliano Procida
2020-05-04 12:34 ` [PATCH v4 12/15] Move match methods from priv to suppression_base Giuliano Procida
2020-05-04 12:34 ` [PATCH v4 13/15] Remove suppression type priv class methods Giuliano Procida
2020-05-04 12:34 ` [PATCH v4 14/15] abg-suppression.cc: More consistent regex matching Giuliano Procida
2020-05-04 13:17 ` Matthias Maennich
2020-05-04 12:34 ` [PATCH v4 15/15] abg-tools-utils.cc: Assert generated regexes OK Giuliano Procida
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200423154441.170531-15-gprocida@google.com \
--to=gprocida@google.com \
--cc=dodji@seketeli.org \
--cc=kernel-team@android.com \
--cc=libabigail@sourceware.org \
--cc=maennich@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).