return trait specializations

This commit is contained in:
BlackMATov
2023-12-30 17:51:55 +07:00
parent 0467d385be
commit 29fa7cccfc
8 changed files with 160 additions and 86 deletions

View File

@@ -10,7 +10,6 @@
#include <array>
#include <cassert>
#include <compare>
#include <concepts>
#include <cstddef>
#include <cstdint>
#include <cstdlib>
@@ -161,17 +160,6 @@
#define META_HPP_DETAIL_IGNORE_OVERRIDE_WARNINGS_POP() META_HPP_DETAIL_CLANG_IGNORE_WARNINGS_POP()
//
//
//
#define META_HPP_DETAIL_IGNORE_SIGN_CONVERSION_WARNINGS_PUSH() \
META_HPP_DETAIL_CLANG_IGNORE_WARNINGS_PUSH() \
META_HPP_DETAIL_CLANG_IGNORE_WARNING("-Wunknown-warning-option") \
META_HPP_DETAIL_CLANG_IGNORE_WARNING("-Wsign-conversion")
#define META_HPP_DETAIL_IGNORE_SIGN_CONVERSION_WARNINGS_POP() META_HPP_DETAIL_CLANG_IGNORE_WARNINGS_POP()
namespace meta_hpp::detail
{
template < typename Enum >
@@ -4016,9 +4004,7 @@ namespace meta_hpp::detail
template < typename T >
concept poly_info_enabled //
= requires(type_registry& r, const T& v) {
{ v.meta_poly_info(r) } -> std::convertible_to<poly_info>;
};
= requires(type_registry& r, const T& v) { v.meta_poly_info(r); };
template < poly_info_enabled T >
poly_info get_meta_poly_info(type_registry& r, const T& v) {
@@ -8994,9 +8980,7 @@ namespace meta_hpp::detail
template < typename T >
concept has_copy_traits //
= requires(const T& v) {
{ copy_traits<T>{}(v) } -> std::convertible_to<uvalue>;
};
= requires(const T& v) { copy_traits<T>{}(v); };
}
namespace meta_hpp::detail
@@ -9017,21 +9001,32 @@ namespace meta_hpp::detail
template < typename T >
concept has_deref_traits //
= requires(const T& v) {
{ deref_traits<T>{}(v) } -> std::convertible_to<uvalue>;
};
= requires(const T& v) { deref_traits<T>{}(v); };
}
namespace meta_hpp::detail
{
template < typename T >
requires requires(const T& v) {
sizeof(*v);
uvalue{*v};
requires std::is_copy_constructible_v<T>
struct deref_traits<T*> {
uvalue operator()(T* v) const {
return v != nullptr ? uvalue{*v} : uvalue{};
}
struct deref_traits<T> {
uvalue operator()(const T& v) const {
return uvalue{*v};
};
template < typename T >
requires std::is_copy_constructible_v<T>
struct deref_traits<std::shared_ptr<T>> {
uvalue operator()(const std::shared_ptr<T>& v) const {
return v != nullptr ? uvalue{*v} : uvalue{};
}
};
template < typename T, typename Deleter >
requires std::is_copy_constructible_v<T>
struct deref_traits<std::unique_ptr<T, Deleter>> {
uvalue operator()(const std::unique_ptr<T, Deleter>& v) const {
return v != nullptr ? uvalue{*v} : uvalue{};
}
};
}
@@ -9043,27 +9038,59 @@ namespace meta_hpp::detail
template < typename T >
concept has_index_traits //
= requires(const T& v, std::size_t i) {
{ index_traits<T>{}(v, i) } -> std::convertible_to<uvalue>;
};
= requires(const T& v, std::size_t i) { index_traits<T>{}(v, i); };
}
namespace meta_hpp::detail
{
META_HPP_DETAIL_IGNORE_SIGN_CONVERSION_WARNINGS_PUSH()
template < typename T >
requires requires(const T& v, std::size_t i) {
sizeof(v[i]);
uvalue{v[i]};
}
struct index_traits<T> {
uvalue operator()(const T& v, std::size_t i) const {
return uvalue{v[i]};
requires std::is_copy_constructible_v<T>
struct index_traits<T*> {
uvalue operator()(T* v, std::size_t i) const {
// NOLINTNEXTLINE(*-pointer-arithmetic)
return v != nullptr ? uvalue{v[i]} : uvalue{};
}
};
META_HPP_DETAIL_IGNORE_SIGN_CONVERSION_WARNINGS_POP()
template < typename T, std::size_t Size >
requires std::is_copy_constructible_v<T>
struct index_traits<std::array<T, Size>> {
uvalue operator()(const std::array<T, Size>& v, std::size_t i) const {
return i < v.size() ? uvalue{v[i]} : uvalue{};
}
};
template < typename T, typename Traits, typename Allocator >
requires std::is_copy_constructible_v<T>
struct index_traits<std::basic_string<T, Traits, Allocator>> {
uvalue operator()(const std::basic_string<T, Traits, Allocator>& v, std::size_t i) const {
return i < v.size() ? uvalue{v[i]} : uvalue{};
}
};
template < typename T, typename Traits >
requires std::is_copy_constructible_v<T>
struct index_traits<std::basic_string_view<T, Traits>> {
uvalue operator()(const std::basic_string_view<T, Traits>& v, std::size_t i) const {
return i < v.size() ? uvalue{v[i]} : uvalue{};
}
};
template < typename T, std::size_t Extent >
requires std::is_copy_constructible_v<T>
struct index_traits<std::span<T, Extent>> {
uvalue operator()(const std::span<T, Extent>& v, std::size_t i) const {
return i < v.size() ? uvalue{v[i]} : uvalue{};
}
};
template < typename T, typename Allocator >
requires std::is_copy_constructible_v<T>
struct index_traits<std::vector<T, Allocator>> {
uvalue operator()(const std::vector<T, Allocator>& v, std::size_t i) const {
return i < v.size() ? uvalue{v[i]} : uvalue{};
}
};
}
namespace meta_hpp::detail
@@ -9073,9 +9100,7 @@ namespace meta_hpp::detail
template < typename T >
concept has_unmap_traits //
= requires(const T& v) {
{ unmap_traits<T>{}(v) } -> std::convertible_to<uvalue>;
};
= requires(const T& v) { unmap_traits<T>{}(v); };
}
namespace meta_hpp::detail

View File

@@ -584,6 +584,9 @@ TEST_CASE("meta/meta_utilities/value") {
CHECK(meta::uvalue{p1}.has_deref_op());
CHECK(meta::uvalue{p2}.has_deref_op());
CHECK_FALSE(*meta::uvalue{p1});
CHECK_FALSE(*meta::uvalue{p2});
}
{
ivec2 v{1,2};
@@ -607,6 +610,10 @@ TEST_CASE("meta/meta_utilities/value") {
meta::uvalue v{std::make_shared<int>(42)};
CHECK((*v).as<int>() == 42);
}
{
meta::uvalue v{std::make_unique<int>(42)};
CHECK((*v).as<int>() == 42);
}
}
}
@@ -654,6 +661,7 @@ TEST_CASE("meta/meta_utilities/value/arrays") {
meta::uvalue v{arr};
CHECK(v.get_type() == meta::resolve_type<int*>());
CHECK(v.has_index_op());
CHECK_FALSE(v[0]);
}
}
@@ -673,6 +681,7 @@ TEST_CASE("meta/meta_utilities/value/arrays") {
meta::uvalue v{arr};
CHECK(v.get_type() == meta::resolve_type<const int*>());
CHECK(v.has_index_op());
CHECK_FALSE(v[0]);
}
}
@@ -684,6 +693,7 @@ TEST_CASE("meta/meta_utilities/value/arrays") {
CHECK(v[0].as<int>() == 1);
CHECK(v[1].as<int>() == 2);
CHECK(v[2].as<int>() == 3);
CHECK_FALSE(v[3]);
}
SUBCASE("std::string") {
@@ -694,6 +704,18 @@ TEST_CASE("meta/meta_utilities/value/arrays") {
CHECK(v[0].as<char>() == 'h');
CHECK(v[1].as<char>() == 'i');
CHECK(v[2].as<char>() == '!');
CHECK_FALSE(v[3]);
}
SUBCASE("std::string_view") {
meta::uvalue v{std::string_view{"hi!"}};
CHECK(v.get_type() == meta::resolve_type<std::string_view>());
CHECK(v.has_index_op());
CHECK(v[0].as<char>() == 'h');
CHECK(v[1].as<char>() == 'i');
CHECK(v[2].as<char>() == '!');
CHECK_FALSE(v[3]);
}
SUBCASE("std::span") {
@@ -705,6 +727,7 @@ TEST_CASE("meta/meta_utilities/value/arrays") {
CHECK(v[0].as<int>() == 1);
CHECK(v[1].as<int>() == 2);
CHECK(v[2].as<int>() == 3);
CHECK_FALSE(v[3]);
}
SUBCASE("std::vector") {
@@ -715,6 +738,7 @@ TEST_CASE("meta/meta_utilities/value/arrays") {
CHECK(v[0].as<int>() == 1);
CHECK(v[1].as<int>() == 2);
CHECK(v[2].as<int>() == 3);
CHECK_FALSE(v[3]);
}
}

View File

@@ -15,7 +15,6 @@
#include <algorithm>
#include <array>
#include <compare>
#include <concepts>
#include <exception>
#include <functional>
#include <initializer_list>
@@ -161,14 +160,3 @@
META_HPP_DETAIL_CLANG_IGNORE_WARNING("-Wsuggest-override")
#define META_HPP_DETAIL_IGNORE_OVERRIDE_WARNINGS_POP() META_HPP_DETAIL_CLANG_IGNORE_WARNINGS_POP()
//
//
//
#define META_HPP_DETAIL_IGNORE_SIGN_CONVERSION_WARNINGS_PUSH() \
META_HPP_DETAIL_CLANG_IGNORE_WARNINGS_PUSH() \
META_HPP_DETAIL_CLANG_IGNORE_WARNING("-Wunknown-warning-option") \
META_HPP_DETAIL_CLANG_IGNORE_WARNING("-Wsign-conversion")
#define META_HPP_DETAIL_IGNORE_SIGN_CONVERSION_WARNINGS_POP() META_HPP_DETAIL_CLANG_IGNORE_WARNINGS_POP()

View File

@@ -27,9 +27,7 @@ namespace meta_hpp::detail
template < typename T >
concept poly_info_enabled //
= requires(type_registry& r, const T& v) {
{ v.meta_poly_info(r) } -> std::convertible_to<poly_info>;
};
= requires(type_registry& r, const T& v) { v.meta_poly_info(r); };
template < poly_info_enabled T >
poly_info get_meta_poly_info(type_registry& r, const T& v) {

View File

@@ -16,9 +16,7 @@ namespace meta_hpp::detail
template < typename T >
concept has_copy_traits //
= requires(const T& v) {
{ copy_traits<T>{}(v) } -> std::convertible_to<uvalue>;
};
= requires(const T& v) { copy_traits<T>{}(v); };
}
namespace meta_hpp::detail

View File

@@ -16,21 +16,32 @@ namespace meta_hpp::detail
template < typename T >
concept has_deref_traits //
= requires(const T& v) {
{ deref_traits<T>{}(v) } -> std::convertible_to<uvalue>;
};
= requires(const T& v) { deref_traits<T>{}(v); };
}
namespace meta_hpp::detail
{
template < typename T >
requires requires(const T& v) {
sizeof(*v);
uvalue{*v};
requires std::is_copy_constructible_v<T>
struct deref_traits<T*> {
uvalue operator()(T* v) const {
return v != nullptr ? uvalue{*v} : uvalue{};
}
struct deref_traits<T> {
uvalue operator()(const T& v) const {
return uvalue{*v};
};
template < typename T >
requires std::is_copy_constructible_v<T>
struct deref_traits<std::shared_ptr<T>> {
uvalue operator()(const std::shared_ptr<T>& v) const {
return v != nullptr ? uvalue{*v} : uvalue{};
}
};
template < typename T, typename Deleter >
requires std::is_copy_constructible_v<T>
struct deref_traits<std::unique_ptr<T, Deleter>> {
uvalue operator()(const std::unique_ptr<T, Deleter>& v) const {
return v != nullptr ? uvalue{*v} : uvalue{};
}
};
}

View File

@@ -16,25 +16,57 @@ namespace meta_hpp::detail
template < typename T >
concept has_index_traits //
= requires(const T& v, std::size_t i) {
{ index_traits<T>{}(v, i) } -> std::convertible_to<uvalue>;
};
= requires(const T& v, std::size_t i) { index_traits<T>{}(v, i); };
}
namespace meta_hpp::detail
{
META_HPP_DETAIL_IGNORE_SIGN_CONVERSION_WARNINGS_PUSH()
template < typename T >
requires requires(const T& v, std::size_t i) {
sizeof(v[i]);
uvalue{v[i]};
}
struct index_traits<T> {
uvalue operator()(const T& v, std::size_t i) const {
return uvalue{v[i]};
requires std::is_copy_constructible_v<T>
struct index_traits<T*> {
uvalue operator()(T* v, std::size_t i) const {
// NOLINTNEXTLINE(*-pointer-arithmetic)
return v != nullptr ? uvalue{v[i]} : uvalue{};
}
};
META_HPP_DETAIL_IGNORE_SIGN_CONVERSION_WARNINGS_POP()
template < typename T, std::size_t Size >
requires std::is_copy_constructible_v<T>
struct index_traits<std::array<T, Size>> {
uvalue operator()(const std::array<T, Size>& v, std::size_t i) const {
return i < v.size() ? uvalue{v[i]} : uvalue{};
}
};
template < typename T, typename Traits, typename Allocator >
requires std::is_copy_constructible_v<T>
struct index_traits<std::basic_string<T, Traits, Allocator>> {
uvalue operator()(const std::basic_string<T, Traits, Allocator>& v, std::size_t i) const {
return i < v.size() ? uvalue{v[i]} : uvalue{};
}
};
template < typename T, typename Traits >
requires std::is_copy_constructible_v<T>
struct index_traits<std::basic_string_view<T, Traits>> {
uvalue operator()(const std::basic_string_view<T, Traits>& v, std::size_t i) const {
return i < v.size() ? uvalue{v[i]} : uvalue{};
}
};
template < typename T, std::size_t Extent >
requires std::is_copy_constructible_v<T>
struct index_traits<std::span<T, Extent>> {
uvalue operator()(const std::span<T, Extent>& v, std::size_t i) const {
return i < v.size() ? uvalue{v[i]} : uvalue{};
}
};
template < typename T, typename Allocator >
requires std::is_copy_constructible_v<T>
struct index_traits<std::vector<T, Allocator>> {
uvalue operator()(const std::vector<T, Allocator>& v, std::size_t i) const {
return i < v.size() ? uvalue{v[i]} : uvalue{};
}
};
}

View File

@@ -16,9 +16,7 @@ namespace meta_hpp::detail
template < typename T >
concept has_unmap_traits //
= requires(const T& v) {
{ unmap_traits<T>{}(v) } -> std::convertible_to<uvalue>;
};
= requires(const T& v) { unmap_traits<T>{}(v); };
}
namespace meta_hpp::detail