mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-24 03:14:08 +08:00
libstdc++: Handle invalid values in std::chrono pretty printers
This avoids an IndexError exception when printing invalid chrono::month or chrono::weekday values. libstdc++-v3/ChangeLog: * python/libstdcxx/v6/printers.py (StdChronoCalendarPrinter): Check for out-of-range month an weekday indices. * testsuite/libstdc++-prettyprinters/chrono.cc: Check invalid month and weekday values.
This commit is contained in:
parent
7723684faf
commit
c19b542a17
@ -2021,11 +2021,16 @@ class StdChronoCalendarPrinter:
|
||||
if typ == 'std::chrono::day':
|
||||
return '{}'.format(int(val['_M_d']))
|
||||
if typ == 'std::chrono::month':
|
||||
if m < 1 or m >= len(months):
|
||||
return "%d is not a valid month" % m
|
||||
return months[m]
|
||||
if typ == 'std::chrono::year':
|
||||
return '{}y'.format(y)
|
||||
if typ == 'std::chrono::weekday':
|
||||
return '{}'.format(weekdays[val['_M_wd']])
|
||||
wd = val['_M_wd']
|
||||
if wd < 0 or wd >= len(weekdays):
|
||||
return "%d is not a valid weekday" % wd
|
||||
return '{}'.format(weekdays[wd])
|
||||
if typ == 'std::chrono::weekday_indexed':
|
||||
return '{}[{}]'.format(val['_M_wd'], int(val['_M_index']))
|
||||
if typ == 'std::chrono::weekday_last':
|
||||
|
@ -75,6 +75,13 @@ main()
|
||||
[[maybe_unused]] year_month_weekday_last donnerstag = 2017y/July/Thursday[last];
|
||||
// { dg-final { note-test donnerstag {2017y/July/Thursday[last]} } }
|
||||
|
||||
[[maybe_unused]] month nam(13);
|
||||
// { dg-final { note-test nam {13 is not a valid month} } }
|
||||
[[maybe_unused]] month nam0(0);
|
||||
// { dg-final { note-test nam0 {0 is not a valid month} } }
|
||||
[[maybe_unused]] weekday nawd(8);
|
||||
// { dg-final { note-test nawd {8 is not a valid weekday} } }
|
||||
//
|
||||
hh_mm_ss<seconds> hms(4h + 3min + 2s);
|
||||
// { dg-final { note-test hms {04:03:02} } }
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user