From: Rüdiger Sonderfeld Date: Tue, 14 Oct 2014 17:01:25 +0000 (+0000) Subject: re PR libstdc++/54354 (TODO extended iomanip manipulators std::get_time and std:... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ffffc732ef3720191ac96ac1ee540fd3d7f09dae;p=gcc.git re PR libstdc++/54354 (TODO extended iomanip manipulators std::get_time and std::put_time (C++11, section 27.7.5)) 2014-10-14 Rüdiger Sonderfeld PR libstdc++/54354 * include/std/iomanip (_Put_time): New struct. (put_time): New manipulator. (operator<<): New overloaded function. * testsuite/27_io/manipulators/extended/put_time/char/1.cc: New. * testsuite/27_io/manipulators/extended/put_time/char/2.cc: New. * testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc: New. * testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc: New. From-SVN: r216211 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d7590a0cd6d..3175c8c508d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2014-10-14 Rüdiger Sonderfeld + + PR libstdc++/54354 + * include/std/iomanip (_Put_time): New struct. + (put_time): New manipulator. + (operator<<): New overloaded function. + * testsuite/27_io/manipulators/extended/put_time/char/1.cc: New. + * testsuite/27_io/manipulators/extended/put_time/char/2.cc: New. + * testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc: New. + * testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc: New. + 2014-10-14 Kai Tietz PR libstdc++/57440 diff --git a/libstdc++-v3/include/std/iomanip b/libstdc++-v3/include/std/iomanip index 9625d43f00f..fce74c95f01 100644 --- a/libstdc++-v3/include/std/iomanip +++ b/libstdc++-v3/include/std/iomanip @@ -337,6 +337,61 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return __os; } + template + struct _Put_time + { + const std::tm* _M_tmb; + const _CharT* _M_fmt; + }; + + /** + * @brief Extended manipulator for formatting time. + * + * This manipulator uses time_put::put to format time. + * [ext.manip] + * + * @param __tmb struct tm time data to format. + * @param __fmt format string. + */ + template + inline _Put_time<_CharT> + put_time(const std::tm* __tmb, const _CharT* __fmt) + { return { __tmb, __fmt }; } + + template + basic_ostream<_CharT, _Traits>& + operator<<(basic_ostream<_CharT, _Traits>& __os, _Put_time<_CharT> __f) + { + typename basic_ostream<_CharT, _Traits>::sentry __cerb(__os); + if (__cerb) + { + ios_base::iostate __err = ios_base::goodbit; + __try + { + typedef ostreambuf_iterator<_CharT, _Traits> _Iter; + typedef time_put<_CharT, _Iter> _TimePut; + + const _CharT* const __fmt_end = __f._M_fmt + + _Traits::length(__f._M_fmt); + + const _TimePut& __mp = use_facet<_TimePut>(__os.getloc()); + if (__mp.put(_Iter(__os.rdbuf()), __os, __os.fill(), + __f._M_tmb, __f._M_fmt, __fmt_end).failed()) + __err |= ios_base::badbit; + } + __catch(__cxxabiv1::__forced_unwind&) + { + __os._M_setstate(ios_base::badbit); + __throw_exception_again; + } + __catch(...) + { __os._M_setstate(ios_base::badbit); } + if (__err) + __os.setstate(__err); + } + return __os; + } + #if __cplusplus > 201103L #define __cpp_lib_quoted_string_io 201304 diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/1.cc new file mode 100644 index 00000000000..76e64ea0843 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/1.cc @@ -0,0 +1,44 @@ +// { dg-options " -std=gnu++11 " } + +// 2014-04-14 Rüdiger Sonderfeld + +// Copyright (C) 2014 Free Software Foundation, Inc. +// +// 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 3, 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 COPYING3. If not see +// . + +// 27.7.5. (C++11) Extended manipulators [ext.manip]: put_time + +#include +#include +#include +#include + +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + locale loc_c = locale::classic(); + ostringstream oss; + oss.imbue(loc_c); + const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0); + oss << put_time(&time1, "%a %Y"); + VERIFY(oss.str() == "Sun 1971"); +} + +int main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc new file mode 100644 index 00000000000..bc3a387a06b --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc @@ -0,0 +1,47 @@ +// { dg-require-namedlocale "de_DE.utf8" } +// { dg-options " -std=gnu++11 " } + +// 2014-04-14 Rüdiger Sonderfeld + +// Copyright (C) 2014 Free Software Foundation, Inc. +// +// 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 3, 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 COPYING3. If not see +// . + +// 27.7.5. (C++11) Extended manipulators [ext.manip]: put_time + +#include +#include +#include +#include + +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + locale loc_c = locale::classic(); + locale loc_de = locale("de_DE.utf8"); + VERIFY( loc_de != loc_c ); + ostringstream oss; + oss.imbue(loc_de); + const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0); + oss << put_time(&time1, "%A %Y"); + VERIFY(oss.str() == "Sonntag 1971"); +} + +int main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc new file mode 100644 index 00000000000..3b5d5fa10db --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/1.cc @@ -0,0 +1,44 @@ +// { dg-options " -std=gnu++11 " } + +// 2014-04-14 Rüdiger Sonderfeld + +// Copyright (C) 2014 Free Software Foundation, Inc. +// +// 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 3, 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 COPYING3. If not see +// . + +// 27.7.5. (C++11) Extended manipulators [ext.manip]: put_time + +#include +#include +#include +#include + +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + locale loc_c = locale::classic(); + wostringstream oss; + oss.imbue(loc_c); + const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0); + oss << put_time(&time1, L"%a %Y"); + VERIFY(oss.str() == L"Sun 1971"); +} + +int main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc new file mode 100644 index 00000000000..7dc90d05248 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc @@ -0,0 +1,47 @@ +// { dg-require-namedlocale "de_DE.utf8" } +// { dg-options " -std=gnu++11 " } + +// 2014-04-14 Rüdiger Sonderfeld + +// Copyright (C) 2014 Free Software Foundation, Inc. +// +// 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 3, 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 COPYING3. If not see +// . + +// 27.7.5. (C++11) Extended manipulators [ext.manip]: put_time + +#include +#include +#include +#include + +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + locale loc_c = locale::classic(); + locale loc_de = locale("de_DE.utf8"); + VERIFY( loc_de != loc_c ); + wostringstream oss; + oss.imbue(loc_de); + const tm time1 = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0); + oss << put_time(&time1, L"%A %Y"); + VERIFY(oss.str() == L"Sonntag 1971"); +} + +int main() +{ + test01(); +}