diff --git a/libstdc++-v3/include/bits/chrono_io.h b/libstdc++-v3/include/bits/chrono_io.h index 72c66a0fef0..e7e7deb2cde 100644 --- a/libstdc++-v3/include/bits/chrono_io.h +++ b/libstdc++-v3/include/bits/chrono_io.h @@ -156,6 +156,7 @@ namespace __detail namespace __detail { // An unspecified type returned by `chrono::local_time_format`. + // This is called `local-time-format-t` in the standard. template struct __local_time_fmt { @@ -163,8 +164,6 @@ namespace __detail const string* _M_abbrev; const seconds* _M_offset_sec; }; - - struct __local_fmt_t; } /// @endcond @@ -695,13 +694,34 @@ namespace __format using ::std::chrono::__detail::__utc_leap_second; using ::std::chrono::__detail::__local_time_fmt; + basic_ostringstream<_CharT> __os; + __os.imbue(_M_locale(__fc)); + if constexpr (__is_specialization_of<_Tp, __local_time_fmt>) - return _M_format_to_ostream(__t._M_time, __fc, false); + { + // Format as "{:L%F %T}" + auto __days = chrono::floor(__t._M_time); + __os << chrono::year_month_day(__days) << ' ' + << chrono::hh_mm_ss(__t._M_time - __days); + + // For __local_time_fmt the __is_neg flags says whether to + // append " %Z" to the result. + if (__is_neg) + { + if (!__t._M_abbrev) [[unlikely]] + __format::__no_timezone_available(); + else if constexpr (is_same_v<_CharT, char>) + __os << ' ' << *__t._M_abbrev; + else + { + __os << L' '; + for (char __c : *__t._M_abbrev) + __os << __c; + } + } + } else { - basic_ostringstream<_CharT> __os; - __os.imbue(_M_locale(__fc)); - if constexpr (__is_specialization_of<_Tp, __utc_leap_second>) __os << __t._M_date << ' ' << __t._M_time; else if constexpr (chrono::__is_time_point_v<_Tp>) @@ -727,11 +747,11 @@ namespace __format __os << _S_plus_minus[1]; __os << __t; } - - auto __str = std::move(__os).str(); - return __format::__write_padded_as_spec(__str, __str.size(), - __fc, _M_spec); } + + auto __str = std::move(__os).str(); + return __format::__write_padded_as_spec(__str, __str.size(), + __fc, _M_spec); } static constexpr const _CharT* _S_chars @@ -2008,6 +2028,8 @@ namespace __format _FormatContext& __fc) const { // Convert to __local_time_fmt with abbrev "TAI" and offset 0s. + // We use __local_time_fmt and not sys_time (as the standard implies) + // because %Z for sys_time would print "UTC" and we want "TAI" here. // Offset is 1970y/January/1 - 1958y/January/1 constexpr chrono::days __tai_offset = chrono::days(4383); @@ -2038,6 +2060,8 @@ namespace __format _FormatContext& __fc) const { // Convert to __local_time_fmt with abbrev "GPS" and offset 0s. + // We use __local_time_fmt and not sys_time (as the standard implies) + // because %Z for sys_time would print "UTC" and we want "GPS" here. // Offset is 1980y/January/Sunday[1] - 1970y/January/1 constexpr chrono::days __gps_offset = chrono::days(3657); @@ -2104,7 +2128,7 @@ namespace __format typename _FormatContext::iterator format(const chrono::__detail::__local_time_fmt<_Duration>& __t, _FormatContext& __ctx) const - { return _M_f._M_format(__t, __ctx); } + { return _M_f._M_format(__t, __ctx, /* use %Z for {} */ true); } private: __format::__formatter_chrono<_CharT> _M_f; diff --git a/libstdc++-v3/testsuite/std/time/clock/gps/io.cc b/libstdc++-v3/testsuite/std/time/clock/gps/io.cc index d5405f61520..e995d9f3d78 100644 --- a/libstdc++-v3/testsuite/std/time/clock/gps/io.cc +++ b/libstdc++-v3/testsuite/std/time/clock/gps/io.cc @@ -22,7 +22,6 @@ test_ostream() ss << gt; VERIFY( ss.str() == "2000-01-01 00:00:13" ); - gps_time> gtf = gt; ss.str(""); ss.clear(); ss << (gps_time>(gt) + 20ms); diff --git a/libstdc++-v3/testsuite/std/time/clock/local/io.cc b/libstdc++-v3/testsuite/std/time/clock/local/io.cc index bb682cd40cf..b6e8b355bd0 100644 --- a/libstdc++-v3/testsuite/std/time/clock/local/io.cc +++ b/libstdc++-v3/testsuite/std/time/clock/local/io.cc @@ -7,15 +7,85 @@ void test_ostream() +{ + using namespace std::chrono; + + auto lt = local_time(1722198122s); + + std::ostringstream ss; + ss << lt; + auto s = ss.str(); + ss.str(""); + ss.clear(); + ss << sys_time{lt.time_since_epoch()}; + auto s2 = ss.str(); + VERIFY( s == s2 ); +} + +void +test_format() { using std::format; using namespace std::chrono; - auto st = sys_days{2000y/January/1}; - auto tt = clock_cast(st); + auto lt = local_seconds(1722198122s); - auto s = format("{0:%F %T %Z} == {1:%F %T %Z}", st, tt); - VERIFY( s == "2000-01-01 00:00:00 UTC == 2000-01-01 00:00:32 TAI" ); +#if __cpp_exceptions + auto args = std::make_format_args(lt); + try + { + (void) std::vformat("{:%Z}", args); + VERIFY(false); + } + catch (const std::format_error&) + { + } + try + { + (void) std::vformat("{:%z}", args); + VERIFY(false); + } + catch (const std::format_error&) + { + } +#endif + + auto s = format("{0:%F %T %a}", lt); + VERIFY( s == "2024-07-28 20:22:02 Sun" ); + + s = format("{}", lt); + VERIFY( s == "2024-07-28 20:22:02" ); + + // Test formatting for chrono::local_time_format and local-time-format-t too: + auto ltf = local_time_format(lt); + s = std::format("{:%F %T %a %b}", ltf); + VERIFY( s == "2024-07-28 20:22:02 Sun Jul" ); +#if __cpp_exceptions + try + { + (void) std::format("{:%Z}", ltf); + VERIFY(false); + } + catch (const std::format_error&) + { + } + try + { + (void) std::format("{:%z}", ltf); + VERIFY(false); + } + catch (const std::format_error&) + { + } +#endif + std::string abbrev = "FOO"; + seconds off = -3600s; + ltf = local_time_format(lt, &abbrev, &off); + s = std::format("{}", ltf); + VERIFY( s == "2024-07-28 20:22:02 FOO" ); + s = std::format("{:%Z %T %F %z %Ez}", ltf); + __builtin_puts(s.c_str()); + VERIFY( s == "FOO 20:22:02 2024-07-28 -0100 -01:00" ); } void diff --git a/libstdc++-v3/testsuite/std/time/clock/system/io.cc b/libstdc++-v3/testsuite/std/time/clock/system/io.cc index 2cc116156f2..5c223a979c2 100644 --- a/libstdc++-v3/testsuite/std/time/clock/system/io.cc +++ b/libstdc++-v3/testsuite/std/time/clock/system/io.cc @@ -64,13 +64,19 @@ test_format() " | 25.708 | 17:26:25.708 | 1 | 51 | 51 | 1 | 51 | 12/19/22" " | 17:26:25 | 22 | 2022 | +0000 | UTC" ); + auto st = std::chrono::time_point_cast(t); auto loc = std::locale::classic(); auto smod = std::format(loc, "{:%Ec %EC %Od %Oe %OH %OI %Om %OM %OS %Ou %OU" " %Ow %OW %Ex %EX %Oy %Ey %EY %Ez %Oz}", t); s = std::format("{:%c %C %d %e %H %I %m %M %S %u %U" " %w %W %x %X %y %y %Y +00:00 +00:00}", - std::chrono::time_point_cast(t)); + st); VERIFY( smod == s ); + + s = std::format("{}", t); + VERIFY( s == "2022-12-19 17:26:25.708" ); + s = std::format("{0:} {0:=<21}", st); + VERIFY( s == "2022-12-19 17:26:25 2022-12-19 17:26:25==" ); } void diff --git a/libstdc++-v3/testsuite/std/time/clock/tai/io.cc b/libstdc++-v3/testsuite/std/time/clock/tai/io.cc index 0fd61c0e612..dc0c3d26477 100644 --- a/libstdc++-v3/testsuite/std/time/clock/tai/io.cc +++ b/libstdc++-v3/testsuite/std/time/clock/tai/io.cc @@ -16,6 +16,9 @@ test_ostream() auto s = format("{0:%F %T %Z} == {1:%F %T %Z}", st, tt); VERIFY( s == "2000-01-01 00:00:00 UTC == 2000-01-01 00:00:32 TAI" ); + + s = std::format("{:=>21}", tt); + VERIFY( s == "==2000-01-01 00:00:32" ); } void diff --git a/libstdc++-v3/testsuite/std/time/zoned_time/io.cc b/libstdc++-v3/testsuite/std/time/zoned_time/io.cc index 376b2734f19..ee3b9edba81 100644 --- a/libstdc++-v3/testsuite/std/time/zoned_time/io.cc +++ b/libstdc++-v3/testsuite/std/time/zoned_time/io.cc @@ -37,6 +37,7 @@ test_format() " | 25.708 | 12:26:25.708 | 1 | 51 | 51 | 1 | 51 | 12/19/22" " | 12:26:25 | 22 | 2022 | -0500 | EST" ); +#ifdef _GLIBCXX_USE_WCHAR_T std::wstring ws = std::format(L"{:%a | %A | %b | %B | %c" " | %C | %d | %D | %e | %F | %g | %G | %h" " | %H | %I | %j | %m | %M | %p | %r | %R" @@ -47,6 +48,7 @@ test_format() " | 12 | 12 | 353 | 12 | 26 | PM | 12:26:25 PM | 12:26" " | 25.708 | 12:26:25.708 | 1 | 51 | 51 | 1 | 51 | 12/19/22" " | 12:26:25 | 22 | 2022 | -0500 | EST" ); +#endif auto loc = std::locale::classic(); auto smod = std::format(loc, "{:%Ec %EC %Od %Oe %OH %OI %Om %OM %OS %Ou %OU" @@ -55,6 +57,15 @@ test_format() " %w %W %x %X %y %y %Y -05:00 -05:00}", zoned_time(zone, time_point_cast(t))); VERIFY( smod == s ); + + s = std::format("{}", zt); + VERIFY( s == "2022-12-19 12:26:25.708 EST" ); + s = std::format("{1:=>30}", 1, zt); + VERIFY( s == "===2022-12-19 12:26:25.708 EST" ); +#ifdef _GLIBCXX_USE_WCHAR_T + ws = std::format(L"{:+^34}", zoned_time(zone, t)); + VERIFY( ws == L"++2022-12-19 12:26:25.708000 EST++" ); +#endif } int main()