Skip to content
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

Jump to bottom

[libc++][chrono] Adds year_month_day_last&::operator<=>. #98169

Merged
merged 1 commit into from
Jul 16, 2024
Merged

[libc++][chrono] Adds year_month_day_last&::operator<=>. #98169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 5 additions & 27 deletions libcxx/include/__chrono/year_month_day.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,33 +239,11 @@ operator==(const year_month_day_last& __lhs, const year_month_day_last& __rhs) n
return __lhs.year() == __rhs.year() && __lhs.month_day_last() == __rhs.month_day_last();
}

_LIBCPP_HIDE_FROM_ABI inline constexpr bool
operator!=(const year_month_day_last& __lhs, const year_month_day_last& __rhs) noexcept {
return !(__lhs == __rhs);
}

_LIBCPP_HIDE_FROM_ABI inline constexpr bool
operator<(const year_month_day_last& __lhs, const year_month_day_last& __rhs) noexcept {
if (__lhs.year() < __rhs.year())
return true;
if (__lhs.year() > __rhs.year())
return false;
return __lhs.month_day_last() < __rhs.month_day_last();
}

_LIBCPP_HIDE_FROM_ABI inline constexpr bool
operator>(const year_month_day_last& __lhs, const year_month_day_last& __rhs) noexcept {
return __rhs < __lhs;
}

_LIBCPP_HIDE_FROM_ABI inline constexpr bool
operator<=(const year_month_day_last& __lhs, const year_month_day_last& __rhs) noexcept {
return !(__rhs < __lhs);
}

_LIBCPP_HIDE_FROM_ABI inline constexpr bool
operator>=(const year_month_day_last& __lhs, const year_month_day_last& __rhs) noexcept {
return !(__lhs < __rhs);
_LIBCPP_HIDE_FROM_ABI inline constexpr strong_ordering
operator<=>(const year_month_day_last& __lhs, const year_month_day_last& __rhs) noexcept {
if (auto __c = __lhs.year() <=> __rhs.year(); __c != 0)
return __c;
return __lhs.month_day_last() <=> __rhs.month_day_last();
}

_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last operator/(const year_month& __lhs, last_spec) noexcept {
Expand Down
1 change: 0 additions & 1 deletion libcxx/modules/std/chrono.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export namespace std {

// [time.duration.comparisons], duration comparisons
using std::chrono::operator==;
using std::chrono::operator!=;
using std::chrono::operator<;
using std::chrono::operator>;
using std::chrono::operator<=;
Expand Down
127 changes: 60 additions & 67 deletions .../test/std/time/time.cal/time.cal.ymdlast/time.cal.ymdlast.nonmembers/comparisons.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,14 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03, c++11, c++14, c++17

// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17

// <chrono>
// class year_month_day_last;

// constexpr bool operator==(const year_month_day_last& x, const year_month_day_last& y) noexcept;
// Returns: x.year() == y.year() && x.month_day_last() == y.month_day_last().
//
// constexpr bool operator< (const year_month_day_last& x, const year_month_day_last& y) noexcept;
// Returns:
// If x.year() < y.year(), returns true.
// Otherwise, if x.year() > y.year(), returns false.
// Otherwise, returns x.month_day_last() < y.month_day_last()
// constexpr bool operator<=>(const year_month_day_last& x, const year_month_day_last& y) noexcept;

#include <chrono>
#include <type_traits>
Expand All @@ -26,63 +21,61 @@
#include "test_macros.h"
#include "test_comparisons.h"

int main(int, char**)
{
using year = std::chrono::year;
using month = std::chrono::month;
using month_day_last = std::chrono::month_day_last;
using year_month_day_last = std::chrono::year_month_day_last;

AssertComparisonsAreNoexcept<year_month_day_last>();
AssertComparisonsReturnBool<year_month_day_last>();

constexpr month January = std::chrono::January;
constexpr month February = std::chrono::February;

static_assert( testComparisons(
year_month_day_last{year{1234}, month_day_last{January}},
year_month_day_last{year{1234}, month_day_last{January}},
true, false), "");

// different month
static_assert( testComparisons(
year_month_day_last{year{1234}, month_day_last{January}},
year_month_day_last{year{1234}, month_day_last{February}},
false, true), "");

// different year
static_assert( testComparisons(
year_month_day_last{year{1234}, month_day_last{January}},
year_month_day_last{year{1235}, month_day_last{January}},
false, true), "");

// different month
static_assert( testComparisons(
year_month_day_last{year{1234}, month_day_last{January}},
year_month_day_last{year{1234}, month_day_last{February}},
false, true), "");

// different year and month
static_assert( testComparisons(
year_month_day_last{year{1234}, month_day_last{February}},
year_month_day_last{year{1235}, month_day_last{January}},
false, true), "");

// same year, different months
for (unsigned i = 1; i < 12; ++i)
for (unsigned j = 1; j < 12; ++j)
assert((testComparisons(
year_month_day_last{year{1234}, month_day_last{month{i}}},
year_month_day_last{year{1234}, month_day_last{month{j}}},
i == j, i < j )));

// same month, different years
for (int i = 1000; i < 2000; ++i)
for (int j = 1000; j < 2000; ++j)
assert((testComparisons(
year_month_day_last{year{i}, month_day_last{January}},
year_month_day_last{year{j}, month_day_last{January}},
i == j, i < j )));

return 0;
constexpr bool test() {
using year = std::chrono::year;
using month = std::chrono::month;
using month_day_last = std::chrono::month_day_last;
using year_month_day_last = std::chrono::year_month_day_last;

constexpr month January = std::chrono::January;
constexpr month February = std::chrono::February;

assert(testOrder(year_month_day_last{year{1234}, month_day_last{January}},
year_month_day_last{year{1234}, month_day_last{January}},
std::strong_ordering::equal));

// different month
assert(testOrder(year_month_day_last{year{1234}, month_day_last{January}},
year_month_day_last{year{1234}, month_day_last{February}},
std::strong_ordering::less));

// different year
assert(testOrder(year_month_day_last{year{1234}, month_day_last{January}},
year_month_day_last{year{1235}, month_day_last{January}},
std::strong_ordering::less));

// different year and month
assert(testOrder(year_month_day_last{year{1234}, month_day_last{February}},
year_month_day_last{year{1235}, month_day_last{January}},
std::strong_ordering::less));

// same year, different months
for (unsigned i = 1; i < 12; ++i)
for (unsigned j = 1; j < 12; ++j)
assert((testOrder(year_month_day_last{year{1234}, month_day_last{month{i}}},
year_month_day_last{year{1234}, month_day_last{month{j}}},
i == j ? std::strong_ordering::equal
: i < j ? std::strong_ordering::less
: std::strong_ordering::greater)));

// same month, different years
for (int i = 1000; i < 20; ++i)
for (int j = 1000; j < 20; ++j)
assert((testOrder(year_month_day_last{year{i}, month_day_last{January}},
year_month_day_last{year{j}, month_day_last{January}},
i == j ? std::strong_ordering::equal
: i < j ? std::strong_ordering::less
: std::strong_ordering::greater)));
return true;
}

int main(int, char**) {
using year_month_day_last = std::chrono::year_month_day_last;
AssertOrderAreNoexcept<year_month_day_last>();
AssertOrderReturn<std::strong_ordering, year_month_day_last>();

test();
static_assert(test());

return 0;
}
Loading