locale_conv.h (wstring_convert, [...]): New.
authorJonathan Wakely <jwakely@redhat.com>
Fri, 16 Jan 2015 23:38:48 +0000 (23:38 +0000)
committerJonathan Wakely <redi@gcc.gnu.org>
Fri, 16 Jan 2015 23:38:48 +0000 (23:38 +0000)
* include/bits/locale_conv.h (wstring_convert, wbuffer_convert): New.
* include/std/locale: Include new header.
* include/Makefile.am: Add it.
* include/Makefile.in: Regenerate.
* testsuite/22_locale/conversions/buffer/requirements/typedefs.cc: New.
* testsuite/22_locale/conversions/string/1.cc: New.
* testsuite/22_locale/conversions/string/2.cc: New.
* testsuite/22_locale/conversions/string/requirements/typedefs.cc: New.
* testsuite/22_locale/conversions/string/requirements/typedefs-2.cc:
New.

From-SVN: r219780

libstdc++-v3/ChangeLog
libstdc++-v3/include/Makefile.am
libstdc++-v3/include/Makefile.in
libstdc++-v3/include/bits/locale_conv.h [new file with mode: 0644]
libstdc++-v3/include/std/locale
libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc [new file with mode: 0644]
libstdc++-v3/testsuite/22_locale/conversions/string/1.cc [new file with mode: 0644]
libstdc++-v3/testsuite/22_locale/conversions/string/2.cc [new file with mode: 0644]
libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs-2.cc [new file with mode: 0644]
libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc [new file with mode: 0644]

index cd4f0891ad486eaae0c1c80c6616c07bf2cdf250..cf4033c0891bc5687e69aa288aa339713c630ac0 100644 (file)
@@ -1,3 +1,16 @@
+2015-01-16  Jonathan Wakely  <jwakely@redhat.com>
+
+       * include/bits/locale_conv.h (wstring_convert, wbuffer_convert): New.
+       * include/std/locale: Include new header.
+       * include/Makefile.am: Add it.
+       * include/Makefile.in: Regenerate.
+       * testsuite/22_locale/conversions/buffer/requirements/typedefs.cc: New.
+       * testsuite/22_locale/conversions/string/1.cc: New.
+       * testsuite/22_locale/conversions/string/2.cc: New.
+       * testsuite/22_locale/conversions/string/requirements/typedefs.cc: New.
+       * testsuite/22_locale/conversions/string/requirements/typedefs-2.cc:
+       New.
+
 2015-01-16  Jonathan Wakely  <jwakely@redhat.com>
 
        * config/abi/pre/gnu.ver: Export new symbols.
index 285a504dbf906c21c98a33362f203e426e8dfdb4..267713224953a55a224d7d74a724f5affa2f53e5 100644 (file)
@@ -113,6 +113,7 @@ bits_headers = \
        ${bits_srcdir}/list.tcc \
        ${bits_srcdir}/locale_classes.h \
        ${bits_srcdir}/locale_classes.tcc \
+       ${bits_srcdir}/locale_conv.h \
        ${bits_srcdir}/locale_facets.h \
        ${bits_srcdir}/locale_facets.tcc \
        ${bits_srcdir}/locale_facets_nonio.h \
index 5c2ea1496c98271e527c997678d1cb94cfce69d1..9c423cb4341861be95f8a45c8e094655b004eb4a 100644 (file)
@@ -381,6 +381,7 @@ bits_headers = \
        ${bits_srcdir}/list.tcc \
        ${bits_srcdir}/locale_classes.h \
        ${bits_srcdir}/locale_classes.tcc \
+       ${bits_srcdir}/locale_conv.h \
        ${bits_srcdir}/locale_facets.h \
        ${bits_srcdir}/locale_facets.tcc \
        ${bits_srcdir}/locale_facets_nonio.h \
diff --git a/libstdc++-v3/include/bits/locale_conv.h b/libstdc++-v3/include/bits/locale_conv.h
new file mode 100644 (file)
index 0000000..c8a44f4
--- /dev/null
@@ -0,0 +1,464 @@
+// wstring_convert implementation -*- C++ -*-
+
+// Copyright (C) 2012 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+/** @file bits/locale_conv.h
+ *  This is an internal header file, included by other library headers.
+ *  Do not attempt to use it directly. @headername{locale}
+ */
+
+#ifndef _LOCALE_CONV_H
+#define _LOCALE_CONV_H 1
+
+#if __cplusplus < 201103L
+# include <bits/c++0x_warning.h>
+#else
+
+#include <streambuf>
+#include "stringfwd.h"
+#include "allocator.h"
+#include "codecvt.h"
+#include "unique_ptr.h"
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+
+  /**
+   * @addtogroup locales
+   * @{
+   */
+
+  /// String conversions
+  template<typename _Codecvt, typename _Elem = wchar_t,
+          typename _Wide_alloc = allocator<_Elem>,
+          typename _Byte_alloc = allocator<char>>
+    class wstring_convert
+    {
+    public:
+      typedef basic_string<char, char_traits<char>, _Byte_alloc>   byte_string;
+      typedef basic_string<_Elem, char_traits<_Elem>, _Wide_alloc> wide_string;
+      typedef typename _Codecvt::state_type                       state_type;
+      typedef typename wide_string::traits_type::int_type         int_type;
+
+      /** Default constructor.
+       *
+       * @param  __pcvt The facet to use for conversions.
+       *
+       * Takes ownership of @p __pcvt and will delete it in the destructor.
+       */
+      explicit
+      wstring_convert(_Codecvt* __pcvt = new _Codecvt()) : _M_cvt(__pcvt)
+      {
+       if (!_M_cvt)
+         __throw_logic_error("wstring_convert");
+      }
+
+      /** Construct with an initial converstion state.
+       *
+       * @param  __pcvt The facet to use for conversions.
+       * @param  __state Initial conversion state.
+       *
+       * Takes ownership of @p __pcvt and will delete it in the destructor.
+       * The object's conversion state will persist between conversions.
+       */
+      wstring_convert(_Codecvt* __pcvt, state_type __state)
+      : _M_cvt(__pcvt), _M_state(__state), _M_with_cvtstate(true)
+      {
+       if (!_M_cvt)
+         __throw_logic_error("wstring_convert");
+      }
+
+      /** Construct with error strings.
+       *
+       * @param  __byte_err A string to return on failed conversions.
+       * @param  __wide_err A wide string to return on failed conversions.
+       */
+      explicit
+      wstring_convert(const byte_string& __byte_err,
+                     const wide_string& __wide_err = wide_string())
+      : _M_cvt(new _Codecvt),
+       _M_byte_err_string(__byte_err), _M_wide_err_string(__wide_err),
+       _M_with_strings(true)
+      {
+       if (!_M_cvt)
+         __throw_logic_error("wstring_convert");
+      }
+
+      ~wstring_convert() = default;
+
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 2176. Special members for wstring_convert and wbuffer_convert
+      wstring_convert(const wstring_convert&) = delete;
+      wstring_convert& operator=(const wstring_convert&) = delete;
+
+      /// @{ Convert from bytes.
+      wide_string
+      from_bytes(char __byte)
+      {
+       char __bytes[2] = { __byte };
+       return from_bytes(__bytes, __bytes+1);
+      }
+
+      wide_string
+      from_bytes(const char* __ptr)
+      { return from_bytes(__ptr, __ptr+char_traits<char>::length(__ptr)); }
+
+      wide_string
+      from_bytes(const byte_string& __str)
+      {
+       auto __ptr = __str.data();
+       return from_bytes(__ptr, __ptr + __str.size());
+      }
+
+      wide_string
+      from_bytes(const char* __first, const char* __last)
+      {
+       auto __errstr = _M_with_strings ? &_M_wide_err_string : nullptr;
+       _ConvFn<char, _Elem> __fn = &_Codecvt::in;
+       return _M_conv(__first, __last, __errstr, __fn);
+      }
+      /// @}
+
+      /// @{ Convert to bytes.
+      byte_string
+      to_bytes(_Elem __wchar)
+      {
+       _Elem __wchars[2] = { __wchar };
+       return to_bytes(__wchars, __wchars+1);
+      }
+
+      byte_string
+      to_bytes(const _Elem* __ptr)
+      {
+       return to_bytes(__ptr, __ptr+wide_string::traits_type::length(__ptr));
+      }
+
+      byte_string
+      to_bytes(const wide_string& __wstr)
+      {
+       auto __ptr = __wstr.data();
+       return to_bytes(__ptr, __ptr + __wstr.size());
+      }
+
+      byte_string
+      to_bytes(const _Elem* __first, const _Elem* __last)
+      {
+       auto __errstr = _M_with_strings ? &_M_byte_err_string : nullptr;
+       _ConvFn<_Elem, char> __fn = &_Codecvt::out;
+       return _M_conv(__first, __last, __errstr, __fn);
+      }
+      /// @}
+
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 2174. wstring_convert::converted() should be noexcept
+      /// The number of elements successfully converted in the last conversion.
+      size_t converted() const noexcept { return _M_count; }
+
+      /// The final conversion state of the last conversion.
+      state_type state() const { return _M_state; }
+
+    private:
+      template<typename _InC, typename _OutC>
+       using _ConvFn
+         = codecvt_base::result
+           (_Codecvt::*)(state_type&, const _InC*, const _InC*, const _InC*&,
+                         _OutC*, _OutC*, _OutC*&) const;
+
+      template<typename _InChar, typename _OutStr, typename _MemFn>
+       _OutStr
+       _M_conv(const _InChar* __first, const _InChar* __last,
+               const _OutStr* __err, _MemFn __memfn)
+       {
+         if (!_M_with_cvtstate)
+           _M_state = state_type();
+
+         auto __outstr = __err ? _OutStr(__err->get_allocator()) : _OutStr();
+         size_t __outchars = 0;
+         auto __next = __first;
+
+         codecvt_base::result __result;
+         do
+           {
+             __outstr.resize(__outstr.size() + (__last - __next));
+             auto __outnext = &__outstr.front() + __outchars;
+             auto const __outlast = &__outstr.back() + 1;
+             __result = ((*_M_cvt).*__memfn)(_M_state, __next, __last, __next,
+                                           __outnext, __outlast, __outnext);
+             __outchars = __outnext - &__outstr.front();
+           }
+         while (__result == codecvt_base::partial && __next != __last);
+
+         __outstr.resize(__outchars);
+         _M_count = __next - __first;
+
+         if (__result != codecvt_base::error)
+           return __outstr;
+         else if (__err)
+           return *__err;
+         else
+           __throw_range_error("wstring_convert");
+       }
+
+      unique_ptr<_Codecvt>     _M_cvt;
+      byte_string              _M_byte_err_string;
+      wide_string              _M_wide_err_string;
+      state_type               _M_state = state_type();
+      size_t                   _M_count = 0;
+      bool                     _M_with_cvtstate = false;
+      bool                     _M_with_strings = false;
+    };
+
+  /// Buffer conversions
+  template<typename _Codecvt, typename _Elem = wchar_t,
+          typename _Tr = char_traits<_Elem>>
+    class wbuffer_convert : public basic_streambuf<_Elem, _Tr>
+    {
+      typedef basic_streambuf<_Elem, _Tr> _Wide_streambuf;
+
+    public:
+      typedef typename _Codecvt::state_type state_type;
+
+      /** Default constructor.
+       *
+       * @param  __bytebuf The underlying byte stream buffer.
+       * @param  __pcvt    The facet to use for conversions.
+       * @param  __state   Initial conversion state.
+       *
+       * Takes ownership of @p __pcvt and will delete it in the destructor.
+       */
+      explicit
+      wbuffer_convert(streambuf* __bytebuf = 0, _Codecvt* __pcvt = new _Codecvt,
+                     state_type __state = state_type())
+      : _M_buf(__bytebuf), _M_cvt(__pcvt), _M_state(__state)
+      {
+       if (!_M_cvt)
+         __throw_logic_error("wstring_convert");
+
+       _M_always_noconv = _M_cvt->always_noconv();
+
+       if (_M_buf)
+         {
+           this->setp(_M_put_area, _M_put_area + _S_buffer_length);
+           this->setg(_M_get_area + _S_putback_length,
+                      _M_get_area + _S_putback_length,
+                      _M_get_area + _S_putback_length);
+         }
+      }
+
+      ~wbuffer_convert() = default;
+
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 2176. Special members for wstring_convert and wbuffer_convert
+      wbuffer_convert(const wbuffer_convert&) = delete;
+      wbuffer_convert& operator=(const wbuffer_convert&) = delete;
+
+      streambuf* rdbuf() const noexcept { return _M_buf; }
+
+      streambuf*
+      rdbuf(streambuf *__bytebuf) noexcept
+      {
+       auto __prev = _M_buf;
+       _M_buf = __bytebuf;
+       return __prev;
+      }
+
+      /// The conversion state following the last conversion.
+      state_type state() const noexcept { return _M_state; }
+
+    protected:
+      int
+      sync()
+      { return _M_buf && _M_conv_put() && _M_buf->pubsync() ? 0 : -1; }
+
+      typename _Wide_streambuf::int_type
+      overflow(typename _Wide_streambuf::int_type __out)
+      {
+       if (!_M_buf || !_M_conv_put())
+         return _Tr::eof();
+       else if (!_Tr::eq_int_type(__out, _Tr::eof()))
+         return this->sputc(__out);
+       return _Tr::not_eof(__out);
+      }
+
+      typename _Wide_streambuf::int_type
+      underflow()
+      {
+       if (!_M_buf)
+         return _Tr::eof();
+
+       if (this->gptr() < this->egptr() || (_M_buf && _M_conv_get()))
+         return _Tr::to_int_type(*this->gptr());
+       else
+         return _Tr::eof();
+      }
+
+      streamsize
+      xsputn(const typename _Wide_streambuf::char_type* __s, streamsize __n)
+      {
+       if (!_M_buf || __n == 0)
+         return 0;
+       streamsize __done = 0;
+       do
+       {
+         auto __nn = std::min<streamsize>(this->epptr() - this->pptr(),
+                                          __n - __done);
+         _Tr::copy(this->pptr(), __s + __done, __nn);
+         this->pbump(__nn);
+         __done += __nn;
+       } while (__done < __n && _M_conv_put());
+       return __done;
+      }
+
+    private:
+      // fill the get area from converted contents of the byte stream buffer
+      bool
+      _M_conv_get()
+      {
+       const streamsize __pb1 = this->gptr() - this->eback();
+       const streamsize __pb2 = _S_putback_length;
+       const streamsize __npb = std::min(__pb1, __pb2);
+
+       _Tr::move(_M_get_area + _S_putback_length - __npb,
+                 this->gptr() - __npb, __npb);
+
+       streamsize __nbytes = sizeof(_M_get_buf) - _M_unconv;
+       __nbytes = std::min(__nbytes, _M_buf->in_avail());
+       if (__nbytes < 1)
+         __nbytes == 1;
+       __nbytes = _M_buf->sgetn(_M_get_buf + _M_unconv, __nbytes);
+       if (__nbytes < 1)
+         return false;
+       __nbytes += _M_unconv;
+
+       // convert _M_get_buf into _M_get_area
+
+       _Elem* __outbuf = _M_get_area + _S_putback_length;
+       _Elem* __outnext = __outbuf;
+       const char* __bnext = _M_get_buf;
+
+       codecvt_base::result __result;
+       if (_M_always_noconv)
+         __result = codecvt_base::noconv;
+       else
+         {
+           _Elem* __outend = _M_get_area + _S_buffer_length;
+
+           __result = _M_cvt->in(_M_state,
+                                 __bnext, __bnext + __nbytes, __bnext,
+                                 __outbuf, __outend, __outnext);
+         }
+
+       if (__result == codecvt_base::noconv)
+         {
+           // cast is safe because noconv means _Elem is same type as char
+           auto __get_buf = reinterpret_cast<const _Elem*>(_M_get_buf);
+           _Tr::copy(__outbuf, __get_buf, __nbytes);
+           _M_unconv = 0;
+           return true;
+         }
+
+       if ((_M_unconv = _M_get_buf + __nbytes - __bnext))
+         char_traits<char>::move(_M_get_buf, __bnext, _M_unconv);
+
+       this->setg(__outbuf, __outbuf, __outnext);
+
+       return __result != codecvt_base::error;
+      }
+
+      // unused
+      bool
+      _M_put(...)
+      { return false; }
+
+      bool
+      _M_put(const char* __p, streamsize __n)
+      {
+       if (_M_buf->sputn(__p, __n) < __n)
+         return false;
+      }
+
+      // convert the put area and write to the byte stream buffer
+      bool
+      _M_conv_put()
+      {
+       _Elem* const __first = this->pbase();
+       const _Elem* const __last = this->pptr();
+       const streamsize __pending = __last - __first;
+
+       if (_M_always_noconv)
+         return _M_put(__first, __pending);
+
+       char __outbuf[2 * _S_buffer_length];
+
+       const _Elem* __next = __first;
+       const _Elem* __start;
+       do
+         {
+           __start = __next;
+           char* __outnext = __outbuf;
+           char* const __outlast = __outbuf + sizeof(__outbuf);
+           auto __result = _M_cvt->out(_M_state, __next, __last, __next,
+                                       __outnext, __outlast, __outnext);
+           if (__result == codecvt_base::error)
+             return false;
+           else if (__result == codecvt_base::noconv)
+             return _M_put(__next, __pending);
+
+           if (!_M_put(__outbuf, __outnext - __outbuf))
+               return false;
+         }
+       while (__next != __last && __next != __start);
+
+       if (__next != __last)
+         _Tr::move(__first, __next, __last - __next);
+
+       this->pbump(__first - __next);
+       return __next != __first;
+      }
+
+      streambuf*               _M_buf;
+      unique_ptr<_Codecvt>     _M_cvt;
+      state_type               _M_state;
+
+      static const streamsize  _S_buffer_length = 32;
+      static const streamsize  _S_putback_length = 3;
+      _Elem                     _M_put_area[_S_buffer_length];
+      _Elem                     _M_get_area[_S_buffer_length];
+      streamsize               _M_unconv = 0;
+      char                     _M_get_buf[_S_buffer_length-_S_putback_length];
+      bool                     _M_always_noconv;
+    };
+
+  /// @} group locales
+
+#endif  // _GLIBCXX_USE_WCHAR_T
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
+
+#endif // __cplusplus
+
+#endif /* _LOCALE_CONV_H */
index fbc2770ba18b3b976a289d2e5e94a2a1e8c5b010..102004fc3de346b179ca9de1d98f198e33627b5c 100644 (file)
@@ -39,5 +39,8 @@
 #include <bits/locale_classes.h>
 #include <bits/locale_facets.h>
 #include <bits/locale_facets_nonio.h>
+#if __cplusplus >= 201103L
+#  include <bits/locale_conv.h>
+#endif
 
 #endif /* _GLIBCXX_LOCALE */
diff --git a/libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc b/libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc
new file mode 100644 (file)
index 0000000..c59c6d6
--- /dev/null
@@ -0,0 +1,36 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++11" }
+
+// Copyright (C) 2012 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 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
+// <http://www.gnu.org/licenses/>.
+
+// 22.3.3.2.3  Buffer conversions
+
+#include <locale>
+#include <type_traits>
+
+void test01()
+{
+  // Check for required typedefs
+  struct cvt_type : std::codecvt<wchar_t, char, mbstate_t> { };
+  typedef std::char_traits<wchar_t> traits_type;
+  typedef std::wbuffer_convert<cvt_type, wchar_t, traits_type> test_type;
+  typedef test_type::state_type state_type;
+
+  static_assert( std::is_same<cvt_type::state_type, state_type>::value,
+                "state type" );
+}
diff --git a/libstdc++-v3/testsuite/22_locale/conversions/string/1.cc b/libstdc++-v3/testsuite/22_locale/conversions/string/1.cc
new file mode 100644 (file)
index 0000000..c2ab6e7
--- /dev/null
@@ -0,0 +1,74 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++11" }
+
+// Copyright (C) 2012 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 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
+// <http://www.gnu.org/licenses/>.
+
+// 22.3.3.2.2  String conversions
+
+#include <locale>
+#include <string>
+#include <testsuite_hooks.h>
+
+template<typename Elem>
+struct cvt : std::codecvt<Elem, char, std::mbstate_t> { };
+
+template<typename Elem>
+using str_conv = std::wstring_convert<cvt<Elem>, Elem>;
+
+using std::string;
+using std::wstring;
+
+void test01()
+{
+  typedef str_conv<char> sc;  // noconv
+  sc c;
+  string input = "King for a day...";
+  string output = c.from_bytes(input);
+  VERIFY( input == output );
+  VERIFY( c.converted() == output.length() );
+  string roundtrip = c.to_bytes(output);
+  VERIFY( input == roundtrip );
+  VERIFY( c.converted() == roundtrip.length() );
+}
+
+void test02()
+{
+  typedef str_conv<wchar_t> wsc;
+  wsc c;
+  string input = "Fool for a lifetime";
+  wstring output = c.from_bytes(input);
+  VERIFY( c.converted() == output.length() );
+  VERIFY( L"Fool for a lifetime" == output );
+  string roundtrip = c.to_bytes(output);
+  VERIFY( input == roundtrip );
+  VERIFY( c.converted() == roundtrip.length() );
+
+  VERIFY( c.from_bytes(input[0]) == output.substr(0, 1) );
+  VERIFY( c.from_bytes(input.c_str()) == output );
+  VERIFY( c.from_bytes(input.data(), input.data()+input.size()) == output );
+
+  VERIFY( c.to_bytes(output[0]) == input.substr(0, 1) );
+  VERIFY( c.to_bytes(output.c_str()) == input );
+  VERIFY( c.to_bytes(output.data(), output.data()+output.size()) == input );
+}
+
+int main()
+{
+  test01();
+  test02();
+}
diff --git a/libstdc++-v3/testsuite/22_locale/conversions/string/2.cc b/libstdc++-v3/testsuite/22_locale/conversions/string/2.cc
new file mode 100644 (file)
index 0000000..94eb75f
--- /dev/null
@@ -0,0 +1,60 @@
+// { dg-options "-std=gnu++11" }
+
+// Copyright (C) 2012 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 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
+// <http://www.gnu.org/licenses/>.
+
+// 22.3.3.2.2  String conversions
+
+#include <locale>
+#include <string>
+#include <testsuite_hooks.h>
+
+template<typename Elem>
+struct cvt : std::codecvt<Elem, char, std::mbstate_t> { };
+
+template<typename Elem>
+using str_conv = std::wstring_convert<cvt<Elem>, Elem>;
+
+using std::string;
+using std::wstring;
+
+// test conversion errors, with and without error strings
+
+void test01()
+{
+  typedef str_conv<wchar_t> sc;
+
+  const sc::byte_string berr = "invalid wide string";
+  const sc::wide_string werr = L"invalid byte string";
+
+  sc c(berr, werr);
+  string input = "Stop";
+  input += char(0xff);
+  input += char(0xff);
+  wstring woutput = c.from_bytes(input);
+  VERIFY( werr == woutput );
+  wstring winput = L"Stop";
+  winput += wchar_t(0xff);
+  winput += wchar_t(0xff);
+  string output = c.to_bytes(winput);
+  VERIFY( berr == output );
+}
+
+int main()
+{
+  test01();
+}
diff --git a/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs-2.cc
new file mode 100644 (file)
index 0000000..65a1458
--- /dev/null
@@ -0,0 +1,41 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++11" }
+
+// Copyright (C) 2012 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 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
+// <http://www.gnu.org/licenses/>.
+
+// 22.3.3.2.2  String conversions
+
+#include <locale>
+#include <string>
+#include <type_traits>
+#include <testsuite_allocator.h>
+
+template<typename T>
+  using alloc = __gnu_test::uneq_allocator<T>;
+
+template<typename C>
+  using Str = std::basic_string<C, std::char_traits<C>, alloc<C>>;
+
+struct cvt : std::codecvt<wchar_t, char, std::mbstate_t> { };
+
+using wconv = std::wstring_convert<cvt, wchar_t, alloc<wchar_t>, alloc<char>>;
+
+static_assert( std::is_same<wconv::byte_string, Str<char>>::value,
+              "byte string is std::string" );
+static_assert( std::is_same<wconv::wide_string, Str<wchar_t>>::value,
+              "wide string is std::wstring" );
diff --git a/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc b/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc
new file mode 100644 (file)
index 0000000..baed16e
--- /dev/null
@@ -0,0 +1,34 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++11" }
+
+// Copyright (C) 2012 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 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
+// <http://www.gnu.org/licenses/>.
+
+// 22.3.3.2.2  String conversions
+
+#include <locale>
+
+void test01()
+{
+  // Check for required typedefs
+  typedef std::codecvt<wchar_t, char, mbstate_t> codecvt_type;
+  typedef std::wstring_convert<codecvt_type> test_type;
+  typedef test_type::byte_string byte_string;
+  typedef test_type::wide_string wide_string;
+  typedef test_type::state_type state_type;
+  typedef test_type::int_type int_type;
+}