sha512sum/utempl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add additional checks to Default in Switch function

Browse source
This commit is contained in:
sha512sum 2024-07-15 18:33:37 +00:00
parent 25ec03f84b
commit 359bed1b7d
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/utempl/utils.hpp
View file

@ -683,6 +683,17 @@ concept CallableSwitchConcept = std::same_as<R, void> || decltype(Unpack(std::de
}() && ...)>;
}))::kValue;
template <typename F, typename R>
concept DefaultSwitchConcept = [] {
if constexpr(std::invocable<F>) {
if constexpr(!std::same_as<R, void>) {
return std::convertible_to<std::invoke_result_t<F>, std::optional<R>>;
};
return true;
};
return false;
}();
} // namespace impl
template <typename R = void,
@ -690,7 +701,7 @@ template <typename R = void,
TupleLike ValuesTuple,
impl::ComparableSwitchConcept<KeysTuple> Key,
impl::CallableSwitchConcept<ValuesTuple, R> F,
std::invocable Default = decltype(kDefaultCreator<R>)>
impl::DefaultSwitchConcept<R> Default = decltype(kDefaultCreator<R>)>
constexpr auto Switch(KeysTuple&& keysTuple, ValuesTuple&& valuesTuple, Key&& key, F&& f, Default&& def = {}) -> R
requires(std::move_constructible<R> || std::same_as<R, void>) && (kTupleSize<KeysTuple> == kTupleSize<ValuesTuple>)
{