mirror of
https://github.com/ETLCPP/etl.git
synced 2026-04-30 19:09:10 +08:00
Add the ability to specify the callback type to etl closure (#1393)
* Print test names at test time (#1343) * Modified closure to accept the callback type as a template parameter * Modified closure to accept the callback type as a template parameter * Applied clang-format * Fixed C++03 compatibility * Fixed C++03 compatibility # Conflicts: # include/etl/closure.h --------- Co-authored-by: Roland Reichwein <Roland.Reichwein@bmw.de> Co-authored-by: John Wellbelove <john.wellbelove@etlcpp.com>
This commit is contained in:
John Wellbelove
GitHub
parent
8dc0301a67
commit
7971824914
@ -33,53 +33,62 @@ SOFTWARE.
|
||||
|
||||
#include "platform.h"
|
||||
#include "delegate.h"
|
||||
#include "invoke.h"
|
||||
#include "tuple.h"
|
||||
#include "type_list.h"
|
||||
#include "utility.h"
|
||||
|
||||
namespace etl
|
||||
{
|
||||
#if ETL_USING_CPP11 && !defined(ETL_CLOSURE_FORCE_CPP03_IMPLEMENTATION)
|
||||
//*************************************************************************
|
||||
/// Base template for closure.
|
||||
/// \tparam TSignature The callback signature.
|
||||
/// \tparam TCallback The callback type, defaults to etl::delegate<TSignature>.
|
||||
//*************************************************************************
|
||||
template <typename>
|
||||
template <typename TSignature, typename TCallback = etl::delegate<TSignature> >
|
||||
class closure;
|
||||
|
||||
#if ETL_USING_CPP11 && !defined(ETL_CLOSURE_FORCE_CPP03_IMPLEMENTATION)
|
||||
//*************************************************************************
|
||||
/// Closure for binding arguments to a delegate and invoking it later.
|
||||
/// Stores a delegate and its arguments, allowing deferred execution.
|
||||
/// Closure for binding arguments to a callback and invoking it later.
|
||||
/// Stores a callback and its arguments, allowing deferred execution.
|
||||
/// Arguments are stored in a tuple and can be rebound using bind().
|
||||
/// Example usage:
|
||||
/// \code
|
||||
/// etl::closure<void(int, int)> c(my_delegate, 1, 2);
|
||||
/// c(); // Invokes my_delegate(1, 2)
|
||||
/// \endcode
|
||||
/// \tparam TReturn The return type of the delegate.
|
||||
/// \tparam TArgs The argument types of the delegate.
|
||||
/// \tparam TReturn The return type of the callback.
|
||||
/// \tparam TArgs The argument types of the callback.
|
||||
/// \tparam TCallback The callback type.
|
||||
//*************************************************************************
|
||||
template <typename TReturn, typename... TArgs>
|
||||
class closure<TReturn(TArgs...)>
|
||||
template <typename TReturn, typename... TArgs, typename TCallback>
|
||||
class closure<TReturn(TArgs...), TCallback>
|
||||
{
|
||||
public:
|
||||
|
||||
using delegate_type = etl::delegate<TReturn(TArgs...)>; ///< The delegate type to be invoked.
|
||||
using argument_types = etl::type_list<TArgs...>; ///< The type list of arguments.
|
||||
ETL_DEPRECATED_REASON("Use callback_type") using delegate_type =
|
||||
TCallback; ///< The callback type to be invoked. Deprecated, use callback_type instead.
|
||||
using callback_type = TCallback; ///< The callback type to be invoked.
|
||||
using argument_types = etl::type_list<TArgs...>; ///< The type list of arguments.
|
||||
|
||||
static_assert(etl::is_invocable_r<TReturn, TCallback, TArgs...>::value, "Callback is not invocable with the specified arguments");
|
||||
static_assert(etl::is_copy_constructible<TCallback>::value, "Callback type must be copy constructible");
|
||||
|
||||
//*********************************************************************
|
||||
/// Construct a closure with a delegate and its arguments.
|
||||
/// \param f The delegate to be invoked.
|
||||
/// \param args The arguments to bind to the delegate.
|
||||
/// Construct a closure with a callback and its arguments.
|
||||
/// \param f The callback to be invoked.
|
||||
/// \param args The arguments to bind to the callback.
|
||||
//*********************************************************************
|
||||
ETL_CONSTEXPR14 closure(const delegate_type& f, const TArgs... args)
|
||||
ETL_CONSTEXPR14 closure(const callback_type& f, const TArgs... args)
|
||||
: m_f(f)
|
||||
, m_args(args...)
|
||||
{
|
||||
}
|
||||
|
||||
//*********************************************************************
|
||||
/// Invoke the stored delegate with the bound arguments.
|
||||
/// \return The result of the delegate invocation.
|
||||
/// Invoke the stored callback with the bound arguments.
|
||||
/// \return The result of the callback invocation.
|
||||
//*********************************************************************
|
||||
ETL_CONSTEXPR14 TReturn operator()() const
|
||||
{
|
||||
@ -131,7 +140,7 @@ namespace etl
|
||||
//*********************************************************************
|
||||
/// Execute the closure with the stored arguments.
|
||||
/// \tparam idx Index sequence for tuple unpacking.
|
||||
/// \return The result of the delegate invocation.
|
||||
/// \return The result of the callback invocation.
|
||||
//*********************************************************************
|
||||
template <size_t... Indexes>
|
||||
ETL_CONSTEXPR14 TReturn execute(etl::index_sequence<Indexes...>) const
|
||||
@ -139,43 +148,38 @@ namespace etl
|
||||
return m_f(etl::get<Indexes>(m_args)...);
|
||||
}
|
||||
|
||||
delegate_type m_f; ///< The delegate to invoke.
|
||||
callback_type m_f; ///< The callback to invoke.
|
||||
etl::tuple<TArgs...> m_args; ///< The bound arguments.
|
||||
};
|
||||
#else
|
||||
//*************************************************************************
|
||||
/// Base template for closure.
|
||||
//*************************************************************************
|
||||
template <typename>
|
||||
class closure;
|
||||
|
||||
//*************************************************************************
|
||||
/// Closure for binding one argument to a delegate and invoking it later.
|
||||
/// \tparam TReturn The return type of the delegate.
|
||||
/// Closure for binding one argument to a callback and invoking it later.
|
||||
/// \tparam TReturn The return type of the callback.
|
||||
/// \tparam TArg0 The type of the argument.
|
||||
/// \tparam TCallback The callback type.
|
||||
//*************************************************************************
|
||||
template <typename TReturn, typename TArg0>
|
||||
class closure<TReturn(TArg0)>
|
||||
template <typename TReturn, typename TArg0, typename TCallback>
|
||||
class closure<TReturn(TArg0), TCallback>
|
||||
{
|
||||
public:
|
||||
|
||||
/// The delegate type to be invoked.
|
||||
typedef etl::delegate<TReturn(TArg0)> delegate_type;
|
||||
/// The callback type to be invoked.
|
||||
typedef TCallback callback_type;
|
||||
|
||||
//*********************************************************************
|
||||
/// Construct a closure with a delegate and its argument.
|
||||
/// \param f The delegate to be invoked.
|
||||
/// \param arg0 The argument to bind to the delegate.
|
||||
/// Construct a closure with a callback and its argument.
|
||||
/// \param f The callback to be invoked.
|
||||
/// \param arg0 The argument to bind to the callback.
|
||||
//*********************************************************************
|
||||
closure(const delegate_type& f, const TArg0 arg0)
|
||||
closure(const callback_type& f, const TArg0 arg0)
|
||||
: m_f(f)
|
||||
, m_arg0(arg0)
|
||||
{
|
||||
}
|
||||
|
||||
//*********************************************************************
|
||||
/// Invoke the stored delegate with the bound argument.
|
||||
/// \return The result of the delegate invocation.
|
||||
/// Invoke the stored callback with the bound argument.
|
||||
/// \return The result of the callback invocation.
|
||||
//*********************************************************************
|
||||
TReturn operator()() const
|
||||
{
|
||||
@ -184,30 +188,31 @@ namespace etl
|
||||
|
||||
private:
|
||||
|
||||
delegate_type m_f; ///< The delegate to invoke.
|
||||
callback_type m_f; ///< The callback to invoke.
|
||||
TArg0 m_arg0;
|
||||
};
|
||||
|
||||
//*************************************************************************
|
||||
/// Closure for binding two arguments to a delegate and invoking it later.
|
||||
/// \tparam TReturn The return type of the delegate.
|
||||
/// Closure for binding two arguments to a callback and invoking it later.
|
||||
/// \tparam TReturn The return type of the callback.
|
||||
/// \tparam TArg0 The type of the first argument.
|
||||
/// \tparam TArg1 The type of the second argument.
|
||||
/// \tparam TCallback The callback type.
|
||||
//*************************************************************************
|
||||
template <typename TReturn, typename TArg0, typename TArg1>
|
||||
class closure<TReturn(TArg0, TArg1)>
|
||||
template <typename TReturn, typename TArg0, typename TArg1, typename TCallback>
|
||||
class closure<TReturn(TArg0, TArg1), TCallback>
|
||||
{
|
||||
public:
|
||||
|
||||
typedef etl::delegate<TReturn(TArg0, TArg1)> delegate_type;
|
||||
typedef TCallback callback_type;
|
||||
|
||||
//*********************************************************************
|
||||
/// Construct a closure with a delegate and its arguments.
|
||||
/// \param f The delegate to be invoked.
|
||||
/// Construct a closure with a callback and its arguments.
|
||||
/// \param f The callback to be invoked.
|
||||
/// \param arg0 The first argument to bind.
|
||||
/// \param arg1 The second argument to bind.
|
||||
//*********************************************************************
|
||||
closure(const delegate_type& f, const TArg0 arg0, const TArg1 arg1)
|
||||
closure(const callback_type& f, const TArg0 arg0, const TArg1 arg1)
|
||||
: m_f(f)
|
||||
, m_arg0(arg0)
|
||||
, m_arg1(arg1)
|
||||
@ -215,8 +220,8 @@ namespace etl
|
||||
}
|
||||
|
||||
//*********************************************************************
|
||||
/// Invoke the stored delegate with the bound arguments.
|
||||
/// \return The result of the delegate invocation.
|
||||
/// Invoke the stored callback with the bound arguments.
|
||||
/// \return The result of the callback invocation.
|
||||
//*********************************************************************
|
||||
TReturn operator()() const
|
||||
{
|
||||
@ -225,33 +230,34 @@ namespace etl
|
||||
|
||||
private:
|
||||
|
||||
delegate_type m_f; ///< The delegate to invoke.
|
||||
callback_type m_f; ///< The callback to invoke.
|
||||
TArg0 m_arg0;
|
||||
TArg1 m_arg1;
|
||||
};
|
||||
|
||||
//*************************************************************************
|
||||
/// Closure for binding three arguments to a delegate and invoking it later.
|
||||
/// \tparam TReturn The return type of the delegate.
|
||||
/// Closure for binding three arguments to a callback and invoking it later.
|
||||
/// \tparam TReturn The return type of the callback.
|
||||
/// \tparam TArg0 The type of the first argument.
|
||||
/// \tparam TArg1 The type of the second argument.
|
||||
/// \tparam TArg2 The type of the third argument.
|
||||
/// \tparam TCallback The callback type.
|
||||
//*************************************************************************
|
||||
template <typename TReturn, typename TArg0, typename TArg1, typename TArg2>
|
||||
class closure<TReturn(TArg0, TArg1, TArg2)>
|
||||
template <typename TReturn, typename TArg0, typename TArg1, typename TArg2, typename TCallback>
|
||||
class closure<TReturn(TArg0, TArg1, TArg2), TCallback>
|
||||
{
|
||||
public:
|
||||
|
||||
typedef etl::delegate<TReturn(TArg0, TArg1, TArg2)> delegate_type;
|
||||
typedef TCallback callback_type;
|
||||
|
||||
//*********************************************************************
|
||||
/// Construct a closure with a delegate and its arguments.
|
||||
/// \param f The delegate to be invoked.
|
||||
/// Construct a closure with a callback and its arguments.
|
||||
/// \param f The callback to be invoked.
|
||||
/// \param arg0 The first argument to bind.
|
||||
/// \param arg1 The second argument to bind.
|
||||
/// \param arg2 The third argument to bind.
|
||||
//*********************************************************************
|
||||
closure(const delegate_type& f, const TArg0 arg0, const TArg1 arg1, const TArg2 arg2)
|
||||
closure(const callback_type& f, const TArg0 arg0, const TArg1 arg1, const TArg2 arg2)
|
||||
: m_f(f)
|
||||
, m_arg0(arg0)
|
||||
, m_arg1(arg1)
|
||||
@ -260,8 +266,8 @@ namespace etl
|
||||
}
|
||||
|
||||
//*********************************************************************
|
||||
/// Invoke the stored delegate with the bound arguments.
|
||||
/// \return The result of the delegate invocation.
|
||||
/// Invoke the stored callback with the bound arguments.
|
||||
/// \return The result of the callback invocation.
|
||||
//*********************************************************************
|
||||
TReturn operator()() const
|
||||
{
|
||||
@ -270,36 +276,37 @@ namespace etl
|
||||
|
||||
private:
|
||||
|
||||
delegate_type m_f; ///< The delegate to invoke.
|
||||
callback_type m_f; ///< The callback to invoke.
|
||||
TArg0 m_arg0;
|
||||
TArg1 m_arg1;
|
||||
TArg2 m_arg2;
|
||||
};
|
||||
|
||||
//*************************************************************************
|
||||
/// Closure for binding four arguments to a delegate and invoking it later.
|
||||
/// \tparam TReturn The return type of the delegate.
|
||||
/// Closure for binding four arguments to a callback and invoking it later.
|
||||
/// \tparam TReturn The return type of the callback.
|
||||
/// \tparam TArg0 The type of the first argument.
|
||||
/// \tparam TArg1 The type of the second argument.
|
||||
/// \tparam TArg2 The type of the third argument.
|
||||
/// \tparam TArg3 The type of the fourth argument.
|
||||
/// \tparam TCallback The callback type.
|
||||
//*************************************************************************
|
||||
template <typename TReturn, typename TArg0, typename TArg1, typename TArg2, typename TArg3>
|
||||
class closure<TReturn(TArg0, TArg1, TArg2, TArg3)>
|
||||
template <typename TReturn, typename TArg0, typename TArg1, typename TArg2, typename TArg3, typename TCallback>
|
||||
class closure<TReturn(TArg0, TArg1, TArg2, TArg3), TCallback>
|
||||
{
|
||||
public:
|
||||
|
||||
typedef etl::delegate<TReturn(TArg0, TArg1, TArg2, TArg3)> delegate_type;
|
||||
typedef TCallback callback_type;
|
||||
|
||||
//*********************************************************************
|
||||
/// Construct a closure with a delegate and its arguments.
|
||||
/// \param f The delegate to be invoked.
|
||||
/// Construct a closure with a callback and its arguments.
|
||||
/// \param f The callback to be invoked.
|
||||
/// \param arg0 The first argument to bind.
|
||||
/// \param arg1 The second argument to bind.
|
||||
/// \param arg2 The third argument to bind.
|
||||
/// \param arg3 The fourth argument to bind.
|
||||
//*********************************************************************
|
||||
closure(const delegate_type& f, const TArg0 arg0, const TArg1 arg1, const TArg2 arg2, const TArg3 arg3)
|
||||
closure(const callback_type& f, const TArg0 arg0, const TArg1 arg1, const TArg2 arg2, const TArg3 arg3)
|
||||
: m_f(f)
|
||||
, m_arg0(arg0)
|
||||
, m_arg1(arg1)
|
||||
@ -309,8 +316,8 @@ namespace etl
|
||||
}
|
||||
|
||||
//*********************************************************************
|
||||
/// Invoke the stored delegate with the bound arguments.
|
||||
/// \return The result of the delegate invocation.
|
||||
/// Invoke the stored callback with the bound arguments.
|
||||
/// \return The result of the callback invocation.
|
||||
//*********************************************************************
|
||||
TReturn operator()() const
|
||||
{
|
||||
@ -319,7 +326,7 @@ namespace etl
|
||||
|
||||
private:
|
||||
|
||||
delegate_type m_f; ///< The delegate to invoke.
|
||||
callback_type m_f; ///< The callback to invoke.
|
||||
TArg0 m_arg0;
|
||||
TArg1 m_arg1;
|
||||
TArg2 m_arg2;
|
||||
@ -327,31 +334,32 @@ namespace etl
|
||||
};
|
||||
|
||||
//*************************************************************************
|
||||
/// Closure for binding five arguments to a delegate and invoking it later.
|
||||
/// \tparam TReturn The return type of the delegate.
|
||||
/// Closure for binding five arguments to a callback and invoking it later.
|
||||
/// \tparam TReturn The return type of the callback.
|
||||
/// \tparam TArg0 The type of the first argument.
|
||||
/// \tparam TArg1 The type of the second argument.
|
||||
/// \tparam TArg2 The type of the third argument.
|
||||
/// \tparam TArg3 The type of the fourth argument.
|
||||
/// \tparam TArg4 The type of the fifth argument.
|
||||
/// \tparam TCallback The callback type.
|
||||
//*************************************************************************
|
||||
template <typename TReturn, typename TArg0, typename TArg1, typename TArg2, typename TArg3, typename TArg4>
|
||||
class closure<TReturn(TArg0, TArg1, TArg2, TArg3, TArg4)>
|
||||
template <typename TReturn, typename TArg0, typename TArg1, typename TArg2, typename TArg3, typename TArg4, typename TCallback>
|
||||
class closure<TReturn(TArg0, TArg1, TArg2, TArg3, TArg4), TCallback>
|
||||
{
|
||||
public:
|
||||
|
||||
typedef etl::delegate<TReturn(TArg0, TArg1, TArg2, TArg3, TArg4)> delegate_type;
|
||||
typedef TCallback callback_type;
|
||||
|
||||
//*********************************************************************
|
||||
/// Construct a closure with a delegate and its arguments.
|
||||
/// \param f The delegate to be invoked.
|
||||
/// Construct a closure with a callback and its arguments.
|
||||
/// \param f The callback to be invoked.
|
||||
/// \param arg0 The first argument to bind.
|
||||
/// \param arg1 The second argument to bind.
|
||||
/// \param arg2 The third argument to bind.
|
||||
/// \param arg3 The fourth argument to bind.
|
||||
/// \param arg4 The fifth argument to bind.
|
||||
//*********************************************************************
|
||||
closure(const delegate_type& f, const TArg0 arg0, const TArg1 arg1, const TArg2 arg2, const TArg3 arg3, const TArg4 arg4)
|
||||
closure(const callback_type& f, const TArg0 arg0, const TArg1 arg1, const TArg2 arg2, const TArg3 arg3, const TArg4 arg4)
|
||||
: m_f(f)
|
||||
, m_arg0(arg0)
|
||||
, m_arg1(arg1)
|
||||
@ -362,8 +370,8 @@ namespace etl
|
||||
}
|
||||
|
||||
//*********************************************************************
|
||||
/// Invoke the stored delegate with the bound arguments.
|
||||
/// \return The result of the delegate invocation.
|
||||
/// Invoke the stored callback with the bound arguments.
|
||||
/// \return The result of the callback invocation.
|
||||
//*********************************************************************
|
||||
TReturn operator()() const
|
||||
{
|
||||
@ -372,7 +380,7 @@ namespace etl
|
||||
|
||||
private:
|
||||
|
||||
delegate_type m_f; ///< The delegate to invoke.
|
||||
callback_type m_f; ///< The callback to invoke.
|
||||
TArg0 m_arg0;
|
||||
TArg1 m_arg1;
|
||||
TArg2 m_arg2;
|
||||
|
||||
@ -83,8 +83,9 @@ add_executable(etl_tests
|
||||
test_circular_buffer.cpp
|
||||
test_circular_buffer_external_buffer.cpp
|
||||
test_circular_iterator.cpp
|
||||
test_closure.cpp
|
||||
test_closure_constexpr.cpp
|
||||
test_closure_with_default_delegate.cpp
|
||||
test_closure_with_default_delegate_constexpr.cpp
|
||||
test_closure_with_inplace_function.cpp
|
||||
test_compare.cpp
|
||||
test_concepts.cpp
|
||||
test_constant.cpp
|
||||
@ -523,7 +524,7 @@ if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Cla
|
||||
target_link_options(etl_tests
|
||||
PRIVATE
|
||||
-fsanitize=address,undefined,bounds
|
||||
)
|
||||
)
|
||||
endif()
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
@ -34,7 +34,7 @@ SOFTWARE.
|
||||
|
||||
namespace
|
||||
{
|
||||
SUITE(test_closure)
|
||||
SUITE(test_closure_with_default_delegate)
|
||||
{
|
||||
int f1(int a1)
|
||||
{
|
||||
@ -34,7 +34,7 @@ SOFTWARE.
|
||||
|
||||
namespace
|
||||
{
|
||||
SUITE(test_closure)
|
||||
SUITE(test_closure_with_default_delegate_constexpr)
|
||||
{
|
||||
static constexpr int f1(int a1)
|
||||
{
|
||||
208
test/test_closure_with_inplace_function.cpp
Normal file
208
test/test_closure_with_inplace_function.cpp
Normal file
@ -0,0 +1,208 @@
|
||||
/******************************************************************************
|
||||
The MIT License(MIT)
|
||||
|
||||
Embedded Template Library.
|
||||
https://github.com/ETLCPP/etl
|
||||
https://www.etlcpp.com
|
||||
|
||||
Copyright(c) 2025 BMW AG, John Wellbelove
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files(the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions :
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
******************************************************************************/
|
||||
|
||||
#include "unit_test_framework.h"
|
||||
|
||||
#include "etl/closure.h"
|
||||
#include "etl/inplace_function.h"
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
namespace
|
||||
{
|
||||
SUITE(test_closure_with_inplace_function)
|
||||
{
|
||||
int f1(int a1)
|
||||
{
|
||||
return a1 * 3;
|
||||
}
|
||||
|
||||
int f1_throwing(int)
|
||||
{
|
||||
throw std::runtime_error("throwing function");
|
||||
}
|
||||
|
||||
void f1_void(int) {}
|
||||
|
||||
int f1_ref(int& a1)
|
||||
{
|
||||
return a1 * 3;
|
||||
}
|
||||
|
||||
int f2(int a1, int a2)
|
||||
{
|
||||
return a1 * 3 + a2;
|
||||
}
|
||||
|
||||
int f3(int a1, int a2, int a3)
|
||||
{
|
||||
return a1 * 3 + a2 * a3;
|
||||
}
|
||||
|
||||
int f4(int a1, int a2, int a3, int a4)
|
||||
{
|
||||
return a1 * 3 + a2 * a3 + a4;
|
||||
}
|
||||
|
||||
int f5(int a1, int a2, int a3, int a4, int a5)
|
||||
{
|
||||
return a1 * 3 + a2 * a3 + a4 * a5;
|
||||
}
|
||||
|
||||
using f1_type = int(int);
|
||||
using f1_ref_type = int(int&);
|
||||
using f1_void_type = void(int);
|
||||
using f2_type = int(int, int);
|
||||
using f3_type = int(int, int, int);
|
||||
using f4_type = int(int, int, int, int);
|
||||
using f5_type = int(int, int, int, int, int);
|
||||
|
||||
using ipf1_type = etl::inplace_function<f1_type>;
|
||||
using ipf1_ref_type = etl::inplace_function<f1_ref_type>;
|
||||
using ipf1_void_type = etl::inplace_function<f1_void_type>;
|
||||
using ipf2_type = etl::inplace_function<f2_type>;
|
||||
using ipf3_type = etl::inplace_function<f3_type>;
|
||||
using ipf4_type = etl::inplace_function<f4_type>;
|
||||
using ipf5_type = etl::inplace_function<f5_type>;
|
||||
|
||||
ipf1_type ipf1 = ipf1_type::create<&f1>();
|
||||
ipf1_type ipf1_throwing = ipf1_type::create<&f1_throwing>();
|
||||
ipf1_ref_type ipf1_ref = ipf1_ref_type::create<&f1_ref>();
|
||||
ipf1_void_type ipf1_void = ipf1_void_type::create<&f1_void>();
|
||||
ipf2_type ipf2 = ipf2_type::create<&f2>();
|
||||
ipf3_type ipf3 = ipf3_type::create<&f3>();
|
||||
ipf4_type ipf4 = ipf4_type::create<&f4>();
|
||||
ipf5_type ipf5 = ipf5_type::create<&f5>();
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_1_arg)
|
||||
{
|
||||
etl::closure<f1_type, ipf1_type> c1(ipf1, 4);
|
||||
CHECK_EQUAL(12, c1());
|
||||
}
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_1_arg_reference)
|
||||
{
|
||||
int v1 = 4;
|
||||
etl::closure<f1_ref_type, ipf1_ref_type> c1_ref(ipf1_ref, v1);
|
||||
CHECK_EQUAL(12, c1_ref());
|
||||
v1 = 5;
|
||||
CHECK_EQUAL(15, c1_ref());
|
||||
}
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_1_arg_lambda)
|
||||
{
|
||||
auto l = [](int a)
|
||||
{
|
||||
return a + 11;
|
||||
};
|
||||
ipf1_type ipf1_lambda(l);
|
||||
|
||||
etl::closure<f1_type, ipf1_type> c1_lambda(ipf1_lambda, 5);
|
||||
CHECK_EQUAL(16, c1_lambda());
|
||||
}
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_throwing)
|
||||
{
|
||||
etl::closure<f1_type, ipf1_type> c1(ipf1_throwing, 4);
|
||||
CHECK_THROW(c1(), std::runtime_error);
|
||||
}
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_void)
|
||||
{
|
||||
etl::closure<f1_void_type, ipf1_void_type> c1(ipf1_void, 4);
|
||||
c1();
|
||||
}
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_2_args)
|
||||
{
|
||||
etl::closure<f2_type, ipf2_type> c2(ipf2, 4, 3);
|
||||
CHECK_EQUAL(15, c2());
|
||||
}
|
||||
|
||||
#if ETL_USING_CPP11 && !defined(ETL_CLOSURE_FORCE_CPP03_IMPLEMENTATION)
|
||||
//*************************************************************************
|
||||
TEST(test_2_args_bind)
|
||||
{
|
||||
etl::closure<f2_type, ipf2_type> c2(ipf2, 4, 3);
|
||||
CHECK_EQUAL(15, c2());
|
||||
|
||||
c2.bind<0>(7);
|
||||
c2.bind<1>(8);
|
||||
CHECK_EQUAL(29, c2());
|
||||
}
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_2_args_bind_all)
|
||||
{
|
||||
etl::closure<f2_type, ipf2_type> c2(ipf2, 4, 3);
|
||||
CHECK_EQUAL(15, c2());
|
||||
|
||||
c2.bind(7, 8);
|
||||
CHECK_EQUAL(29, c2());
|
||||
}
|
||||
#endif
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_3_args)
|
||||
{
|
||||
etl::closure<f3_type, ipf3_type> c3(ipf3, 4, 3, 2);
|
||||
CHECK_EQUAL(18, c3());
|
||||
}
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_4_args)
|
||||
{
|
||||
etl::closure<f4_type, ipf4_type> c4(ipf4, 4, 3, 2, 1);
|
||||
CHECK_EQUAL(19, c4());
|
||||
}
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_5_args)
|
||||
{
|
||||
etl::closure<f5_type, ipf5_type> c5(ipf5, 4, 3, 2, 1, 5);
|
||||
CHECK_EQUAL(23, c5());
|
||||
}
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_bind_static_assert)
|
||||
{
|
||||
etl::closure<f2_type, ipf2_type> c(ipf2, 1, 2);
|
||||
|
||||
// Uncomment to generate static_assert errors.
|
||||
// c.bind(1); // Argument count mismatch
|
||||
// c.bind(1, 2, 3); // Argument count mismatch
|
||||
// c.bind(1, std::string()); // Argument is not convertible
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
@ -10273,8 +10273,9 @@
|
||||
<ClCompile Include="..\test_circular_buffer.cpp" />
|
||||
<ClCompile Include="..\test_circular_buffer_external_buffer.cpp" />
|
||||
<ClCompile Include="..\test_circular_iterator.cpp" />
|
||||
<ClCompile Include="..\test_closure.cpp" />
|
||||
<ClCompile Include="..\test_closure_constexpr.cpp" />
|
||||
<ClCompile Include="..\test_closure_with_default_delegate.cpp" />
|
||||
<ClCompile Include="..\test_closure_with_default_delegate_constexpr.cpp" />
|
||||
<ClCompile Include="..\test_closure_with_inplace_function.cpp" />
|
||||
<ClCompile Include="..\test_concepts.cpp" />
|
||||
<ClCompile Include="..\test_const_map.cpp" />
|
||||
<ClCompile Include="..\test_const_map_constexpr.cpp" />
|
||||
|
||||
@ -3647,7 +3647,7 @@
|
||||
<ClCompile Include="..\test_chrono_literals.cpp">
|
||||
<Filter>Tests\Chrono</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\test_closure.cpp">
|
||||
<ClCompile Include="..\test_closure_with_default_delegate.cpp">
|
||||
<Filter>Tests\Callbacks & Delegates</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\syntax_check\closure.h.t.cpp">
|
||||
@ -3704,7 +3704,7 @@
|
||||
<ClCompile Include="..\test_crc8_nrsc5.cpp">
|
||||
<Filter>Tests\CRC</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\test_closure_constexpr.cpp">
|
||||
<ClCompile Include="..\test_closure_with_default_delegate_constexpr.cpp">
|
||||
<Filter>Tests\Callbacks & Delegates</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\test_crc8_opensafety.cpp">
|
||||
@ -3800,6 +3800,9 @@
|
||||
<ClCompile Include="..\test_print.cpp">
|
||||
<Filter>Tests\Strings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\test_closure_with_inplace_function.cpp">
|
||||
<Filter>Tests\Callbacks & Delegates</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\library.properties">
|
||||
@ -3979,12 +3982,6 @@
|
||||
<None Include="..\..\.github\workflows\gcc-c++23.yml">
|
||||
<Filter>Resource Files\CI\Github</Filter>
|
||||
</None>
|
||||
<None Include="..\..\docs\_index.md">
|
||||
<Filter>Documentation</Filter>
|
||||
</None>
|
||||
<None Include="..\..\docs\custom.css">
|
||||
<Filter>Documentation</Filter>
|
||||
</None>
|
||||
<None Include="..\..\.github\workflows\clang-format.yaml" />
|
||||
<None Include="..\..\.github\workflows\clang-format_update.yaml" />
|
||||
<None Include="..\run-coverage.sh">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user