Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/generators
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-10-20 12:46:31 +0200
committerGitHub2020-10-20 12:46:31 +0200
commitb6a3e2e26b8afabd9a8a89a353662eda9b67097e (patch)
tree95bb37846fbbd982a92267b8521fcdc7131596da /src/catch2/generators
parent4b2bc8757c6d5a95e163b8a54a122d4c95b84310 (diff)
parent6ffac61719934b9a6815267e680045813a125db5 (diff)
downloadcatch3-b6a3e2e26b8afabd9a8a89a353662eda9b67097e.tar.gz
Merge pull request #2058 from catchorg/devel-generators-cache
Fix types in generators: decay types, properly constrain forwarding
Diffstat (limited to 'src/catch2/generators')
-rw-r--r--src/catch2/generators/catch_generators.hpp53
1 files changed, 34 insertions, 19 deletions
diff --git a/src/catch2/generators/catch_generators.hpp b/src/catch2/generators/catch_generators.hpp
index 1a3981ac..fe9c3996 100644
--- a/src/catch2/generators/catch_generators.hpp
+++ b/src/catch2/generators/catch_generators.hpp
@@ -70,8 +70,11 @@ namespace Detail {
class SingleValueGenerator final : public IGenerator<T> {
T m_value;
public:
+ SingleValueGenerator(T const& value) :
+ m_value(value)
+ {}
SingleValueGenerator(T&& value):
- m_value(std::forward<T>(value))
+ m_value(std::move(value))
{}
T const& get() const override {
@@ -101,9 +104,11 @@ namespace Detail {
}
};
- template <typename T>
- GeneratorWrapper<T> value(T&& value) {
- return GeneratorWrapper<T>(Catch::Detail::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
+ template <typename T, typename DecayedT = std::decay_t<T>>
+ GeneratorWrapper<DecayedT> value( T&& value ) {
+ return GeneratorWrapper<DecayedT>(
+ Catch::Detail::make_unique<SingleValueGenerator<DecayedT>>(
+ std::forward<T>( value ) ) );
}
template <typename T>
GeneratorWrapper<T> values(std::initializer_list<T> values) {
@@ -115,27 +120,36 @@ namespace Detail {
std::vector<GeneratorWrapper<T>> m_generators;
size_t m_current = 0;
- void populate(GeneratorWrapper<T>&& generator) {
- m_generators.emplace_back(std::move(generator));
+ void add_generator( GeneratorWrapper<T>&& generator ) {
+ m_generators.emplace_back( std::move( generator ) );
+ }
+ void add_generator( T const& val ) {
+ m_generators.emplace_back( value( val ) );
}
- void populate(T&& val) {
- m_generators.emplace_back(value(std::forward<T>(val)));
+ void add_generator( T&& val ) {
+ m_generators.emplace_back( value( std::move( val ) ) );
}
- template<typename U>
- void populate(U&& val) {
- populate(T(std::forward<U>(val)));
+ template <typename U>
+ std::enable_if_t<!std::is_same<std::decay_t<U>, T>::value>
+ add_generator( U&& val ) {
+ add_generator( T( std::forward<U>( val ) ) );
}
- template<typename U, typename... Gs>
- void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
- populate(std::forward<U>(valueOrGenerator));
- populate(std::forward<Gs>(moreGenerators)...);
+
+ template <typename U> void add_generators( U&& valueOrGenerator ) {
+ add_generator( std::forward<U>( valueOrGenerator ) );
+ }
+
+ template <typename U, typename... Gs>
+ void add_generators( U&& valueOrGenerator, Gs&&... moreGenerators ) {
+ add_generator( std::forward<U>( valueOrGenerator ) );
+ add_generators( std::forward<Gs>( moreGenerators )... );
}
public:
template <typename... Gs>
Generators(Gs &&... moreGenerators) {
m_generators.reserve(sizeof...(Gs));
- populate(std::forward<Gs>(moreGenerators)...);
+ add_generators(std::forward<Gs>(moreGenerators)...);
}
T const& get() const override {
@@ -155,8 +169,9 @@ namespace Detail {
};
- template<typename... Ts>
- GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<std::decay_t<Ts>...>> tuples ) {
+ template <typename... Ts>
+ GeneratorWrapper<std::tuple<std::decay_t<Ts>...>>
+ table( std::initializer_list<std::tuple<std::decay_t<Ts>...>> tuples ) {
return values<std::tuple<Ts...>>( tuples );
}
@@ -173,7 +188,7 @@ namespace Detail {
return Generators<T>(std::move(generator));
}
template<typename T, typename... Gs>
- auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
+ auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<std::decay_t<T>> {
return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
}
template<typename T, typename U, typename... Gs>