diff options
| author | Martin Hořeňovský | 2020-03-27 10:57:09 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-03-27 14:56:33 +0100 |
| commit | 5c9367d4f1796c3a4a6d4eb74bea3a0b87f23590 (patch) | |
| tree | ce0e10d04dccbf5f377e063490c0f038690ac78f /src | |
| parent | ab0ca2f5663ebeff107fca9910ba83b46bd5505e (diff) | |
| download | catch3-5c9367d4f1796c3a4a6d4eb74bea3a0b87f23590.tar.gz | |
Small cleanup for PredicateMatcher
Removed the `generic` nested namespace, so PredicateMatcher now
lives in `Catch::Matchers` namespace, just like other matchers.
Also cleaned up and doxygenized comments on the `Predicate` factory
function for `PredicateMatcher`.
Diffstat (limited to 'src')
| -rw-r--r-- | src/catch2/matchers/catch_matchers_predicate.cpp | 2 | ||||
| -rw-r--r-- | src/catch2/matchers/catch_matchers_predicate.hpp | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/catch2/matchers/catch_matchers_predicate.cpp b/src/catch2/matchers/catch_matchers_predicate.cpp index be6f808f..fce37373 100644 --- a/src/catch2/matchers/catch_matchers_predicate.cpp +++ b/src/catch2/matchers/catch_matchers_predicate.cpp @@ -1,6 +1,6 @@ #include <catch2/matchers/catch_matchers_predicate.hpp> -std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) { +std::string Catch::Matchers::Detail::finalizeDescription(const std::string& desc) { if (desc.empty()) { return "matches undescribed predicate"; } else { diff --git a/src/catch2/matchers/catch_matchers_predicate.hpp b/src/catch2/matchers/catch_matchers_predicate.hpp index dcdff771..e589d8be 100644 --- a/src/catch2/matchers/catch_matchers_predicate.hpp +++ b/src/catch2/matchers/catch_matchers_predicate.hpp @@ -16,11 +16,10 @@ namespace Catch { namespace Matchers { -namespace Generic { namespace Detail { std::string finalizeDescription(const std::string& desc); -} +} // namespace Detail template <typename T, typename Predicate> class PredicateMatcher final : public MatcherBase<T> { @@ -42,17 +41,16 @@ public: } }; -} // namespace Generic - - // The following functions create the actual matcher objects. - // 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. + /** + * Creates a matcher that calls delegates `match` to the provided predicate. + * + * The user has to explicitly specify the argument type to the matcher + */ template<typename T, typename Pred> - Generic::PredicateMatcher<T, Pred> Predicate(Pred&& predicate, std::string const& description = "") { + 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); + return PredicateMatcher<T, Pred>(std::forward<Pred>(predicate), description); } } // namespace Matchers |