diff options
| author | Martin Hořeňovský | 2019-10-28 15:28:19 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-10-29 23:28:08 +0100 |
| commit | 316a5c0572c903e47a2e5aaf87d8bf8624077590 (patch) | |
| tree | c1dd074aea2756e9844d6e03bdb9792b7a113c5f | |
| parent | c781301cd444ae360abfa45d99c9276eb7fec654 (diff) | |
| download | catch3-316a5c0572c903e47a2e5aaf87d8bf8624077590.tar.gz | |
Remove type erasure in predicate matcher
Now the type of the predicate is part of the type of the
PredicateMatcher.
| -rw-r--r-- | docs/deprecations.md | 10 | ||||
| -rw-r--r-- | docs/release-notes.md | 3 | ||||
| -rw-r--r-- | include/internal/catch_generators.hpp | 2 | ||||
| -rw-r--r-- | include/internal/catch_matchers_generic.hpp | 19 |
4 files changed, 14 insertions, 20 deletions
diff --git a/docs/deprecations.md b/docs/deprecations.md index 643c73ce..4101f739 100644 --- a/docs/deprecations.md +++ b/docs/deprecations.md @@ -33,16 +33,6 @@ The API for Catch2's console colour will be changed to take an extra argument, the stream to which the colour code should be applied. -### Type erasure in the `PredicateMatcher` - -Currently, the `PredicateMatcher` uses `std::function` for type erasure, -so that type of the matcher is always `PredicateMatcher<T>`, regardless -of the type of the predicate. Because of the high compilation overhead -of `std::function`, and the fact that the type erasure is used only rarely, -`PredicateMatcher` will no longer be type erased in the future. Instead, -the predicate type will be made part of the PredicateMatcher's type. - - --- [Home](Readme.md#top) diff --git a/docs/release-notes.md b/docs/release-notes.md index 4d0527a0..c9bc2f70 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -44,7 +44,8 @@ * If the second argument has text outside tags, the text will be ignored. * Hidden test cases are no longer included just because they don't match an exclusion tag * Previously, a `TEST_CASE("A", "[.foo]")` would be included by asking for `~[bar]`. - +* `PredicateMatcher` is no longer type erased. + * This means that the type of the provided predicate is part of the `PredicateMatcher`'s type ### Fixes diff --git a/include/internal/catch_generators.hpp b/include/internal/catch_generators.hpp index ea575c85..fd491696 100644 --- a/include/internal/catch_generators.hpp +++ b/include/internal/catch_generators.hpp @@ -14,7 +14,7 @@ #include <memory> #include <vector> #include <cassert> - +#include <tuple> #include <utility> #include <exception> diff --git a/include/internal/catch_matchers_generic.hpp b/include/internal/catch_matchers_generic.hpp index 7d57c9d4..eaef5485 100644 --- a/include/internal/catch_matchers_generic.hpp +++ b/include/internal/catch_matchers_generic.hpp @@ -9,9 +9,10 @@ #include "catch_common.h" #include "catch_matchers.h" +#include "catch_meta.hpp" -#include <functional> #include <string> +#include <utility> namespace Catch { namespace Matchers { @@ -21,14 +22,14 @@ namespace Detail { std::string finalizeDescription(const std::string& desc); } -template <typename T> +template <typename T, typename Predicate> class PredicateMatcher : public MatcherBase<T> { - std::function<bool(T const&)> m_predicate; + Predicate m_predicate; std::string m_description; public: - PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr) - :m_predicate(std::move(elem)), + PredicateMatcher(Predicate&& elem, std::string const& descr) + :m_predicate(std::forward<Predicate>(elem)), m_description(Detail::finalizeDescription(descr)) {} @@ -47,9 +48,11 @@ public: // The user has to explicitly specify type to the function, because // inferring std::function<bool(T const&)> is hard (but possible) and // requires a lot of TMP. - template<typename T> - Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") { - return Generic::PredicateMatcher<T>(predicate, description); + template<typename T, typename Pred> + Generic::PredicateMatcher<T, Pred> Predicate(Pred&& predicate, std::string const& description = "") { + static_assert(is_callable<Pred(T)>::value, "Predicate not callable with argument T"); + static_assert(std::is_same<bool, FunctionReturnType<Pred, T>>::value, "Predicate does not return bool"); + return Generic::PredicateMatcher<T, Pred>(std::forward<Pred>(predicate), description); } } // namespace Matchers |