From f923a590c9e983c26f99624aa9f57bf872c7365e Mon Sep 17 00:00:00 2001 From: paolo Date: Sun, 29 Aug 2004 09:04:33 +0000 Subject: [PATCH] 2004-08-29 Paolo Carlini * include/bits/locale_facets.tcc (time_get<>::_M_extract_via_format, case 'S'): Allow for at least one leap-second (as per C99, 7.23.1 and 7.23.3.5), two if !_GLIBCXX_USE_C99. * testsuite/22_locale/time_get/get_time/char/4.cc: New. * testsuite/22_locale/time_get/get_time/wchar_t/4.cc: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86712 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 8 +++ libstdc++-v3/include/bits/locale_facets.tcc | 9 ++- .../22_locale/time_get/get_time/char/4.cc | 64 ++++++++++++++++++++++ .../22_locale/time_get/get_time/wchar_t/4.cc | 64 ++++++++++++++++++++++ 4 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/22_locale/time_get/get_time/char/4.cc create mode 100644 libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/4.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c77647b..c7d3ba6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2004-08-29 Paolo Carlini + + * include/bits/locale_facets.tcc (time_get<>::_M_extract_via_format, + case 'S'): Allow for at least one leap-second (as per C99, 7.23.1 + and 7.23.3.5), two if !_GLIBCXX_USE_C99. + * testsuite/22_locale/time_get/get_time/char/4.cc: New. + * testsuite/22_locale/time_get/get_time/wchar_t/4.cc: Likewise. + 2004-08-27 Jason Merrill PR c++/13684 diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index f7a9564..141138b 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1849,8 +1849,13 @@ namespace std __tm, __wcs); break; case 'S': - // Seconds. - __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 59, 2, + // Seconds. [tm_sec] + // [00, 60] in C99 (one leap-second), [00, 61] in C89. +#ifdef _GLIBCXX_USE_C99 + __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 60, 2, +#else + __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 61, 2, +#endif __io, __err); break; case 't': diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/4.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/4.cc new file mode 100644 index 0000000..bc7fd8b --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/4.cc @@ -0,0 +1,64 @@ +// 2004-08-29 Paolo Carlini + +// Copyright (C) 2004 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 22.2.5.1.1 time_get members + +#include +#include +#include + +// Allow for one leap-second (two if !_GLIBCXX_USE_C99). +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + typedef istreambuf_iterator iterator_type; + + // basic construction and sanity checks. + locale loc_c = locale::classic(); + + // create an istream-derived object, cache the time_get facet + iterator_type end; + istringstream iss; + iss.imbue(loc_c); + const time_get& tim_get = + use_facet >(iss.getloc()); + + const ios_base::iostate good = ios_base::goodbit; + ios_base::iostate errorstate = good; + + // create "C" time objects + const tm time_bday = { 60, 0, 12, 4, 3, 71, 0, 93, 0 }; + + iss.str("12:00:60 "); + iterator_type is_it01(iss); + tm time01; + errorstate = good; + tim_get.get_time(is_it01, end, iss, errorstate, &time01); + VERIFY( time01.tm_sec == time_bday.tm_sec ); + VERIFY( errorstate == ios_base::goodbit ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/4.cc new file mode 100644 index 0000000..04206ca --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/4.cc @@ -0,0 +1,64 @@ +// 2004-08-29 Paolo Carlini + +// Copyright (C) 2004 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 22.2.5.1.1 time_get members + +#include +#include +#include + +// Allow for one leap-second (two if !_GLIBCXX_USE_C99). +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + typedef istreambuf_iterator iterator_type; + + // basic construction and sanity checks. + locale loc_c = locale::classic(); + + // create an istream-derived object, cache the time_get facet + iterator_type end; + wistringstream iss; + iss.imbue(loc_c); + const time_get& tim_get = + use_facet >(iss.getloc()); + + const ios_base::iostate good = ios_base::goodbit; + ios_base::iostate errorstate = good; + + // create "C" time objects + const tm time_bday = { 60, 0, 12, 4, 3, 71, 0, 93, 0 }; + + iss.str(L"12:00:60 "); + iterator_type is_it01(iss); + tm time01; + errorstate = good; + tim_get.get_time(is_it01, end, iss, errorstate, &time01); + VERIFY( time01.tm_sec == time_bday.tm_sec ); + VERIFY( errorstate == ios_base::goodbit ); +} + +int main() +{ + test01(); + return 0; +} -- 2.7.4