RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:57:45 +00:00
Code Issues Activity Actions

AK: Add and use the RemoveCVReference<T> type trait

Browse source
This commit is contained in:
Ali Mohammad Pur 2021-06-27 23:52:36 +04:30 • committed by Ali Mohammad Pur
parent c8270dbe2e
commit 745a1dbb5d
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AK/StdLibExtraDetails.h
View file

@ -195,6 +195,9 @@ struct __RemoveReference<T&&> {
template<typename T> template<typename T>
using RemoveReference = typename __RemoveReference<T>::Type; using RemoveReference = typename __RemoveReference<T>::Type;
template<typename T>
using RemoveCVReference = RemoveCV<RemoveReference<T>>;
template<typename T> template<typename T>
struct __MakeUnsigned { struct __MakeUnsigned {
using Type = void; using Type = void;
@ -478,6 +481,7 @@ using AK::Detail::MakeSigned;
using AK::Detail::MakeUnsigned; using AK::Detail::MakeUnsigned;
using AK::Detail::RemoveConst; using AK::Detail::RemoveConst;
using AK::Detail::RemoveCV; using AK::Detail::RemoveCV;
using AK::Detail::RemoveCVReference;
using AK::Detail::RemovePointer; using AK::Detail::RemovePointer;
using AK::Detail::RemoveReference; using AK::Detail::RemoveReference;
using AK::Detail::RemoveVolatile; using AK::Detail::RemoveVolatile;

8
AK/Variant.h
View file

@ -251,7 +251,7 @@ public:
using Detail::MergeAndDeduplicatePacks<Detail::VariantConstructors<Ts, Variant<Ts...>>...>::MergeAndDeduplicatePacks; using Detail::MergeAndDeduplicatePacks<Detail::VariantConstructors<Ts, Variant<Ts...>>...>::MergeAndDeduplicatePacks;
template<typename T, typename StrippedT = RemoveCV<RemoveReference<T>>> template<typename T, typename StrippedT = RemoveCVReference<T>>
void set(T&& t) requires(can_contain<StrippedT>()) void set(T&& t) requires(can_contain<StrippedT>())
{ {
constexpr auto new_index = index_of<StrippedT>(); constexpr auto new_index = index_of<StrippedT>();
@ -260,7 +260,7 @@ public:
m_index = new_index; m_index = new_index;
} }
template<typename T, typename StrippedT = RemoveCV<RemoveReference<T>>> template<typename T, typename StrippedT = RemoveCVReference<T>>
void set(T&& t, Detail::VariantNoClearTag) requires(can_contain<StrippedT>()) void set(T&& t, Detail::VariantNoClearTag) requires(can_contain<StrippedT>())
{ {
constexpr auto new_index = index_of<StrippedT>(); constexpr auto new_index = index_of<StrippedT>();
@ -323,7 +323,7 @@ public:
{ {
Variant<NewTs...> instance { Variant<NewTs...>::invalid_index, Detail::VariantConstructTag {} }; Variant<NewTs...> instance { Variant<NewTs...>::invalid_index, Detail::VariantConstructTag {} };
visit([&](auto& value) { visit([&](auto& value) {
if constexpr (Variant<NewTs...>::template can_contain<RemoveCV<RemoveReference<decltype(value)>>>()) if constexpr (Variant<NewTs...>::template can_contain<RemoveCVReference<decltype(value)>>())
instance.set(move(value), Detail::VariantNoClearTag {}); instance.set(move(value), Detail::VariantNoClearTag {});
}); });
VERIFY(instance.m_index != instance.invalid_index); VERIFY(instance.m_index != instance.invalid_index);
@ -335,7 +335,7 @@ public:
{ {
Variant<NewTs...> instance { Variant<NewTs...>::invalid_index, Detail::VariantConstructTag {} }; Variant<NewTs...> instance { Variant<NewTs...>::invalid_index, Detail::VariantConstructTag {} };
visit([&](const auto& value) { visit([&](const auto& value) {
if constexpr (Variant<NewTs...>::template can_contain<RemoveCV<RemoveReference<decltype(value)>>>()) if constexpr (Variant<NewTs...>::template can_contain<RemoveCVReference<decltype(value)>>())
instance.set(value, Detail::VariantNoClearTag {}); instance.set(value, Detail::VariantNoClearTag {});
}); });
VERIFY(instance.m_index != instance.invalid_index); VERIFY(instance.m_index != instance.invalid_index);

8
Tests/AK/TestTypeTraits.cpp
View file

@ -105,3 +105,11 @@ TEST_CASE(UnderlyingType)
STATIC_EXPECT_EQ(Type, u8); STATIC_EXPECT_EQ(Type, u8);
} }
TEST_CASE(RemoveCVReference)
{
using TestTypeList = TypeList<int, int&, int const&, int volatile&, int const volatile&, int&&, int const&&, int volatile&&, int const volatile&&>;
using ResultTypeList = TypeList<int, int, int, int, int, int, int, int, int>;
EXPECT_EQ_WITH_TRAIT(RemoveCVReference, TestTypeList, ResultTypeList);
}