Skip to content

P0896R4_P1614R2_comparisons/test.cpp: Increase test coverage for MSVC #852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephanTLavavej merged 7 commits into from
Jun 24, 2020
Merged

P0896R4_P1614R2_comparisons/test.cpp: Increase test coverage for MSVC #852

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
086a78a
Partially address GH-741
SuperWig May 21, 2020
3966538
Update transition comments
SuperWig May 22, 2020
d9ba12c
Change template to macro
SuperWig May 22, 2020
fe4ab77
Missing )
SuperWig May 22, 2020
c7b9980
VSO-1070391 is also fixed
CaseyCarter May 24, 2020
7cdff82
Merge branch 'master' into ranges-spaceship
StephanTLavavej Jun 20, 2020
4960f92
Refine assert_three_way macro.
StephanTLavavej Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 11 additions & 20 deletions tests/std/tests/P0896R4_P1614R2_comparisons/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,13 @@ constexpr bool test_compare_three_way() {

enum class some_enum { value };

#if defined(__clang__) || defined(__EDG__) // TRANSITION, VSO-905257
STATIC_ASSERT(test_compare_three_way<int, int, strong_ordering>());
STATIC_ASSERT(test_compare_three_way<int, long, strong_ordering>());
STATIC_ASSERT(test_compare_three_way<float, float, partial_ordering>());
STATIC_ASSERT(test_compare_three_way<float, double, partial_ordering>());
#if defined(__clang__) || defined(__EDG__) // TRANSITION, DevCom-1044530
STATIC_ASSERT(test_compare_three_way<long, double, partial_ordering>());
#endif // TRANSITION, DevCom-1044530
STATIC_ASSERT(test_compare_three_way<bool, int, void>());

STATIC_ASSERT(test_compare_three_way<some_enum, some_enum, strong_ordering>());
Expand All @@ -270,7 +271,6 @@ STATIC_ASSERT(test_compare_three_way<int*, void*, strong_ordering>());

STATIC_ASSERT(test_compare_three_way<int (*)(), int (*)(), void>());
STATIC_ASSERT(test_compare_three_way<int (*)(), void (*)(), void>());
#endif // TRANSITION, VSO-905257

template <class Cat>
struct compares_as {};
Expand All @@ -293,19 +293,7 @@ STATIC_ASSERT(test_compare_three_way<compares_as<strong_ordering>, compares_as<s

// Validate dynamic properties of compare_three_way, ranges::equal_to, ranges::not_equal_to, ranges::less,
// ranges::less_equal, ranges::greater, ranges::greater_equal
template <class T, class U, class R>
constexpr void assert_three_way(T const& t, U const& u, R const result) { // TRANSITION, VSO-905257
#if !defined(__clang__) && !defined(__EDG__)
// <=> expressions that resolve to builtin operators are incorrectly lvalues of const-qualified type on MSVC, so
// they are rejected by std::three_way_comparable and std::three_way_comparable_with.
if constexpr (!std::is_class_v<std::remove_cvref_t<T>> && !std::is_class_v<std::remove_cvref_t<U>>) {
return;
} else
#endif // !defined(__clang__) && !defined(__EDG__)
{
assert(compare_three_way{}(t, u) == result);
}
}
#define assert_three_way(t, u, result) assert(compare_three_way{}((t), (u)) == (result))

template <class T, class U>
constexpr void test_equality_comparable(T const& t, U const& u, strong_ordering const o) {
Expand Down Expand Up @@ -465,9 +453,14 @@ constexpr void ordering_test_cases() {
test_partially_ordered(1.414f, 3.14, partial_ordering::less);
test_partially_ordered(1.414, 3.14f, partial_ordering::less);
test_partially_ordered(31.625f, 31.625, partial_ordering::equivalent);
test_partially_ordered(3.14, NaN, partial_ordering::unordered);
test_partially_ordered(3.14f, NaN, partial_ordering::unordered);
test_partially_ordered(3.14, NaNf, partial_ordering::unordered);
#if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-1062601
if (!std::is_constant_evaluated())
#endif // TRANSITION, VSO-1062601
{
test_partially_ordered(3.14, NaN, partial_ordering::unordered);
test_partially_ordered(3.14f, NaN, partial_ordering::unordered);
test_partially_ordered(3.14, NaNf, partial_ordering::unordered);
}

// Validate types with no builtin <=> operators that are nonetheless totally_ordered (within a
// limited domain) or equality_comparable
Expand Down Expand Up @@ -499,9 +492,7 @@ constexpr void ordering_test_cases() {
}
};
test_equality_comparable(&has_members::x, &has_members::y, strong_ordering::less); // Ditto "not equal"
#if defined(__clang__) || defined(__EDG__) // TRANSITION, VSO-1070391
test_equality_comparable(&has_members::f, &has_members::g, strong_ordering::less); // Ditto "not equal"
#endif // TRANSITION, VSO-1070391

test_equality_comparable(nullptr, nullptr, strong_ordering::equal);

Expand Down