Skip to content

chronat: Allow day from month_day_last conditionally #1845

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
eldakesh-ms merged 1 commit into from
Apr 16, 2021
Merged

chronat: Allow day from month_day_last conditionally #1845

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
11 changes: 9 additions & 2 deletions stl/inc/chrono
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5454,6 +5454,12 @@ namespace chrono {
switch (_Specs._Type) {
case 'd':
case 'e':
// Most months have a proper last day, but February depends on the year.
if constexpr (is_same_v<_Ty, month_day_last>) {
if (_Val.month() == February) {
_THROW(format_error("Cannot print the last day of February without a year"));
}
}
if (_Has_modifier) {
return false;
}
Expand Down Expand Up @@ -5546,6 +5552,7 @@ namespace chrono {
_Month = static_cast<unsigned int>(_Val.month());
} else if constexpr (is_same_v<_Ty, month_day_last>) {
_Month = static_cast<unsigned int>(_Val.month());
_Day = static_cast<unsigned int>(_Last_day_table[_Month - 1]);
} else if constexpr (is_same_v<_Ty, year_month>) {
_Month = static_cast<unsigned int>(_Val.month());
_Year = static_cast<int>(_Val.year());
Expand Down Expand Up @@ -5766,13 +5773,13 @@ struct _Chrono_formatter {
_NODISCARD constexpr bool _Is_valid_type(const char _Type) noexcept {
if constexpr (is_same_v<_Ty, _CHRONO day>) {
return _Type == 'd' || _Type == 'e';
} else if constexpr (_Is_any_of_v<_Ty, _CHRONO month, _CHRONO month_day_last>) {
} else if constexpr (is_same_v<_Ty, _CHRONO month>) {
return _Type == 'b' || _Type == 'B' || _Type == 'h' || _Type == 'm';
} else if constexpr (is_same_v<_Ty, _CHRONO year>) {
return _Type == 'Y' || _Type == 'y' || _Type == 'C';
} else if constexpr (is_same_v<_Ty, _CHRONO weekday>) {
return _Type == 'a' || _Type == 'A' || _Type == 'u' || _Type == 'w';
} else if constexpr (is_same_v<_Ty, _CHRONO month_day>) {
} else if constexpr (_Is_any_of_v<_Ty, _CHRONO month_day, _CHRONO month_day_last>) {
return _Is_valid_type<_CHRONO month>(_Type) || _Is_valid_type<_CHRONO day>(_Type);
} else if constexpr (is_same_v<_Ty, _CHRONO year_month>) {
return _Is_valid_type<_CHRONO year>(_Type) || _Is_valid_type<_CHRONO month>(_Type);
Expand Down
3 changes: 2 additions & 1 deletion tests/std/tests/P0355R7_calendars_and_time_zones_formatting/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,8 @@ void test_month_day_last_formatter() {
stream_helper(STR("Feb/last"), February / last);

assert(format(STR("{:%B}"), June / last) == STR("June"));
throw_helper(STR("{:%d}"), June / last);
assert(format(STR("{:%d}"), June / last) == STR("30"));
throw_helper(STR("{:%d}"), February / last);
}

template <typename CharT>
Expand Down