[libcxx-commits] [libcxx] [libc++] LWG3260: year_month* arithmetic rejects durations convertible to years (PR #196384)
via libcxx-commits
libcxx-commits at lists.llvm.org
Sat May 9 07:12:13 PDT 2026
https://github.com/Skyfrei updated https://github.com/llvm/llvm-project/pull/196384
>From 703254776e26e70918d01110a7e2072d0af6f185 Mon Sep 17 00:00:00 2001
From: Skyfrei <tarkaklavio at gmail.com>
Date: Thu, 7 May 2026 19:58:40 +0200
Subject: [PATCH 1/8] operator overload for diffs
---
libcxx/include/__chrono/year_month_weekday.h | 28 +++++++++++------
libcxx/test/std/chrono/arithmetic.pass.cpp | 33 ++++++++++++++++++++
2 files changed, 51 insertions(+), 10 deletions(-)
create mode 100644 libcxx/test/std/chrono/arithmetic.pass.cpp
diff --git a/libcxx/include/__chrono/year_month_weekday.h b/libcxx/include/__chrono/year_month_weekday.h
index eff472ffcc8a8..6b90ec1d97818 100644
--- a/libcxx/include/__chrono/year_month_weekday.h
+++ b/libcxx/include/__chrono/year_month_weekday.h
@@ -49,7 +49,9 @@ class year_month_weekday {
: year_month_weekday(__from_days(__sysd.time_since_epoch())) {}
_LIBCPP_HIDE_FROM_ABI inline explicit constexpr year_month_weekday(const local_days& __locd) noexcept
: year_month_weekday(__from_days(__locd.time_since_epoch())) {}
+ template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator+=(const months&) noexcept;
+ template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator-=(const months&) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator+=(const years&) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator-=(const years&) noexcept;
@@ -125,17 +127,17 @@ operator/(const month_weekday& __lhs, int __rhs) noexcept {
return year(__rhs) / __lhs;
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
operator+(const year_month_weekday& __lhs, const months& __rhs) noexcept {
return (__lhs.year() / __lhs.month() + __rhs) / __lhs.weekday_indexed();
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
operator+(const months& __lhs, const year_month_weekday& __rhs) noexcept {
return __rhs + __lhs;
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
operator-(const year_month_weekday& __lhs, const months& __rhs) noexcept {
return __lhs + (-__rhs);
}
@@ -155,11 +157,13 @@ operator-(const year_month_weekday& __lhs, const years& __rhs) noexcept {
return __lhs + (-__rhs);
}
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday& year_month_weekday::operator+=(const months& __dm) noexcept {
+template<class>
+[[nodiscard]]_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday& year_month_weekday::operator+=(const months& __dm) noexcept {
*this = *this + __dm;
return *this;
}
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday& year_month_weekday::operator-=(const months& __dm) noexcept {
+template<class>
+[[nodiscard]]_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday& year_month_weekday::operator-=(const months& __dm) noexcept {
*this = *this - __dm;
return *this;
}
@@ -182,7 +186,9 @@ class year_month_weekday_last {
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last(
const chrono::year& __yval, const chrono::month& __mval, const chrono::weekday_last& __wdlval) noexcept
: __y_{__yval}, __m_{__mval}, __wdl_{__wdlval} {}
+ template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator+=(const months& __dm) noexcept;
+ template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator-=(const months& __dm) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator+=(const years& __dy) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator-=(const years& __dy) noexcept;
@@ -241,17 +247,17 @@ operator/(const month_weekday_last& __lhs, int __rhs) noexcept {
return year(__rhs) / __lhs;
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
operator+(const year_month_weekday_last& __lhs, const months& __rhs) noexcept {
return (__lhs.year() / __lhs.month() + __rhs) / __lhs.weekday_last();
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
operator+(const months& __lhs, const year_month_weekday_last& __rhs) noexcept {
return __rhs + __lhs;
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
operator-(const year_month_weekday_last& __lhs, const months& __rhs) noexcept {
return __lhs + (-__rhs);
}
@@ -271,12 +277,14 @@ operator-(const year_month_weekday_last& __lhs, const years& __rhs) noexcept {
return __lhs + (-__rhs);
}
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last&
+template<class>
+[[nodiscard]]_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last&
year_month_weekday_last::operator+=(const months& __dm) noexcept {
*this = *this + __dm;
return *this;
}
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last&
+template<class>
+[[nodiscard]]_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last&
year_month_weekday_last::operator-=(const months& __dm) noexcept {
*this = *this - __dm;
return *this;
diff --git a/libcxx/test/std/chrono/arithmetic.pass.cpp b/libcxx/test/std/chrono/arithmetic.pass.cpp
new file mode 100644
index 0000000000000..a8351f5b9c35c
--- /dev/null
+++ b/libcxx/test/std/chrono/arithmetic.pass.cpp
@@ -0,0 +1,33 @@
+#include <chrono>
+
+using namespace std::chrono;
+
+constexpr bool test_month() {
+ using decamonths = duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
+ auto ymd = 2001y/January/1d;
+ auto ymd2 = 2001y/January/1d;
+ ymd2 += std::chrono::duration_cast<std::chrono::months>(decamonths(1));
+ ymd += decamonths(1);
+
+
+ if (ymd2.month() != November)
+ return false;
+
+ return ymd == 2001y/November/1d;
+}
+
+constexpr bool test_year() {
+ using decades = duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
+ auto ymd = 2001y/January/1d;
+
+ ymd += duration_cast<years>(decades(1));
+
+ return ymd == 2011y/January/1d;
+}
+
+int main(int, char**) {
+ static_assert(test_month(), "Month arithmetic failed");
+ static_assert(test_year(), "Year arithmetic failed");
+
+ return 0;
+}
>From 5f7998ed1832a54c81331fbff3680aff98baee9e Mon Sep 17 00:00:00 2001
From: Skyfrei <tarkaklavio at gmail.com>
Date: Thu, 7 May 2026 20:23:32 +0200
Subject: [PATCH 2/8] fixed
---
libcxx/include/__chrono/year_month_day.h | 26 ++++++++++--------
libcxx/include/__chrono/year_month_weekday.h | 28 +++++++-------------
libcxx/test/std/chrono/arithmetic.pass.cpp | 10 ++++++-
3 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/libcxx/include/__chrono/year_month_day.h b/libcxx/include/__chrono/year_month_day.h
index b0149d3ee1a37..3c79cb7d50a5e 100644
--- a/libcxx/include/__chrono/year_month_day.h
+++ b/libcxx/include/__chrono/year_month_day.h
@@ -54,7 +54,9 @@ class year_month_day {
_LIBCPP_HIDE_FROM_ABI inline explicit constexpr year_month_day(const local_days& __locd) noexcept
: year_month_day(__from_days(__locd.time_since_epoch())) {}
+ template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator+=(const months& __dm) noexcept;
+ template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator-=(const months& __dm) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator+=(const years& __dy) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator-=(const years& __dy) noexcept;
@@ -149,17 +151,17 @@ operator/(const month_day& __lhs, int __rhs) noexcept {
return year(__rhs) / __lhs;
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
operator+(const year_month_day& __lhs, const months& __rhs) noexcept {
return (__lhs.year() / __lhs.month() + __rhs) / __lhs.day();
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
operator+(const months& __lhs, const year_month_day& __rhs) noexcept {
return __rhs + __lhs;
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
operator-(const year_month_day& __lhs, const months& __rhs) noexcept {
return __lhs + -__rhs;
}
@@ -179,11 +181,11 @@ operator-(const year_month_day& __lhs, const years& __rhs) noexcept {
return __lhs + -__rhs;
}
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day& year_month_day::operator+=(const months& __dm) noexcept {
+template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day& year_month_day::operator+=(const months& __dm) noexcept {
*this = *this + __dm;
return *this;
}
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day& year_month_day::operator-=(const months& __dm) noexcept {
+template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day& year_month_day::operator-=(const months& __dm) noexcept {
*this = *this - __dm;
return *this;
}
@@ -204,8 +206,10 @@ class year_month_day_last {
public:
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last(const year& __yval, const month_day_last& __mdlval) noexcept
: __y_{__yval}, __mdl_{__mdlval} {}
-
+
+ template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator+=(const months& __m) noexcept;
+ template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator-=(const months& __m) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator+=(const years& __y) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator-=(const years& __y) noexcept;
@@ -281,17 +285,17 @@ operator/(const month_day_last& __lhs, int __rhs) noexcept {
return year{__rhs} / __lhs;
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
operator+(const year_month_day_last& __lhs, const months& __rhs) noexcept {
return (__lhs.year() / __lhs.month() + __rhs) / last;
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
operator+(const months& __lhs, const year_month_day_last& __rhs) noexcept {
return __rhs + __lhs;
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
operator-(const year_month_day_last& __lhs, const months& __rhs) noexcept {
return __lhs + (-__rhs);
}
@@ -311,12 +315,12 @@ operator-(const year_month_day_last& __lhs, const years& __rhs) noexcept {
return __lhs + (-__rhs);
}
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last&
+template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last&
year_month_day_last::operator+=(const months& __dm) noexcept {
*this = *this + __dm;
return *this;
}
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last&
+template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last&
year_month_day_last::operator-=(const months& __dm) noexcept {
*this = *this - __dm;
return *this;
diff --git a/libcxx/include/__chrono/year_month_weekday.h b/libcxx/include/__chrono/year_month_weekday.h
index 6b90ec1d97818..eff472ffcc8a8 100644
--- a/libcxx/include/__chrono/year_month_weekday.h
+++ b/libcxx/include/__chrono/year_month_weekday.h
@@ -49,9 +49,7 @@ class year_month_weekday {
: year_month_weekday(__from_days(__sysd.time_since_epoch())) {}
_LIBCPP_HIDE_FROM_ABI inline explicit constexpr year_month_weekday(const local_days& __locd) noexcept
: year_month_weekday(__from_days(__locd.time_since_epoch())) {}
- template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator+=(const months&) noexcept;
- template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator-=(const months&) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator+=(const years&) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator-=(const years&) noexcept;
@@ -127,17 +125,17 @@ operator/(const month_weekday& __lhs, int __rhs) noexcept {
return year(__rhs) / __lhs;
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
operator+(const year_month_weekday& __lhs, const months& __rhs) noexcept {
return (__lhs.year() / __lhs.month() + __rhs) / __lhs.weekday_indexed();
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
operator+(const months& __lhs, const year_month_weekday& __rhs) noexcept {
return __rhs + __lhs;
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
operator-(const year_month_weekday& __lhs, const months& __rhs) noexcept {
return __lhs + (-__rhs);
}
@@ -157,13 +155,11 @@ operator-(const year_month_weekday& __lhs, const years& __rhs) noexcept {
return __lhs + (-__rhs);
}
-template<class>
-[[nodiscard]]_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday& year_month_weekday::operator+=(const months& __dm) noexcept {
+_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday& year_month_weekday::operator+=(const months& __dm) noexcept {
*this = *this + __dm;
return *this;
}
-template<class>
-[[nodiscard]]_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday& year_month_weekday::operator-=(const months& __dm) noexcept {
+_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday& year_month_weekday::operator-=(const months& __dm) noexcept {
*this = *this - __dm;
return *this;
}
@@ -186,9 +182,7 @@ class year_month_weekday_last {
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last(
const chrono::year& __yval, const chrono::month& __mval, const chrono::weekday_last& __wdlval) noexcept
: __y_{__yval}, __m_{__mval}, __wdl_{__wdlval} {}
- template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator+=(const months& __dm) noexcept;
- template<class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator-=(const months& __dm) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator+=(const years& __dy) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator-=(const years& __dy) noexcept;
@@ -247,17 +241,17 @@ operator/(const month_weekday_last& __lhs, int __rhs) noexcept {
return year(__rhs) / __lhs;
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
operator+(const year_month_weekday_last& __lhs, const months& __rhs) noexcept {
return (__lhs.year() / __lhs.month() + __rhs) / __lhs.weekday_last();
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
operator+(const months& __lhs, const year_month_weekday_last& __rhs) noexcept {
return __rhs + __lhs;
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
operator-(const year_month_weekday_last& __lhs, const months& __rhs) noexcept {
return __lhs + (-__rhs);
}
@@ -277,14 +271,12 @@ operator-(const year_month_weekday_last& __lhs, const years& __rhs) noexcept {
return __lhs + (-__rhs);
}
-template<class>
-[[nodiscard]]_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last&
+_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last&
year_month_weekday_last::operator+=(const months& __dm) noexcept {
*this = *this + __dm;
return *this;
}
-template<class>
-[[nodiscard]]_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last&
+_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last&
year_month_weekday_last::operator-=(const months& __dm) noexcept {
*this = *this - __dm;
return *this;
diff --git a/libcxx/test/std/chrono/arithmetic.pass.cpp b/libcxx/test/std/chrono/arithmetic.pass.cpp
index a8351f5b9c35c..f1b5d3946fa1c 100644
--- a/libcxx/test/std/chrono/arithmetic.pass.cpp
+++ b/libcxx/test/std/chrono/arithmetic.pass.cpp
@@ -25,9 +25,17 @@ constexpr bool test_year() {
return ymd == 2011y/January/1d;
}
+constexpr bool doc_ambig_test(){
+ using decades = duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
+ auto ymd = 2001y/January/1d;
+ ymd += decades(1);
+ return true;
+}
+
int main(int, char**) {
static_assert(test_month(), "Month arithmetic failed");
static_assert(test_year(), "Year arithmetic failed");
-
+ static_assert(doc_ambig_test(), "Doc");
+
return 0;
}
>From afcdef4bca90127ccebd5bf95f1c6664a584cc60 Mon Sep 17 00:00:00 2001
From: Skyfrei <tarkaklavio at gmail.com>
Date: Thu, 7 May 2026 20:37:56 +0200
Subject: [PATCH 3/8] added year_month as well
---
libcxx/include/__chrono/year_month.h | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/libcxx/include/__chrono/year_month.h b/libcxx/include/__chrono/year_month.h
index fdeeed1f386f8..04dc9b595b3e9 100644
--- a/libcxx/include/__chrono/year_month.h
+++ b/libcxx/include/__chrono/year_month.h
@@ -38,7 +38,9 @@ class year_month {
: __y_{__yval}, __m_{__mval} {}
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
+ template<class = void>
_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator+=(const months& __dm) noexcept;
+ template<class = void>
_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator-=(const months& __dm) noexcept;
_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator+=(const years& __dy) noexcept;
_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator-=(const years& __dy) noexcept;
@@ -64,7 +66,7 @@ operator<=>(const year_month& __lhs, const year_month& __rhs) noexcept {
return __lhs.month() <=> __rhs.month();
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
operator+(const year_month& __lhs, const months& __rhs) noexcept {
int __dmi = static_cast<int>(static_cast<unsigned>(__lhs.month())) - 1 + __rhs.count();
const int __dy = (__dmi >= 0 ? __dmi : __dmi - 11) / 12;
@@ -72,7 +74,7 @@ operator+(const year_month& __lhs, const months& __rhs) noexcept {
return (__lhs.year() + years(__dy)) / month(static_cast<unsigned>(__dmi));
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
operator+(const months& __lhs, const year_month& __rhs) noexcept {
return __rhs + __lhs;
}
@@ -87,13 +89,13 @@ operator+(const years& __lhs, const year_month& __rhs) noexcept {
return __rhs + __lhs;
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr months
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr months
operator-(const year_month& __lhs, const year_month& __rhs) noexcept {
return (__lhs.year() - __rhs.year()) +
months(static_cast<unsigned>(__lhs.month()) - static_cast<unsigned>(__rhs.month()));
}
-[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
operator-(const year_month& __lhs, const months& __rhs) noexcept {
return __lhs + -__rhs;
}
@@ -103,12 +105,12 @@ operator-(const year_month& __lhs, const years& __rhs) noexcept {
return __lhs + -__rhs;
}
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& year_month::operator+=(const months& __dm) noexcept {
+template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& year_month::operator+=(const months& __dm) noexcept {
*this = *this + __dm;
return *this;
}
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& year_month::operator-=(const months& __dm) noexcept {
+template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& year_month::operator-=(const months& __dm) noexcept {
*this = *this - __dm;
return *this;
}
>From 4fd4c89b7ce5cd23e0761470a9c60591c6ca1bb7 Mon Sep 17 00:00:00 2001
From: Skyfrei <tarkaklavio at gmail.com>
Date: Thu, 7 May 2026 22:44:21 +0200
Subject: [PATCH 4/8] added test cases to the appropriate place and deleted the
wrong folder
---
libcxx/include/__chrono/year_month.h | 22 ++++++----
libcxx/include/__chrono/year_month_day.h | 40 +++++++++++-------
libcxx/test/std/chrono/arithmetic.pass.cpp | 41 -------------------
.../plus_minus_equal_month.pass.cpp | 33 +++++++++++++++
4 files changed, 72 insertions(+), 64 deletions(-)
delete mode 100644 libcxx/test/std/chrono/arithmetic.pass.cpp
diff --git a/libcxx/include/__chrono/year_month.h b/libcxx/include/__chrono/year_month.h
index 04dc9b595b3e9..222b00b95d41a 100644
--- a/libcxx/include/__chrono/year_month.h
+++ b/libcxx/include/__chrono/year_month.h
@@ -38,9 +38,9 @@ class year_month {
: __y_{__yval}, __m_{__mval} {}
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
- template<class = void>
+ template <class = void>
_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator+=(const months& __dm) noexcept;
- template<class = void>
+ template <class = void>
_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator-=(const months& __dm) noexcept;
_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator+=(const years& __dy) noexcept;
_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator-=(const years& __dy) noexcept;
@@ -66,7 +66,8 @@ operator<=>(const year_month& __lhs, const year_month& __rhs) noexcept {
return __lhs.month() <=> __rhs.month();
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+template <class = void>
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
operator+(const year_month& __lhs, const months& __rhs) noexcept {
int __dmi = static_cast<int>(static_cast<unsigned>(__lhs.month())) - 1 + __rhs.count();
const int __dy = (__dmi >= 0 ? __dmi : __dmi - 11) / 12;
@@ -74,7 +75,8 @@ operator+(const year_month& __lhs, const months& __rhs) noexcept {
return (__lhs.year() + years(__dy)) / month(static_cast<unsigned>(__dmi));
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+template <class = void>
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
operator+(const months& __lhs, const year_month& __rhs) noexcept {
return __rhs + __lhs;
}
@@ -89,13 +91,15 @@ operator+(const years& __lhs, const year_month& __rhs) noexcept {
return __rhs + __lhs;
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr months
+template <class = void>
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr months
operator-(const year_month& __lhs, const year_month& __rhs) noexcept {
return (__lhs.year() - __rhs.year()) +
months(static_cast<unsigned>(__lhs.month()) - static_cast<unsigned>(__rhs.month()));
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+template <class = void>
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
operator-(const year_month& __lhs, const months& __rhs) noexcept {
return __lhs + -__rhs;
}
@@ -105,12 +109,14 @@ operator-(const year_month& __lhs, const years& __rhs) noexcept {
return __lhs + -__rhs;
}
-template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& year_month::operator+=(const months& __dm) noexcept {
+template <class>
+_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& year_month::operator+=(const months& __dm) noexcept {
*this = *this + __dm;
return *this;
}
-template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& year_month::operator-=(const months& __dm) noexcept {
+template <class>
+_LIBCPP_HIDE_FROM_ABI inline constexpr year_month& year_month::operator-=(const months& __dm) noexcept {
*this = *this - __dm;
return *this;
}
diff --git a/libcxx/include/__chrono/year_month_day.h b/libcxx/include/__chrono/year_month_day.h
index 3c79cb7d50a5e..be1925fcdd2ff 100644
--- a/libcxx/include/__chrono/year_month_day.h
+++ b/libcxx/include/__chrono/year_month_day.h
@@ -54,9 +54,9 @@ class year_month_day {
_LIBCPP_HIDE_FROM_ABI inline explicit constexpr year_month_day(const local_days& __locd) noexcept
: year_month_day(__from_days(__locd.time_since_epoch())) {}
- template<class = void>
+ template <class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator+=(const months& __dm) noexcept;
- template<class = void>
+ template <class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator-=(const months& __dm) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator+=(const years& __dy) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator-=(const years& __dy) noexcept;
@@ -151,17 +151,20 @@ operator/(const month_day& __lhs, int __rhs) noexcept {
return year(__rhs) / __lhs;
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+template <class = void>
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
operator+(const year_month_day& __lhs, const months& __rhs) noexcept {
return (__lhs.year() / __lhs.month() + __rhs) / __lhs.day();
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+template <class = void>
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
operator+(const months& __lhs, const year_month_day& __rhs) noexcept {
return __rhs + __lhs;
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+template <class = void>
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
operator-(const year_month_day& __lhs, const months& __rhs) noexcept {
return __lhs + -__rhs;
}
@@ -181,11 +184,13 @@ operator-(const year_month_day& __lhs, const years& __rhs) noexcept {
return __lhs + -__rhs;
}
-template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day& year_month_day::operator+=(const months& __dm) noexcept {
+template <class>
+_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day& year_month_day::operator+=(const months& __dm) noexcept {
*this = *this + __dm;
return *this;
}
-template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day& year_month_day::operator-=(const months& __dm) noexcept {
+template <class>
+_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day& year_month_day::operator-=(const months& __dm) noexcept {
*this = *this - __dm;
return *this;
}
@@ -206,10 +211,10 @@ class year_month_day_last {
public:
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last(const year& __yval, const month_day_last& __mdlval) noexcept
: __y_{__yval}, __mdl_{__mdlval} {}
-
- template<class = void>
+
+ template <class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator+=(const months& __m) noexcept;
- template<class = void>
+ template <class = void>
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator-=(const months& __m) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator+=(const years& __y) noexcept;
_LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator-=(const years& __y) noexcept;
@@ -285,17 +290,20 @@ operator/(const month_day_last& __lhs, int __rhs) noexcept {
return year{__rhs} / __lhs;
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+template <class = void>
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
operator+(const year_month_day_last& __lhs, const months& __rhs) noexcept {
return (__lhs.year() / __lhs.month() + __rhs) / last;
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+template <class = void>
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
operator+(const months& __lhs, const year_month_day_last& __rhs) noexcept {
return __rhs + __lhs;
}
-template<class = void>[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+template <class = void>
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
operator-(const year_month_day_last& __lhs, const months& __rhs) noexcept {
return __lhs + (-__rhs);
}
@@ -315,12 +323,14 @@ operator-(const year_month_day_last& __lhs, const years& __rhs) noexcept {
return __lhs + (-__rhs);
}
-template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last&
+template <class>
+_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last&
year_month_day_last::operator+=(const months& __dm) noexcept {
*this = *this + __dm;
return *this;
}
-template<class>_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last&
+template <class>
+_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last&
year_month_day_last::operator-=(const months& __dm) noexcept {
*this = *this - __dm;
return *this;
diff --git a/libcxx/test/std/chrono/arithmetic.pass.cpp b/libcxx/test/std/chrono/arithmetic.pass.cpp
deleted file mode 100644
index f1b5d3946fa1c..0000000000000
--- a/libcxx/test/std/chrono/arithmetic.pass.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <chrono>
-
-using namespace std::chrono;
-
-constexpr bool test_month() {
- using decamonths = duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
- auto ymd = 2001y/January/1d;
- auto ymd2 = 2001y/January/1d;
- ymd2 += std::chrono::duration_cast<std::chrono::months>(decamonths(1));
- ymd += decamonths(1);
-
-
- if (ymd2.month() != November)
- return false;
-
- return ymd == 2001y/November/1d;
-}
-
-constexpr bool test_year() {
- using decades = duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
- auto ymd = 2001y/January/1d;
-
- ymd += duration_cast<years>(decades(1));
-
- return ymd == 2011y/January/1d;
-}
-
-constexpr bool doc_ambig_test(){
- using decades = duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
- auto ymd = 2001y/January/1d;
- ymd += decades(1);
- return true;
-}
-
-int main(int, char**) {
- static_assert(test_month(), "Month arithmetic failed");
- static_assert(test_year(), "Year arithmetic failed");
- static_assert(doc_ambig_test(), "Doc");
-
- return 0;
-}
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
index a67286b85c04a..e915ed809e4bf 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
@@ -23,7 +23,11 @@
using month = std::chrono::month;
using months = std::chrono::months;
using year = std::chrono::year;
+using years = std::chrono::years;
using year_month = std::chrono::year_month;
+using ymd_t = std::chrono::year_month_day;
+using decades = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
+using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
constexpr bool test() {
for (unsigned i = 0; i <= 10; ++i) {
@@ -49,6 +53,35 @@ constexpr bool test() {
assert((ym == year_month{year{2020}, month{4}}));
}
+ { // Ambiguity test, defaults to year arithmetic
+ for(unsigned int i = 0; i < 10; i++){
+ year y{2011};
+ month m{i};
+ ymd_t ymd (y, m, std::chrono::day{i});
+ year_month ym(y, m);
+
+ ymd += decades(1);
+ assert(ymd.year() == y + years{10});
+ assert(ymd.month() == m);
+
+ ymd += decamonths(1);
+ assert(ymd.month() == m + months{10});
+
+ ymd.operator+=<void>(decamonths(1));
+ assert(ymd.month() == m + months{20});
+
+ ym += decades(1);
+ assert(ym.year() == y + years{10});
+ assert(ym.month() == m);
+
+ ym += decamonths(1);
+ assert(ym.month() == m + months{10});
+
+ ym.operator+=<void>(decamonths(1));
+ assert(ym.month() == m + months{20});
+ }
+ }
+
return true;
}
>From 2fdc4411a5d99f2b9c64d80ff5ecac45b8a056a0 Mon Sep 17 00:00:00 2001
From: Skyfrei <tarkaklavio at gmail.com>
Date: Fri, 8 May 2026 18:09:21 +0200
Subject: [PATCH 5/8] added test cases to their respective files
---
.../plus_minus_equal_month.pass.cpp | 27 +++++-----------
.../plus_minus_equal_year.pass.cpp | 17 ++++++++++
.../time.cal.ym.nonmembers/minus.pass.cpp | 18 +++++++++++
.../time.cal.ym.nonmembers/plus.pass.cpp | 28 ++++++++++++++++
.../plus_minus_equal_month.pass.cpp | 15 +++++++++
.../plus_minus_equal_year.pass.cpp | 17 ++++++++++
.../time.cal.ymd.nonmembers/minus.pass.cpp | 26 +++++++++++++++
.../time.cal.ymd.nonmembers/plus.pass.cpp | 32 +++++++++++++++++++
8 files changed, 161 insertions(+), 19 deletions(-)
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
index e915ed809e4bf..1bd7934b3c4c8 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
@@ -25,8 +25,6 @@ using months = std::chrono::months;
using year = std::chrono::year;
using years = std::chrono::years;
using year_month = std::chrono::year_month;
-using ymd_t = std::chrono::year_month_day;
-using decades = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
constexpr bool test() {
@@ -57,29 +55,20 @@ constexpr bool test() {
for(unsigned int i = 0; i < 10; i++){
year y{2011};
month m{i};
- ymd_t ymd (y, m, std::chrono::day{i});
year_month ym(y, m);
- ymd += decades(1);
- assert(ymd.year() == y + years{10});
- assert(ymd.month() == m);
-
- ymd += decamonths(1);
- assert(ymd.month() == m + months{10});
-
- ymd.operator+=<void>(decamonths(1));
- assert(ymd.month() == m + months{20});
-
- ym += decades(1);
- assert(ym.year() == y + years{10});
- assert(ym.month() == m);
-
+ year_month wrapped = ym + months{0};
ym += decamonths(1);
assert(ym.month() == m + months{10});
- ym.operator+=<void>(decamonths(1));
- assert(ym.month() == m + months{20});
+ ym -= decamonths(1);
+ assert(ym == wrapped);
}
+ year y{2011};
+ month m{0};
+ year_month ym(y, m);
+ ym += decamonths(2);
+ assert((ym == year_month{year{2012}, month{8}}));
}
return true;
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
index 591f15007b129..b3cac58dec873 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
@@ -24,6 +24,7 @@ using month = std::chrono::month;
using year = std::chrono::year;
using years = std::chrono::years;
using year_month = std::chrono::year_month;
+using decades = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
constexpr bool test() {
for (int i = 1000; i <= 1010; ++i) {
@@ -38,6 +39,22 @@ constexpr bool test() {
assert(static_cast<int>((ym).year()) == i + 1);
assert(ym.month() == m);
}
+
+ { // Ambiguity test
+ for(unsigned int i = 0; i < 10; i++){
+ year y{2011};
+ month m{i};
+ year_month ym(y, m);
+
+ ym += decades(1);
+ assert(ym.year() == y + years{10});
+ assert(ym.month() == m);
+
+ ym -= decades(2);
+ assert(ym.year() == y - years{10});
+ assert(ym.month() == m);
+ }
+ }
return true;
}
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
index 22f137f042fd8..41897be6c201f 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
@@ -32,6 +32,8 @@ using years = std::chrono::years;
using month = std::chrono::month;
using months = std::chrono::months;
using year_month = std::chrono::year_month;
+using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
+using decades = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
constexpr bool test() {
{ // year_month - years
@@ -42,6 +44,12 @@ constexpr bool test() {
assert(static_cast<int>(ym1.year()) == 1234 - i);
assert(ym1.month() == std::chrono::January);
}
+
+ for (int i = 0; i <= 3; ++i) {
+ year_month ym1 = ym - decades(i);
+ assert(ym1.month() == std::chrono::January);
+ assert(ym1.year() == ym.year() - years{i * 10});
+ }
}
{ // year_month - months
@@ -58,6 +66,16 @@ constexpr bool test() {
assert(static_cast<int>(ym1.year()) == 1233);
assert(ym1.month() == month(11 - i + 12));
}
+
+ for(unsigned int i = 0; i < 5; i++){
+ months added_months = decamonths(i);
+ year_month ym1 = ym - decamonths(i);
+ assert(ym1.month() == ym.month() - decamonths(i));
+ int d = static_cast<int>(static_cast<unsigned>(ym.month())) - 1 - added_months.count();
+ int dy = (d >= 0 ? d : d - 11) / 12;
+ year expected_year = ym.year() + years{dy};
+ assert(ym1.year() == expected_year);
+ }
}
{ // year_month - year_month
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
index 29049fd98fa7a..19dec4022d13e 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
@@ -35,6 +35,8 @@ using years = std::chrono::years;
using month = std::chrono::month;
using months = std::chrono::months;
using year_month = std::chrono::year_month;
+using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
+using decades = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
// year_month + years
constexpr bool test_ym_plus_y() {
@@ -55,6 +57,17 @@ constexpr bool test_ym_plus_y() {
assert(ym1 == ym2);
}
+ for (int i = 0; i <= 3; ++i) {
+ year_month ym1 = ym + decades(i);
+ year_month ym2 = decades(i) + ym;
+ assert(ym1.month() == std::chrono::January);
+ assert(ym1.year() == ym.year() + years{i * 10});
+
+ assert(ym2.month() == std::chrono::January);
+ assert(ym2.year() == ym.year() + years{i * 10});
+ assert(ym1 == ym2);
+ }
+
return true;
}
@@ -95,6 +108,21 @@ constexpr bool test_ym_plus_m() {
assert(ym2.month() == month(1 + i % 12));
assert(ym1 == ym2);
}
+
+ for(unsigned int i = 0; i < 5; i++){
+ months added_months = decamonths(i);
+ year_month ym1 = ym + decamonths(i);
+ year_month ym2 = decamonths(i) + ym;
+ assert(ym1.month() == ym.month() + decamonths(i));
+ assert(ym2.month() == ym.month() + decamonths(i));
+
+ years added_years{(static_cast<unsigned>(ym.month()) - 1 + added_months.count()) / 12};
+ year expected_year = ym.year() + added_years;
+ assert(ym1.year() == expected_year);
+ assert(ym2.year() == expected_year);
+ assert(ym1 == ym2);
+ }
+
return true;
}
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
index 12857a3543d60..1b2f6a816aa5d 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
@@ -25,6 +25,7 @@ using month = std::chrono::month;
using day = std::chrono::day;
using year_month_day = std::chrono::year_month_day;
using months = std::chrono::months;
+using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
constexpr bool test() {
for (unsigned i = 0; i <= 10; ++i) {
@@ -77,6 +78,20 @@ constexpr bool test() {
assert((ymd == year_month_day{year{2020}, month{4}, day{31}}));
}
+ { // Ambiguity test, defaults to year arithmetic
+ year_month_day ymd{year{2020}, month{4}, day{31}};
+
+ ymd += decamonths(1);
+ assert(ymd.month() == month{4} + months{10});
+ assert(ymd.day() == day{31});
+ ymd -= decamonths(1);
+ assert(ymd.month() == month{4});
+
+ year_month_day ymd2{year{2011}, month{0}, day{1}};
+ ymd2 += decamonths(2);
+ assert((ymd2 == year_month_day{year{2012}, month{8}, day{1}}));
+ }
+
return true;
}
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
index 80c7283fcd4db..c52729c71fd19 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
@@ -25,6 +25,7 @@ using month = std::chrono::month;
using day = std::chrono::day;
using year_month_day = std::chrono::year_month_day;
using years = std::chrono::years;
+using decades = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
constexpr bool test() {
for (int i = 1000; i <= 1010; ++i) {
@@ -45,6 +46,22 @@ constexpr bool test() {
assert(ym.day() == d);
}
+ { // Ambiguity test
+ for(unsigned int i = 0; i < 10; i++){
+ year y{2011};
+ month m{i};
+ year_month_day ymd(y, m, day{1});
+
+ ymd += decades(1);
+ assert(ymd.year() == y + years{10});
+ assert(ymd.month() == m);
+
+ ymd -= decades(2);
+ assert(ymd.year() == y - years{10});
+ assert(ymd.month() == m);
+ }
+ }
+
return true;
}
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
index c0032621c901b..5b27bd09fd156 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
@@ -12,6 +12,9 @@
// constexpr year_month_day operator-(const year_month_day& ymd, const years& dy) noexcept;
// Returns: ymd + (-dy)
+//
+// constexpr year_month_day_last operator-(const year_month_day_last& __lhs, const months& __rhs) noexcept;
+// Return: __lhs + (-__rhs)
#include <chrono>
@@ -21,6 +24,7 @@
#include "test_macros.h"
+
constexpr bool test_constexpr ()
{
std::chrono::year_month_day ym0{std::chrono::year{1234}, std::chrono::January, std::chrono::day{12}};
@@ -39,6 +43,10 @@ int main(int, char**)
using day = std::chrono::day;
using year_month_day = std::chrono::year_month_day;
using years = std::chrono::years;
+ using months = std::chrono::months;
+ using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
+ using decades = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
+
ASSERT_NOEXCEPT( std::declval<year_month_day>() - std::declval<years>());
ASSERT_SAME_TYPE(year_month_day, decltype(std::declval<year_month_day>() - std::declval<years>()));
@@ -56,5 +64,23 @@ int main(int, char**)
assert(ym1.day() == day{10});
}
+ for (int i = 0; i <= 3; ++i) {
+ year_month_day ym1 = ym - decades(i);
+ assert(ym1.month() == std::chrono::January);
+ assert(ym1.year() == ym.year() - years{i * 10});
+ assert(ym1.day() == ym.day());
+ }
+
+ for(unsigned int i = 0; i < 5; i++){
+ months added_months = decamonths(i);
+ year_month_day ym1 = ym - decamonths(i);
+ assert(ym1.month() == ym.month() - decamonths(i));
+ int d = static_cast<int>(static_cast<unsigned>(ym.month())) - 1 - added_months.count();
+ int dy = (d >= 0 ? d : d - 11) / 12;
+ year expected_year = ym.year() + years{dy};
+ assert(ym1.year() == expected_year);
+ }
+
+
return 0;
}
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
index c724be6b380da..60b073bbc6688 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
@@ -36,6 +36,8 @@ using years = std::chrono::years;
using month = std::chrono::month;
using months = std::chrono::months;
using year_month_day = std::chrono::year_month_day;
+using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
+using decades = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
constexpr bool test() {
{ // year_month_day + months
@@ -65,6 +67,23 @@ constexpr bool test() {
}
}
+ {
+ year_month_day ym{year{1234}, std::chrono::January, day{12}};
+ for(unsigned int i = 0; i < 5; i++){
+ months added_months = decamonths(i);
+ year_month_day ym1 = ym + decamonths(i);
+ year_month_day ym2 = decamonths(i) + ym;
+ assert(ym1.month() == ym.month() + decamonths(i));
+ assert(ym2.month() == ym.month() + decamonths(i));
+
+ years added_years{(static_cast<unsigned>(ym.month()) - 1 + added_months.count()) / 12};
+ year expected_year = ym.year() + added_years;
+ assert(ym1.year() == expected_year);
+ assert(ym2.year() == expected_year);
+ assert(ym1 == ym2);
+ }
+ }
+
{ // year_month_day + years
year_month_day ym{year{1234}, std::chrono::January, day{12}};
for (int i = 0; i <= 10; ++i) {
@@ -78,6 +97,19 @@ constexpr bool test() {
assert(ymd2.day() == day{12});
assert(ymd1 == ymd2);
}
+
+ {
+ for (int i = 0; i <= 3; ++i) {
+ year_month_day ym1 = ym + decades(i);
+ year_month_day ym2 = decades(i) + ym;
+ assert(ym1.month() == std::chrono::January);
+ assert(ym1.year() == ym.year() + years{i * 10});
+
+ assert(ym2.month() == std::chrono::January);
+ assert(ym2.year() == ym.year() + years{i * 10});
+ assert(ym1 == ym2);
+ }
+ }
}
return true;
>From c2502622b071cbc448923fae907c83ff63caf788 Mon Sep 17 00:00:00 2001
From: Skyfrei <tarkaklavio at gmail.com>
Date: Fri, 8 May 2026 19:54:37 +0200
Subject: [PATCH 6/8] added #include ratio for the tests
---
.../time.cal.ymd.members/plus_minus_equal_year.pass.cpp | 1 +
.../time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp | 1 +
.../time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp | 1 +
3 files changed, 3 insertions(+)
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
index c52729c71fd19..e044ad30b6c2e 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
@@ -17,6 +17,7 @@
#include <cassert>
#include <type_traits>
#include <utility>
+#include <ratio>
#include "test_macros.h"
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
index 5b27bd09fd156..f07f489ad002c 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
@@ -21,6 +21,7 @@
#include <cassert>
#include <type_traits>
#include <utility>
+#include <ratio>
#include "test_macros.h"
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
index 60b073bbc6688..a797b10096ff3 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
@@ -27,6 +27,7 @@
#include <cassert>
#include <type_traits>
#include <utility>
+#include <ratio>
#include "test_macros.h"
>From ade9554c7c9e25a626a759f1e38b283a8f3373ae Mon Sep 17 00:00:00 2001
From: Skyfrei <tarkaklavio at gmail.com>
Date: Fri, 8 May 2026 20:59:52 +0200
Subject: [PATCH 7/8] added #include <ratio> for the tests...
---
.../time.cal.ym.members/plus_minus_equal_month.pass.cpp | 1 +
.../time.cal.ym.members/plus_minus_equal_year.pass.cpp | 1 +
.../time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp | 1 +
.../time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp | 1 +
.../time.cal.ymd.members/plus_minus_equal_month.pass.cpp | 1 +
5 files changed, 5 insertions(+)
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
index 1bd7934b3c4c8..5ff534be8f827 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
@@ -17,6 +17,7 @@
#include <cassert>
#include <type_traits>
#include <utility>
+#include <ratio>
#include "test_macros.h"
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
index b3cac58dec873..615f30505a0e9 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
@@ -17,6 +17,7 @@
#include <cassert>
#include <type_traits>
#include <utility>
+#include <ratio>
#include "test_macros.h"
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
index 41897be6c201f..02f7830c498dc 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
@@ -24,6 +24,7 @@
#include <cassert>
#include <type_traits>
#include <utility>
+#include <ratio>
#include "test_macros.h"
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
index 19dec4022d13e..622ac0a302708 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
@@ -27,6 +27,7 @@
#include <cassert>
#include <type_traits>
#include <utility>
+#include <ratio>
#include "test_macros.h"
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
index 1b2f6a816aa5d..cb8dd71199fe3 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
@@ -17,6 +17,7 @@
#include <cassert>
#include <type_traits>
#include <utility>
+#include <ratio>
#include "test_macros.h"
>From 0265f3add794ae8255edadf8f3cd5661cdb3fa21 Mon Sep 17 00:00:00 2001
From: Skyfrei <tarkaklavio at gmail.com>
Date: Sat, 9 May 2026 16:11:57 +0200
Subject: [PATCH 8/8] formatting and ranking of include headers
---
.../plus_minus_equal_month.pass.cpp | 6 +-
.../plus_minus_equal_year.pass.cpp | 6 +-
.../time.cal.ym.nonmembers/minus.pass.cpp | 10 +-
.../time.cal.ym.nonmembers/plus.pass.cpp | 8 +-
.../plus_minus_equal_month.pass.cpp | 2 +-
.../plus_minus_equal_year.pass.cpp | 4 +-
.../time.cal.ymd.nonmembers/minus.pass.cpp | 104 ++++++++----------
.../time.cal.ymd.nonmembers/plus.pass.cpp | 8 +-
8 files changed, 69 insertions(+), 79 deletions(-)
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
index 5ff534be8f827..68b7f904194d0 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_month.pass.cpp
@@ -15,9 +15,9 @@
#include <chrono>
#include <cassert>
+#include <ratio>
#include <type_traits>
#include <utility>
-#include <ratio>
#include "test_macros.h"
@@ -26,7 +26,6 @@ using months = std::chrono::months;
using year = std::chrono::year;
using years = std::chrono::years;
using year_month = std::chrono::year_month;
-using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
constexpr bool test() {
for (unsigned i = 0; i <= 10; ++i) {
@@ -53,7 +52,8 @@ constexpr bool test() {
}
{ // Ambiguity test, defaults to year arithmetic
- for(unsigned int i = 0; i < 10; i++){
+ using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
+ for (unsigned int i = 0; i < 10; i++) {
year y{2011};
month m{i};
year_month ym(y, m);
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
index 615f30505a0e9..9695fcbf617a9 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.members/plus_minus_equal_year.pass.cpp
@@ -15,9 +15,9 @@
#include <chrono>
#include <cassert>
+#include <ratio>
#include <type_traits>
#include <utility>
-#include <ratio>
#include "test_macros.h"
@@ -40,9 +40,9 @@ constexpr bool test() {
assert(static_cast<int>((ym).year()) == i + 1);
assert(ym.month() == m);
}
-
+
{ // Ambiguity test
- for(unsigned int i = 0; i < 10; i++){
+ for (unsigned int i = 0; i < 10; i++) {
year y{2011};
month m{i};
year_month ym(y, m);
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
index 02f7830c498dc..117b344e870c6 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/minus.pass.cpp
@@ -22,9 +22,9 @@
#include <chrono>
#include <cassert>
+#include <ratio>
#include <type_traits>
#include <utility>
-#include <ratio>
#include "test_macros.h"
@@ -68,12 +68,12 @@ constexpr bool test() {
assert(ym1.month() == month(11 - i + 12));
}
- for(unsigned int i = 0; i < 5; i++){
+ for (unsigned int i = 0; i < 5; i++) {
months added_months = decamonths(i);
- year_month ym1 = ym - decamonths(i);
+ year_month ym1 = ym - decamonths(i);
assert(ym1.month() == ym.month() - decamonths(i));
- int d = static_cast<int>(static_cast<unsigned>(ym.month())) - 1 - added_months.count();
- int dy = (d >= 0 ? d : d - 11) / 12;
+ int d = static_cast<int>(static_cast<unsigned>(ym.month())) - 1 - added_months.count();
+ int dy = (d >= 0 ? d : d - 11) / 12;
year expected_year = ym.year() + years{dy};
assert(ym1.year() == expected_year);
}
diff --git a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
index 622ac0a302708..6a42c41b62d55 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ym/time.cal.ym.nonmembers/plus.pass.cpp
@@ -25,9 +25,9 @@
#include <chrono>
#include <cassert>
+#include <ratio>
#include <type_traits>
#include <utility>
-#include <ratio>
#include "test_macros.h"
@@ -110,10 +110,10 @@ constexpr bool test_ym_plus_m() {
assert(ym1 == ym2);
}
- for(unsigned int i = 0; i < 5; i++){
+ for (unsigned int i = 0; i < 5; i++) {
months added_months = decamonths(i);
- year_month ym1 = ym + decamonths(i);
- year_month ym2 = decamonths(i) + ym;
+ year_month ym1 = ym + decamonths(i);
+ year_month ym2 = decamonths(i) + ym;
assert(ym1.month() == ym.month() + decamonths(i));
assert(ym2.month() == ym.month() + decamonths(i));
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
index cb8dd71199fe3..af45b6a13292c 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_month.pass.cpp
@@ -15,9 +15,9 @@
#include <chrono>
#include <cassert>
+#include <ratio>
#include <type_traits>
#include <utility>
-#include <ratio>
#include "test_macros.h"
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
index e044ad30b6c2e..9de5c443c0b80 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.members/plus_minus_equal_year.pass.cpp
@@ -15,9 +15,9 @@
#include <chrono>
#include <cassert>
+#include <ratio>
#include <type_traits>
#include <utility>
-#include <ratio>
#include "test_macros.h"
@@ -48,7 +48,7 @@ constexpr bool test() {
}
{ // Ambiguity test
- for(unsigned int i = 0; i < 10; i++){
+ for (unsigned int i = 0; i < 10; i++) {
year y{2011};
month m{i};
year_month_day ymd(y, m, day{1});
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
index f07f489ad002c..3aa7768ef99f3 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/minus.pass.cpp
@@ -16,72 +16,62 @@
// constexpr year_month_day_last operator-(const year_month_day_last& __lhs, const months& __rhs) noexcept;
// Return: __lhs + (-__rhs)
-
#include <chrono>
#include <cassert>
+#include <ratio>
#include <type_traits>
#include <utility>
-#include <ratio>
#include "test_macros.h"
-
-constexpr bool test_constexpr ()
-{
- std::chrono::year_month_day ym0{std::chrono::year{1234}, std::chrono::January, std::chrono::day{12}};
- std::chrono::year_month_day ym1 = ym0 - std::chrono::years{10};
- return
- ym1.year() == std::chrono::year{1234-10}
- && ym1.month() == std::chrono::January
- && ym1.day() == std::chrono::day{12}
- ;
+constexpr bool test_constexpr() {
+ std::chrono::year_month_day ym0{std::chrono::year{1234}, std::chrono::January, std::chrono::day{12}};
+ std::chrono::year_month_day ym1 = ym0 - std::chrono::years{10};
+ return ym1.year() == std::chrono::year{1234 - 10} && ym1.month() == std::chrono::January &&
+ ym1.day() == std::chrono::day{12};
}
-int main(int, char**)
-{
- using year = std::chrono::year;
- using month = std::chrono::month;
- using day = std::chrono::day;
- using year_month_day = std::chrono::year_month_day;
- using years = std::chrono::years;
- using months = std::chrono::months;
- using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
- using decades = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
-
-
- ASSERT_NOEXCEPT( std::declval<year_month_day>() - std::declval<years>());
- ASSERT_SAME_TYPE(year_month_day, decltype(std::declval<year_month_day>() - std::declval<years>()));
-
- constexpr month January = std::chrono::January;
-
- static_assert(test_constexpr(), "");
-
- year_month_day ym{year{1234}, January, day{10}};
- for (int i = 0; i <= 10; ++i)
- {
- year_month_day ym1 = ym - years{i};
- assert(static_cast<int>(ym1.year()) == 1234 - i);
- assert(ym1.month() == January);
- assert(ym1.day() == day{10});
- }
-
- for (int i = 0; i <= 3; ++i) {
- year_month_day ym1 = ym - decades(i);
- assert(ym1.month() == std::chrono::January);
- assert(ym1.year() == ym.year() - years{i * 10});
- assert(ym1.day() == ym.day());
- }
-
- for(unsigned int i = 0; i < 5; i++){
- months added_months = decamonths(i);
- year_month_day ym1 = ym - decamonths(i);
- assert(ym1.month() == ym.month() - decamonths(i));
- int d = static_cast<int>(static_cast<unsigned>(ym.month())) - 1 - added_months.count();
- int dy = (d >= 0 ? d : d - 11) / 12;
- year expected_year = ym.year() + years{dy};
- assert(ym1.year() == expected_year);
- }
-
+int main(int, char**) {
+ using year = std::chrono::year;
+ using month = std::chrono::month;
+ using day = std::chrono::day;
+ using year_month_day = std::chrono::year_month_day;
+ using years = std::chrono::years;
+ using months = std::chrono::months;
+ using decamonths = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, months::period>>;
+ using decades = std::chrono::duration<int, std::ratio_multiply<std::ratio<10>, years::period>>;
+
+ ASSERT_NOEXCEPT(std::declval<year_month_day>() - std::declval<years>());
+ ASSERT_SAME_TYPE(year_month_day, decltype(std::declval<year_month_day>() - std::declval<years>()));
+
+ constexpr month January = std::chrono::January;
+
+ static_assert(test_constexpr(), "");
+
+ year_month_day ym{year{1234}, January, day{10}};
+ for (int i = 0; i <= 10; ++i) {
+ year_month_day ym1 = ym - years{i};
+ assert(static_cast<int>(ym1.year()) == 1234 - i);
+ assert(ym1.month() == January);
+ assert(ym1.day() == day{10});
+ }
+
+ for (int i = 0; i <= 3; ++i) {
+ year_month_day ym1 = ym - decades(i);
+ assert(ym1.month() == std::chrono::January);
+ assert(ym1.year() == ym.year() - years{i * 10});
+ assert(ym1.day() == ym.day());
+ }
+
+ for (unsigned int i = 0; i < 5; i++) {
+ months added_months = decamonths(i);
+ year_month_day ym1 = ym - decamonths(i);
+ assert(ym1.month() == ym.month() - decamonths(i));
+ int d = static_cast<int>(static_cast<unsigned>(ym.month())) - 1 - added_months.count();
+ int dy = (d >= 0 ? d : d - 11) / 12;
+ year expected_year = ym.year() + years{dy};
+ assert(ym1.year() == expected_year);
+ }
return 0;
}
diff --git a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
index a797b10096ff3..44cd9abcb39d0 100644
--- a/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
+++ b/libcxx/test/std/time/time.cal/time.cal.ymd/time.cal.ymd.nonmembers/plus.pass.cpp
@@ -25,9 +25,9 @@
#include <chrono>
#include <cassert>
+#include <ratio>
#include <type_traits>
#include <utility>
-#include <ratio>
#include "test_macros.h"
@@ -70,10 +70,10 @@ constexpr bool test() {
{
year_month_day ym{year{1234}, std::chrono::January, day{12}};
- for(unsigned int i = 0; i < 5; i++){
+ for (unsigned int i = 0; i < 5; i++) {
months added_months = decamonths(i);
- year_month_day ym1 = ym + decamonths(i);
- year_month_day ym2 = decamonths(i) + ym;
+ year_month_day ym1 = ym + decamonths(i);
+ year_month_day ym2 = decamonths(i) + ym;
assert(ym1.month() == ym.month() + decamonths(i));
assert(ym2.month() == ym.month() + decamonths(i));
More information about the libcxx-commits
mailing list