coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-10-28 18:07:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

delegate: restore argument deduction behaviour (#1548)

Browse Source 
include new test that verifies arg deduction works

Co-authored-by: John Wellbelove <jwellbelove@users.noreply.github.com>
This commit is contained in:
Eden Frosst 2026-08-20 04:00:10 -04:00 committed by GitHub
parent 67d033cab0
commit 9125f11964
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
include/etl/private/delegate_cpp11.h
View File

@ -413,32 +413,23 @@ namespace etl
//*************************************************************************
/// Execute the delegate.
//*************************************************************************
template <typename... TCallArgs>
ETL_CONSTEXPR14 return_type operator()(TCallArgs&&... args) const
ETL_CONSTEXPR14 return_type operator()(TArgs... args) const
{
ETL_STATIC_ASSERT((sizeof...(TCallArgs) == sizeof...(TArgs)), "Incorrect number of parameters passed to delegate");
ETL_STATIC_ASSERT((etl::type_lists_are_convertible<etl::type_list<TCallArgs&&...>, argument_types>::value),
"Incompatible parameter types passed to delegate");
ETL_ASSERT(is_valid(), ETL_ERROR(delegate_uninitialised));
return (*invocation.stub)(invocation, etl::forward<TCallArgs>(args)...);
return (*invocation.stub)(invocation, etl::forward<TArgs>(args)...);
}
//*************************************************************************
/// Execute the delegate if valid.
/// 'void' return delegate.
//*************************************************************************
template <typename TRet = TReturn, typename... TCallArgs>
ETL_CONSTEXPR14 typename etl::enable_if_t<etl::is_same<TRet, void>::value, bool> call_if(TCallArgs&&... args) const
template <typename TRet = TReturn>
ETL_CONSTEXPR14 typename etl::enable_if_t<etl::is_same<TRet, void>::value, bool> call_if(TArgs... args) const
{
ETL_STATIC_ASSERT((sizeof...(TCallArgs) == sizeof...(TArgs)), "Incorrect number of parameters passed to delegate");
ETL_STATIC_ASSERT((etl::type_lists_are_convertible<etl::type_list<TCallArgs&&...>, argument_types>::value),
"Incompatible parameter types passed to delegate");
if (is_valid())
{
(*invocation.stub)(invocation, etl::forward<TCallArgs>(args)...);
(*invocation.stub)(invocation, etl::forward<TArgs>(args)...);
return true;
}
else
@ -451,18 +442,14 @@ namespace etl
/// Execute the delegate if valid.
/// Non 'void' return delegate.
//*************************************************************************
template <typename TRet = TReturn, typename... TCallArgs>
ETL_CONSTEXPR14 typename etl::enable_if_t<!etl::is_same<TRet, void>::value, etl::optional<TReturn>> call_if(TCallArgs&&... args) const
template <typename TRet = TReturn>
ETL_CONSTEXPR14 typename etl::enable_if_t<!etl::is_same<TRet, void>::value, etl::optional<TReturn>> call_if(TArgs... args) const
{
ETL_STATIC_ASSERT((sizeof...(TCallArgs) == sizeof...(TArgs)), "Incorrect number of parameters passed to delegate");
ETL_STATIC_ASSERT((etl::type_lists_are_convertible<etl::type_list<TCallArgs&&...>, argument_types>::value),
"Incompatible parameter types passed to delegate");
etl::optional<TReturn> result;
if (is_valid())
{
result = (*invocation.stub)(invocation, etl::forward<TCallArgs>(args)...);
result = (*invocation.stub)(invocation, etl::forward<TArgs>(args)...);
}
return result;
@ -472,20 +459,16 @@ namespace etl
/// Execute the delegate if valid or call alternative.
/// Run time alternative.
//*************************************************************************
template <typename TAlternative, typename... TCallArgs>
ETL_CONSTEXPR14 TReturn call_or(TAlternative&& alternative, TCallArgs&&... args) const
template <typename TAlternative>
ETL_CONSTEXPR14 TReturn call_or(TAlternative&& alternative, TArgs... args) const
{
ETL_STATIC_ASSERT((sizeof...(TCallArgs) == sizeof...(TArgs)), "Incorrect number of parameters passed to delegate");
ETL_STATIC_ASSERT((etl::type_lists_are_convertible<etl::type_list<TCallArgs&&...>, argument_types>::value),
"Incompatible parameter types passed to delegate");
if (is_valid())
{
return (*invocation.stub)(invocation, etl::forward<TCallArgs>(args)...);
return (*invocation.stub)(invocation, etl::forward<TArgs>(args)...);
}
else
{
return etl::forward<TAlternative>(alternative)(etl::forward<TCallArgs>(args)...);
return etl::forward<TAlternative>(alternative)(etl::forward<TArgs>(args)...);
}
}
@ -493,20 +476,16 @@ namespace etl
/// Execute the delegate if valid or call alternative.
/// Compile time alternative.
//*************************************************************************
template <TReturn (*Method)(TArgs...), typename... TCallArgs>
ETL_CONSTEXPR14 TReturn call_or(TCallArgs&&... args) const
template <TReturn (*Method)(TArgs...)>
ETL_CONSTEXPR14 TReturn call_or(TArgs... args) const
{
ETL_STATIC_ASSERT((sizeof...(TCallArgs) == sizeof...(TArgs)), "Incorrect number of parameters passed to delegate");
ETL_STATIC_ASSERT((etl::type_lists_are_convertible<etl::type_list<TCallArgs&&...>, argument_types>::value),
"Incompatible parameter types passed to delegate");
if (is_valid())
{
return (*invocation.stub)(invocation, etl::forward<TCallArgs>(args)...);
return (*invocation.stub)(invocation, etl::forward<TArgs>(args)...);
}
else
{
return (Method)(etl::forward<TCallArgs>(args)...);
return (Method)(etl::forward<TArgs>(args)...);
}
}

17
test/test_delegate.cpp
View File

@ -96,7 +96,11 @@ namespace
MoveableOnlyData& operator=(const MoveableOnlyData&) = delete;
MoveableOnlyData(MoveableOnlyData&&) = default;
MoveableOnlyData& operator=(MoveableOnlyData&&) = default;
int d;
MoveableOnlyData(int _d)
: d{_d}
{
}
int d;
};
//*****************************************************************************
@ -583,6 +587,17 @@ namespace
CHECK(parameter_correct);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_free_moveableonly_deduced_type)
{
auto d = etl::delegate<void(MoveableOnlyData&&)>::create<free_moveableonly>();
d({VALUE1}); // deduce argument type from braced initializer list
CHECK(function_called == FunctionCalled::Free_Moveableonly_Called);
CHECK(parameter_correct);
}
//*************************************************************************
#if ETL_USING_CPP17
TEST_FIXTURE(SetupFixture, test_make_delegate_free_moveableonly)