summaryrefslogtreecommitdiff
path: root/absl/base
diff options
context:
space:
mode:
Diffstat (limited to 'absl/base')
-rw-r--r--absl/base/internal/invoke.h131
-rw-r--r--absl/base/invoke_test.cc34
2 files changed, 32 insertions, 133 deletions
diff --git a/absl/base/internal/invoke.h b/absl/base/internal/invoke.h
index ab5ad910..c4eceebd 100644
--- a/absl/base/internal/invoke.h
+++ b/absl/base/internal/invoke.h
@@ -18,19 +18,16 @@
// [func.require]
// Define INVOKE (f, t1, t2, ..., tN) as follows:
// 1. (t1.*f)(t2, ..., tN) when f is a pointer to a member function of a class T
-// and is_base_of_v<T, remove_reference_t<decltype(t1)>> is true;
-// 2. (t1.get().*f)(t2, ..., tN) when f is a pointer to a member function of a
-// class T and remove_cvref_t<decltype(t1)> is a specialization of
-// reference_wrapper;
-// 3. ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
-// class T and t1 does not satisfy the previous two items;
-// 4. t1.*f when N == 1 and f is a pointer to data member of a class T and
-// is_base_of_v<T, remove_reference_t<decltype(t1)>> is true;
-// 5. t1.get().*f when N == 1 and f is a pointer to data member of a class T and
-// remove_cvref_t<decltype(t1)> is a specialization of reference_wrapper;
-// 6. (*t1).*f when N == 1 and f is a pointer to data member of a class T and t1
-// does not satisfy the previous two items;
-// 7. f(t1, t2, ..., tN) in all other cases.
+// and t1 is an object of type T or a reference to an object of type T or a
+// reference to an object of a type derived from T;
+// 2. ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
+// class T and t1 is not one of the types described in the previous item;
+// 3. t1.*f when N == 1 and f is a pointer to member data of a class T and t1 is
+// an object of type T or a reference to an object of type T or a reference
+// to an object of a type derived from T;
+// 4. (*t1).*f when N == 1 and f is a pointer to member data of a class T and t1
+// is not one of the types described in the previous item;
+// 5. f(t1, t2, ..., tN) in all other cases.
//
// The implementation is SFINAE-friendly: substitution failure within Invoke()
// isn't an error.
@@ -51,16 +48,7 @@ namespace absl {
ABSL_NAMESPACE_BEGIN
namespace base_internal {
-template <typename T>
-struct IsReferenceWrapper : std::false_type {};
-template <typename T>
-struct IsReferenceWrapper<std::reference_wrapper<T>> : std::true_type {};
-
-template <typename T>
-using RemoveCvrefT =
- typename std::remove_cv<typename std::remove_reference<T>::type>::type;
-
-// The seven classes below each implement one of the clauses from the definition
+// The five classes below each implement one of the clauses from the definition
// of INVOKE. The inner class template Accept<F, Args...> checks whether the
// clause is applicable; static function template Invoke(f, args...) does the
// invocation.
@@ -84,10 +72,9 @@ struct MemFunAndRef : StrippedAccept<MemFunAndRef> {
template <typename MemFunType, typename C, typename Obj, typename... Args>
struct AcceptImpl<MemFunType C::*, Obj, Args...>
- : std::integral_constant<
- bool, std::is_base_of<
- C, typename std::remove_reference<Obj>::type>::value &&
- absl::is_function<MemFunType>::value> {};
+ : std::integral_constant<bool, std::is_base_of<C, Obj>::value &&
+ absl::is_function<MemFunType>::value> {
+ };
template <typename MemFun, typename Obj, typename... Args>
static decltype((std::declval<Obj>().*
@@ -98,41 +85,17 @@ struct MemFunAndRef : StrippedAccept<MemFunAndRef> {
}
};
-// (t1.get().*f)(t2, ..., tN) when f is a pointer to a member function of a
-// class T and remove_cvref_t<decltype(t1)> is a specialization of
-// reference_wrapper;
-struct MemFunAndRefWrap : StrippedAccept<MemFunAndRefWrap> {
- template <typename... Args>
- struct AcceptImpl : std::false_type {};
-
- template <typename MemFunType, typename C, typename RefWrap, typename... Args>
- struct AcceptImpl<MemFunType C::*, RefWrap, Args...>
- : std::integral_constant<
- bool, IsReferenceWrapper<RemoveCvrefT<RefWrap>>::value &&
- absl::is_function<MemFunType>::value> {};
-
- template <typename MemFun, typename RefWrap, typename... Args>
- static decltype((std::declval<RefWrap>().get().*
- std::declval<MemFun>())(std::declval<Args>()...))
- Invoke(MemFun&& mem_fun, RefWrap&& ref_wrap, Args&&... args) {
- return (std::forward<RefWrap>(ref_wrap).get().*
- std::forward<MemFun>(mem_fun))(std::forward<Args>(args)...);
- }
-};
-
// ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
-// class T and t1 does not satisfy the previous two items;
+// class T and t1 is not one of the types described in the previous item.
struct MemFunAndPtr : StrippedAccept<MemFunAndPtr> {
template <typename... Args>
struct AcceptImpl : std::false_type {};
template <typename MemFunType, typename C, typename Ptr, typename... Args>
struct AcceptImpl<MemFunType C::*, Ptr, Args...>
- : std::integral_constant<
- bool, !std::is_base_of<
- C, typename std::remove_reference<Ptr>::type>::value &&
- !IsReferenceWrapper<RemoveCvrefT<Ptr>>::value &&
- absl::is_function<MemFunType>::value> {};
+ : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value &&
+ absl::is_function<MemFunType>::value> {
+ };
template <typename MemFun, typename Ptr, typename... Args>
static decltype(((*std::declval<Ptr>()).*
@@ -143,18 +106,17 @@ struct MemFunAndPtr : StrippedAccept<MemFunAndPtr> {
}
};
-// t1.*f when N == 1 and f is a pointer to data member of a class T and
-// is_base_of_v<T, remove_reference_t<decltype(t1)>> is true;
+// t1.*f when N == 1 and f is a pointer to member data of a class T and t1 is
+// an object of type T or a reference to an object of type T or a reference
+// to an object of a type derived from T.
struct DataMemAndRef : StrippedAccept<DataMemAndRef> {
template <typename... Args>
struct AcceptImpl : std::false_type {};
template <typename R, typename C, typename Obj>
struct AcceptImpl<R C::*, Obj>
- : std::integral_constant<
- bool, std::is_base_of<
- C, typename std::remove_reference<Obj>::type>::value &&
- !absl::is_function<R>::value> {};
+ : std::integral_constant<bool, std::is_base_of<C, Obj>::value &&
+ !absl::is_function<R>::value> {};
template <typename DataMem, typename Ref>
static decltype(std::declval<Ref>().*std::declval<DataMem>()) Invoke(
@@ -163,39 +125,16 @@ struct DataMemAndRef : StrippedAccept<DataMemAndRef> {
}
};
-// t1.get().*f when N == 1 and f is a pointer to data member of a class T and
-// remove_cvref_t<decltype(t1)> is a specialization of reference_wrapper;
-struct DataMemAndRefWrap : StrippedAccept<DataMemAndRefWrap> {
- template <typename... Args>
- struct AcceptImpl : std::false_type {};
-
- template <typename R, typename C, typename RefWrap>
- struct AcceptImpl<R C::*, RefWrap>
- : std::integral_constant<
- bool, IsReferenceWrapper<RemoveCvrefT<RefWrap>>::value &&
- !absl::is_function<R>::value> {};
-
- template <typename DataMem, typename RefWrap>
- static decltype(std::declval<RefWrap>().get().*std::declval<DataMem>())
- Invoke(DataMem&& data_mem, RefWrap&& ref_wrap) {
- return std::forward<RefWrap>(ref_wrap).get().*
- std::forward<DataMem>(data_mem);
- }
-};
-
-// (*t1).*f when N == 1 and f is a pointer to data member of a class T and t1
-// does not satisfy the previous two items;
+// (*t1).*f when N == 1 and f is a pointer to member data of a class T and t1
+// is not one of the types described in the previous item.
struct DataMemAndPtr : StrippedAccept<DataMemAndPtr> {
template <typename... Args>
struct AcceptImpl : std::false_type {};
template <typename R, typename C, typename Ptr>
struct AcceptImpl<R C::*, Ptr>
- : std::integral_constant<
- bool, !std::is_base_of<
- C, typename std::remove_reference<Ptr>::type>::value &&
- !IsReferenceWrapper<RemoveCvrefT<Ptr>>::value &&
- !absl::is_function<R>::value> {};
+ : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value &&
+ !absl::is_function<R>::value> {};
template <typename DataMem, typename Ptr>
static decltype((*std::declval<Ptr>()).*std::declval<DataMem>()) Invoke(
@@ -221,18 +160,12 @@ struct Invoker {
typedef typename std::conditional<
MemFunAndRef::Accept<Args...>::value, MemFunAndRef,
typename std::conditional<
- MemFunAndRefWrap::Accept<Args...>::value, MemFunAndRefWrap,
+ MemFunAndPtr::Accept<Args...>::value, MemFunAndPtr,
typename std::conditional<
- MemFunAndPtr::Accept<Args...>::value, MemFunAndPtr,
- typename std::conditional<
- DataMemAndRef::Accept<Args...>::value, DataMemAndRef,
- typename std::conditional<
- DataMemAndRefWrap::Accept<Args...>::value,
- DataMemAndRefWrap,
- typename std::conditional<
- DataMemAndPtr::Accept<Args...>::value, DataMemAndPtr,
- Callable>::type>::type>::type>::type>::type>::type
- type;
+ DataMemAndRef::Accept<Args...>::value, DataMemAndRef,
+ typename std::conditional<DataMemAndPtr::Accept<Args...>::value,
+ DataMemAndPtr, Callable>::type>::type>::
+ type>::type type;
};
// The result type of Invoke<F, Args...>.
diff --git a/absl/base/invoke_test.cc b/absl/base/invoke_test.cc
index 994d36b9..6aa613c9 100644
--- a/absl/base/invoke_test.cc
+++ b/absl/base/invoke_test.cc
@@ -158,56 +158,31 @@ TEST(InvokeTest, MemberFunction) {
std::unique_ptr<const Class> cp(new Class);
std::unique_ptr<volatile Class> vp(new Class);
- Class c;
- std::reference_wrapper<Class> ref(c);
- std::reference_wrapper<const Class> ref_const(c);
- const std::reference_wrapper<Class> const_ref(c);
- std::reference_wrapper<volatile Class> ref_volatile(c);
-
EXPECT_EQ(1, Invoke(&Class::Method, p, 3, 2));
EXPECT_EQ(1, Invoke(&Class::Method, p.get(), 3, 2));
EXPECT_EQ(1, Invoke(&Class::Method, *p, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::Method, ref, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::Method, const_ref, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::Method, std::move(ref), 3, 2));
EXPECT_EQ(1, Invoke(&Class::RefMethod, p, 3, 2));
EXPECT_EQ(1, Invoke(&Class::RefMethod, p.get(), 3, 2));
EXPECT_EQ(1, Invoke(&Class::RefMethod, *p, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::RefMethod, ref, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::RefMethod, const_ref, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::RefMethod, std::move(ref), 3, 2));
EXPECT_EQ(1, Invoke(&Class::RefRefMethod, std::move(*p), 3, 2)); // NOLINT
EXPECT_EQ(1, Invoke(&Class::NoExceptMethod, p, 3, 2));
EXPECT_EQ(1, Invoke(&Class::NoExceptMethod, p.get(), 3, 2));
EXPECT_EQ(1, Invoke(&Class::NoExceptMethod, *p, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::NoExceptMethod, ref, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::NoExceptMethod, const_ref, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::NoExceptMethod, std::move(ref), 3, 2));
EXPECT_EQ(1, Invoke(&Class::ConstMethod, p, 3, 2));
EXPECT_EQ(1, Invoke(&Class::ConstMethod, p.get(), 3, 2));
EXPECT_EQ(1, Invoke(&Class::ConstMethod, *p, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::ConstMethod, ref, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::ConstMethod, const_ref, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::ConstMethod, std::move(ref), 3, 2));
EXPECT_EQ(1, Invoke(&Class::ConstMethod, cp, 3, 2));
EXPECT_EQ(1, Invoke(&Class::ConstMethod, cp.get(), 3, 2));
EXPECT_EQ(1, Invoke(&Class::ConstMethod, *cp, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::ConstMethod, ref_const, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::ConstMethod, std::move(ref_const), 3, 2));
EXPECT_EQ(1, Invoke(&Class::VolatileMethod, p, 3, 2));
EXPECT_EQ(1, Invoke(&Class::VolatileMethod, p.get(), 3, 2));
EXPECT_EQ(1, Invoke(&Class::VolatileMethod, *p, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::VolatileMethod, ref, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::VolatileMethod, const_ref, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::VolatileMethod, std::move(ref), 3, 2));
EXPECT_EQ(1, Invoke(&Class::VolatileMethod, vp, 3, 2));
EXPECT_EQ(1, Invoke(&Class::VolatileMethod, vp.get(), 3, 2));
EXPECT_EQ(1, Invoke(&Class::VolatileMethod, *vp, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::VolatileMethod, ref_volatile, 3, 2));
- EXPECT_EQ(1, Invoke(&Class::VolatileMethod, std::move(ref_volatile), 3, 2));
EXPECT_EQ(1, Invoke(&Class::Method, make_unique<Class>(), 3, 2));
EXPECT_EQ(1, Invoke(&Class::ConstMethod, make_unique<Class>(), 3, 2));
@@ -217,15 +192,8 @@ TEST(InvokeTest, MemberFunction) {
TEST(InvokeTest, DataMember) {
std::unique_ptr<Class> p(new Class{42});
std::unique_ptr<const Class> cp(new Class{42});
- Class c{42};
- std::reference_wrapper<Class> ref(c);
- std::reference_wrapper<const Class> ref_const(c);
- const std::reference_wrapper<Class> const_ref(c);
EXPECT_EQ(42, Invoke(&Class::member, p));
EXPECT_EQ(42, Invoke(&Class::member, *p));
- EXPECT_EQ(42, Invoke(&Class::member, ref));
- EXPECT_EQ(42, Invoke(&Class::member, const_ref));
- EXPECT_EQ(42, Invoke(&Class::member, std::move(ref)));
EXPECT_EQ(42, Invoke(&Class::member, p.get()));
Invoke(&Class::member, p) = 42;
@@ -233,8 +201,6 @@ TEST(InvokeTest, DataMember) {
EXPECT_EQ(42, Invoke(&Class::member, cp));
EXPECT_EQ(42, Invoke(&Class::member, *cp));
- EXPECT_EQ(42, Invoke(&Class::member, ref_const));
- EXPECT_EQ(42, Invoke(&Class::member, std::move(ref_const)));
EXPECT_EQ(42, Invoke(&Class::member, cp.get()));
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 16:19:38 +0000