return msvc 2017

This commit is contained in:
BlackMATov
2021-07-07 04:43:23 +07:00
parent f97cd9492e
commit ae0fb0285c
4 changed files with 39 additions and 126 deletions

View File

@@ -10,6 +10,8 @@ jobs:
matrix:
config:
# https://github.com/actions/virtual-environments/tree/main/images/win
- { os: "windows-2016", vs: "Visual Studio 2017", arch: "x86" }
- { os: "windows-2016", vs: "Visual Studio 2017", arch: "x64" }
- { os: "windows-2019", vs: "Visual Studio 2019", arch: "x86" }
- { os: "windows-2019", vs: "Visual Studio 2019", arch: "x64" }
name: "${{matrix.config.vs}} ${{matrix.config.arch}}"

View File

@@ -29,7 +29,7 @@
- [gcc](https://www.gnu.org/software/gcc/) **>= 7**
- [clang](https://clang.llvm.org/) **>= 7**
- [msvc](https://visualstudio.microsoft.com/) **>= 2019**
- [msvc](https://visualstudio.microsoft.com/) **>= 2017**
## Installation

View File

@@ -18,8 +18,7 @@ namespace meta_hpp::value_detail
struct traits {
void*(*data)(value&);
const void*(*cdata)(const value&);
bool(*equal)(const value&, const value&){};
bool(*not_equal)(const value&, const value&){};
bool(*equals)(const value&, const value&){};
};
template < typename T >
@@ -29,18 +28,14 @@ namespace meta_hpp::value_detail
const void* value_cdata(const value& v);
template < typename T >
bool value_equal(const value& l, const value& r);
template < typename T >
bool value_not_equal(const value& l, const value& r);
bool value_equals(const value& l, const value& r);
template < typename T >
const traits* get_traits() noexcept {
static traits traits{
&value_data<T>,
&value_cdata<T>,
&value_equal<T>,
&value_not_equal<T>,
&value_equals<T>,
};
return &traits;
}
@@ -136,46 +131,14 @@ namespace meta_hpp
template < typename T
, typename U = std::decay_t<T>
, typename = std::enable_if_t<!std::is_same_v<U, value>>
, typename = std::enable_if_t<std::is_invocable_v<std::equal_to<>, U, U>> >
friend bool operator==(const value& l, T&& r) {
return l.fid() == get_family_id<U>()
&& std::equal_to<>{}(*l.try_cast<U>(), std::forward<T>(r));
, typename = std::enable_if_t<!std::is_same_v<U, value>> >
bool equals(T&& other) const {
return fid() == get_family_id<U>()
&& std::equal_to<>{}(*try_cast<U>(), std::forward<T>(other));
}
template < typename T
, typename U = std::decay_t<T>
, typename = std::enable_if_t<!std::is_same_v<U, value>>
, typename = std::enable_if_t<std::is_invocable_v<std::equal_to<>, U, U>> >
friend bool operator==(T&& l, const value& r) {
return get_family_id<U>() == r.fid()
&& std::equal_to<>{}(std::forward<T>(l), *r.try_cast<U>());
}
template < typename T
, typename U = std::decay_t<T>
, typename = std::enable_if_t<!std::is_same_v<U, value>>
, typename = std::enable_if_t<std::is_invocable_v<std::equal_to<>, U, U>> >
friend bool operator!=(const value& l, T&& r) {
return l.fid() != get_family_id<U>()
|| std::not_equal_to<>{}(*l.try_cast<U>(), std::forward<T>(r));
}
template < typename T
, typename U = std::decay_t<T>
, typename = std::enable_if_t<!std::is_same_v<U, value>>
, typename = std::enable_if_t<std::is_invocable_v<std::equal_to<>, U, U>> >
friend bool operator!=(T&& l, const value& r) {
return get_family_id<U>() != r.fid()
|| std::not_equal_to<>{}(std::forward<T>(l), *r.try_cast<U>());
}
friend bool operator==(const value& l, const value& r) {
return l.traits_->equal(l, r);
}
friend bool operator!=(const value& l, const value& r) {
return l.traits_->not_equal(l, r);
bool equals(const value& other) const {
return traits_->equals(*this, other);
}
public:
bool to_bool() const { return cast<bool>(); }
@@ -225,14 +188,6 @@ namespace meta_hpp
const value_detail::traits* traits_{};
};
inline void* data(value& v) noexcept {
return v.data();
}
inline const void* data(const value& v) noexcept {
return v.data();
}
inline void swap(value& l, value& r) noexcept {
l.swap(r);
}
@@ -251,26 +206,14 @@ namespace meta_hpp::value_detail
}
template < typename T >
bool value_equal(const value& l, const value& r) {
bool value_equals(const value& l, const value& r) {
if ( l.fid() != r.fid() ) {
return false;
}
if constexpr ( std::is_invocable_v<std::equal_to<>, T, T> ) {
return std::equal_to<>{}(*l.try_cast<T>(), *(r.try_cast<T>()));
return std::equal_to<>{}(*l.try_cast<T>(), *r.try_cast<T>());
} else {
return std::addressof(l) == std::addressof(r);
}
}
template < typename T >
bool value_not_equal(const value& l, const value& r) {
if ( l.fid() != r.fid() ) {
return true;
}
if constexpr ( std::is_invocable_v<std::not_equal_to<>, T, T> ) {
return std::not_equal_to<>{}(*l.try_cast<T>(), *(r.try_cast<T>()));
} else {
return std::addressof(l) != std::addressof(r);
}
}
}

View File

@@ -106,86 +106,55 @@ TEST_CASE("meta/value/equal") {
using namespace std::string_literals;
{
CHECK(meta::value{1} == 1);
CHECK(meta::value{1} != 0);
CHECK(meta::value{1} != "hello"s);
CHECK_FALSE(meta::value{1} != 1);
CHECK_FALSE(meta::value{1} == 0);
CHECK_FALSE(meta::value{1} == "hello"s);
}
{
CHECK(1 == meta::value{1});
CHECK(0 != meta::value{1});
CHECK("hello"s != meta::value{1});
CHECK_FALSE(1 != meta::value{1});
CHECK_FALSE(0 == meta::value{1});
CHECK_FALSE("hello"s == meta::value{1});
CHECK(meta::value{1}.equals(1));
CHECK_FALSE(meta::value{1}.equals(0));
CHECK_FALSE(meta::value{1}.equals("hello"s));
}
{
int i = 1;
CHECK(meta::value{1} == i);
CHECK(meta::value{1} == std::as_const(i));
CHECK_FALSE(meta::value{1} != i);
CHECK_FALSE(meta::value{1} != std::as_const(i));
CHECK(i == meta::value{1});
CHECK(std::as_const(i) == meta::value{1});
CHECK_FALSE(i != meta::value{1});
CHECK_FALSE(std::as_const(i) != meta::value{1});
CHECK(meta::value{1}.equals(i));
CHECK(meta::value{1}.equals(std::as_const(i)));
CHECK_FALSE(meta::value{2}.equals(i));
CHECK_FALSE(meta::value{2}.equals(std::as_const(i)));
}
{
CHECK(meta::value{1} == meta::value{1});
CHECK(meta::value{1} != meta::value{0});
CHECK(meta::value{1} != meta::value{"hello"s});
CHECK_FALSE(meta::value{1} != meta::value{1});
CHECK_FALSE(meta::value{1} == meta::value{0});
CHECK_FALSE(meta::value{1} == meta::value{"hello"s});
CHECK(meta::value{1}.equals(meta::value{1}));
CHECK_FALSE(meta::value{1}.equals(meta::value{0}));
CHECK_FALSE(meta::value{1}.equals(meta::value{"hello"s}));
CHECK(meta::value{1} == meta::value{1});
CHECK(meta::value{0} != meta::value{1});
CHECK(meta::value{"hello"s} != meta::value{1});
CHECK_FALSE(meta::value{1} != meta::value{1});
CHECK_FALSE(meta::value{0} == meta::value{1});
CHECK_FALSE(meta::value{"hello"s} == meta::value{1});
CHECK(meta::value{1}.equals(meta::value{1}));
CHECK_FALSE(meta::value{0}.equals(meta::value{1}));
CHECK_FALSE(meta::value{"hello"s}.equals(meta::value{1}));
}
{
CHECK(meta::value{std::in_place_type<int>, 1} == meta::value{1});
CHECK(meta::value{1} == meta::value{std::in_place_type<int>, 1});
CHECK(meta::value{std::in_place_type<int>, 1}.equals(meta::value{1}));
CHECK(meta::value{1}.equals(meta::value{std::in_place_type<int>, 1}));
using vi = std::vector<int>;
CHECK(meta::value{std::in_place_type<vi>, {1,2,3}} == meta::value{vi{1,2,3}});
CHECK(meta::value{vi{1,2,3}} == meta::value{std::in_place_type<vi>, {1,2,3}});
CHECK_FALSE(meta::value{std::in_place_type<vi>, {1,2,3}} == meta::value{vi{1,2,4}});
CHECK_FALSE(meta::value{vi{1,2,4}} == meta::value{std::in_place_type<vi>, {1,2,3}});
CHECK(meta::value{std::in_place_type<vi>, {1,2,3}}.equals(meta::value{vi{1,2,3}}));
CHECK(meta::value{vi{1,2,3}}.equals(meta::value{std::in_place_type<vi>, {1,2,3}}));
CHECK_FALSE(meta::value{std::in_place_type<vi>, {1,2,3}}.equals(meta::value{vi{1,2,4}}));
CHECK_FALSE(meta::value{vi{1,2,4}}.equals(meta::value{std::in_place_type<vi>, {1,2,3}}));
}
{
meta::value v1{&func};
meta::value v2{&func};
CHECK(v1 == v1);
CHECK_FALSE(v1 != v1);
CHECK(v1 == v2);
CHECK_FALSE(v1 != v2);
CHECK(v1.equals(v1));
CHECK(v1.equals(v2));
}
{
meta::value v1{clazz{}};
meta::value v2{clazz{}};
CHECK(v1 == v1);
CHECK_FALSE(v1 != v1);
CHECK(v1 != v2);
CHECK_FALSE(v1 == v2);
CHECK(v1.equals(v1));
CHECK_FALSE(v1.equals(v2));
}
{
@@ -194,14 +163,13 @@ TEST_CASE("meta/value/equal") {
meta::value v1{&rv};
meta::value v2{&rv};
CHECK(v1 == v1);
CHECK_FALSE(v1 != v1);
CHECK(v1.equals(v1));
}
{
meta::value v1{"hello"s};
meta::value{1}.swap(v1);
CHECK(v1 == meta::value{1});
CHECK(v1.equals(meta::value{1}));
}
}