2000-10-05 13:27:02 +02:00
|
|
|
// Locale support (codecvt) -*- C++ -*-
|
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
|
|
|
|
// Free Software Foundation, Inc.
|
2000-10-05 13:27:02 +02:00
|
|
|
//
|
|
|
|
// 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.
|
|
|
|
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
|
|
// library without restriction. Specifically, if other files instantiate
|
|
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
|
|
// this file and link it with other files to produce an executable, this
|
|
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
|
|
// the GNU General Public License. This exception does not however
|
|
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
|
|
// the GNU General Public License.
|
|
|
|
|
|
|
|
//
|
|
|
|
// ISO C++ 14882: 22.2.1.5 Template class codecvt
|
|
|
|
//
|
|
|
|
|
2005-01-07 20:34:46 +01:00
|
|
|
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
2000-10-05 13:27:02 +02:00
|
|
|
|
locale_facets.h (isspace, [...]): Add doxygen markup.
2004-11-22 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (isspace, isprint, isupper,
islower, isalpha, isdigit, ispunct, isxdigit, isalnum, isgraph,
toupper, tolower): Add doxygen markup.
(codecvt_byname, ctype_byname, numpunct_byname, collate_byname,
time_get_byname, time_put_byname, moneypunct_byname,
messages_byname): Same.
* include/std/std_fstream.h: Remove superfluous markup.
* include/std/std_sstream.h: Same.
* include/std/std_streambuf.h: Same.
* include/ext/enc_filebuf.h: Adjust markup.
* include/ext/stdio_filebuf.h: Same.
* include/ext/stdio_sync_filebuf.h: Same.
* include/bits/codecvt.h: Same.
* config/os/gnu-linux/ctype_base.h: Same.
* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Same.
* include/tr1/array: Add markup.
* include/tr1/tuple: Same.
* docs/doxygen/run_doxygen: Print arguments.
* docs/doxygen/user.cfg.in: Tweaks.
From-SVN: r91080
2004-11-23 10:18:41 +01:00
|
|
|
/** @file bits/codecvt.h
|
c_io_stdio.h: Correct grammar in comments.
2001-11-02 Phil Edwards <pme@gcc.gnu.org>
* config/io/c_io_stdio.h: Correct grammar in comments.
* docs/doxygen/Intro.3: Expand "top-level" man page.
* docs/doxygen/doxygroups.cc: New module definitions (comments).
* docs/doxygen/mainpage.doxy: Tweaks.
* docs/doxygen/run_doxygen: Update Doxygen version, massage man pages.
Add @file hooks so that headers are considered to be documented.
* include/bits/basic_ios.h, include/bits/basic_file.h,
include/bits/basic_string.h, include/bits/boost_concept_check.h,
include/bits/char_traits.h, include/bits/codecvt.h,
include/bits/concept_check.h, include/bits/cpp_type_traits.h,
include/bits/fpos.h, include/bits/gslice.h, include/bits/gslice_array.h,
include/bits/indirect_array.h, include/bits/ios_base.h,
include/bits/locale_facets.h, include/bits/localefwd.h,
include/bits/mask_array.h, include/bits/pthread_allocimpl.h,
include/bits/slice.h, include/bits/slice_array.h,
include/bits/std_algorithm.h, include/bits/std_bitset.h,
include/bits/std_complex.h, include/bits/std_deque.h,
include/bits/std_fstream.h, include/bits/std_functional.h,
include/bits/std_iomanip.h, include/bits/std_ios.h,
include/bits/std_iosfwd.h, include/bits/std_iostream.h,
include/bits/std_istream.h, include/bits/std_iterator.h,
include/bits/std_limits.h, include/bits/std_list.h,
include/bits/std_locale.h, include/bits/std_map.h,
include/bits/std_memory.h, include/bits/std_numeric.h,
include/bits/std_ostream.h, include/bits/std_queue.h,
include/bits/std_set.h, include/bits/std_sstream.h,
include/bits/std_stack.h, include/bits/std_streambuf.h,
include/bits/std_string.h, include/bits/std_utility.h,
include/bits/std_valarray.h, include/bits/std_vector.h,
include/bits/stl_algo.h, include/bits/stl_alloc.h,
include/bits/stl_bvector.h, include/bits/stl_construct.h,
include/bits/stl_deque.h, include/bits/stl_heap.h,
include/bits/stl_iterator.h, include/bits/stl_iterator_base_funcs.h,
include/bits/stl_iterator_base_types.h, include/bits/stl_list.h,
include/bits/stl_map.h, include/bits/stl_multimap.h,
include/bits/stl_multiset.h, include/bits/stl_numeric.h,
include/bits/stl_pair.h, include/bits/stl_pthread_alloc.h,
include/bits/stl_queue.h, include/bits/stl_raw_storage_iter.h,
include/bits/stl_relops.h, include/bits/stl_set.h,
include/bits/stl_stack.h, include/bits/stl_tempbuf.h,
include/bits/stl_threads.h, include/bits/stl_tree.h,
include/bits/stl_uninitialized.h, include/bits/stl_vector.h,
include/bits/stream_iterator.h, include/bits/streambuf_iterator.h,
include/bits/stringfwd.h, include/bits/type_traits.h,
include/bits/valarray_array.h, include/bits/valarray_meta.h:
Add hooks, tweak comments only.
* include/bits/stl_algobase.h (swap, min, iter_swap): Also
document these functions.
* include/bits/stl_function.h: Tweak link comments.
From-SVN: r46717
2001-11-02 18:38:11 +01:00
|
|
|
* This is an internal header file, included by other library headers.
|
|
|
|
* You should not attempt to use it directly.
|
|
|
|
*/
|
|
|
|
|
2003-07-05 06:05:45 +02:00
|
|
|
#ifndef _CODECVT_H
|
|
|
|
#define _CODECVT_H 1
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2001-02-19 19:52:25 +01:00
|
|
|
#pragma GCC system_header
|
|
|
|
|
locale_facets.h (isspace, [...]): Add doxygen markup.
2004-11-22 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (isspace, isprint, isupper,
islower, isalpha, isdigit, ispunct, isxdigit, isalnum, isgraph,
toupper, tolower): Add doxygen markup.
(codecvt_byname, ctype_byname, numpunct_byname, collate_byname,
time_get_byname, time_put_byname, moneypunct_byname,
messages_byname): Same.
* include/std/std_fstream.h: Remove superfluous markup.
* include/std/std_sstream.h: Same.
* include/std/std_streambuf.h: Same.
* include/ext/enc_filebuf.h: Adjust markup.
* include/ext/stdio_filebuf.h: Same.
* include/ext/stdio_sync_filebuf.h: Same.
* include/bits/codecvt.h: Same.
* config/os/gnu-linux/ctype_base.h: Same.
* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Same.
* include/tr1/array: Add markup.
* include/tr1/tuple: Same.
* docs/doxygen/run_doxygen: Print arguments.
* docs/doxygen/user.cfg.in: Tweaks.
From-SVN: r91080
2004-11-23 10:18:41 +01:00
|
|
|
/// @brief Empty base class for codecvt facet [22.2.1.5].
|
2000-10-05 13:27:02 +02:00
|
|
|
class codecvt_base
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
enum result
|
|
|
|
{
|
|
|
|
ok,
|
|
|
|
partial,
|
|
|
|
error,
|
|
|
|
noconv
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2004-01-27 03:58:06 +01:00
|
|
|
/**
|
locale_facets.h (isspace, [...]): Add doxygen markup.
2004-11-22 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (isspace, isprint, isupper,
islower, isalpha, isdigit, ispunct, isxdigit, isalnum, isgraph,
toupper, tolower): Add doxygen markup.
(codecvt_byname, ctype_byname, numpunct_byname, collate_byname,
time_get_byname, time_put_byname, moneypunct_byname,
messages_byname): Same.
* include/std/std_fstream.h: Remove superfluous markup.
* include/std/std_sstream.h: Same.
* include/std/std_streambuf.h: Same.
* include/ext/enc_filebuf.h: Adjust markup.
* include/ext/stdio_filebuf.h: Same.
* include/ext/stdio_sync_filebuf.h: Same.
* include/bits/codecvt.h: Same.
* config/os/gnu-linux/ctype_base.h: Same.
* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Same.
* include/tr1/array: Add markup.
* include/tr1/tuple: Same.
* docs/doxygen/run_doxygen: Print arguments.
* docs/doxygen/user.cfg.in: Tweaks.
From-SVN: r91080
2004-11-23 10:18:41 +01:00
|
|
|
* @brief Common base for codecvt functions.
|
2004-01-27 03:58:06 +01:00
|
|
|
*
|
|
|
|
* This template class provides implementations of the public functions
|
|
|
|
* that forward to the protected virtual functions.
|
|
|
|
*
|
|
|
|
* This template also provides abstract stubs for the protected virtual
|
|
|
|
* functions.
|
|
|
|
*/
|
2000-10-05 13:27:02 +02:00
|
|
|
template<typename _InternT, typename _ExternT, typename _StateT>
|
2004-02-08 05:46:42 +01:00
|
|
|
class __codecvt_abstract_base
|
2000-10-05 13:27:02 +02:00
|
|
|
: public locale::facet, public codecvt_base
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
// Types:
|
2002-09-11 05:36:45 +02:00
|
|
|
typedef codecvt_base::result result;
|
2004-02-08 05:46:42 +01:00
|
|
|
typedef _InternT intern_type;
|
|
|
|
typedef _ExternT extern_type;
|
|
|
|
typedef _StateT state_type;
|
|
|
|
|
2000-10-05 13:27:02 +02:00
|
|
|
// 22.2.1.5.1 codecvt members
|
2004-01-27 03:58:06 +01:00
|
|
|
/**
|
|
|
|
* @brief Convert from internal to external character set.
|
|
|
|
*
|
|
|
|
* Converts input string of intern_type to output string of
|
|
|
|
* extern_type. This is analogous to wcsrtombs. It does this by
|
|
|
|
* calling codecvt::do_out.
|
|
|
|
*
|
|
|
|
* The source and destination character sets are determined by the
|
|
|
|
* facet's locale, internal and external types.
|
|
|
|
*
|
|
|
|
* The characters in [from,from_end) are converted and written to
|
|
|
|
* [to,to_end). from_next and to_next are set to point to the
|
|
|
|
* character following the last successfully converted character,
|
|
|
|
* respectively. If the result needed no conversion, from_next and
|
|
|
|
* to_next are not affected.
|
|
|
|
*
|
|
|
|
* The @a state argument should be intialized if the input is at the
|
|
|
|
* beginning and carried from a previous call if continuing
|
|
|
|
* conversion. There are no guarantees about how @a state is used.
|
|
|
|
*
|
2004-11-05 20:58:03 +01:00
|
|
|
* The result returned is a member of codecvt_base::result. If
|
|
|
|
* all the input is converted, returns codecvt_base::ok. If no
|
|
|
|
* conversion is necessary, returns codecvt_base::noconv. If
|
|
|
|
* the input ends early or there is insufficient space in the
|
|
|
|
* output, returns codecvt_base::partial. Otherwise the
|
|
|
|
* conversion failed and codecvt_base::error is returned.
|
2004-01-27 03:58:06 +01:00
|
|
|
*
|
|
|
|
* @param state Persistent conversion state data.
|
|
|
|
* @param from Start of input.
|
|
|
|
* @param from_end End of input.
|
|
|
|
* @param from_next Returns start of unconverted data.
|
|
|
|
* @param to Start of output buffer.
|
|
|
|
* @param to_end End of output buffer.
|
|
|
|
* @param to_next Returns start of unused output area.
|
|
|
|
* @return codecvt_base::result.
|
|
|
|
*/
|
2000-10-05 13:27:02 +02:00
|
|
|
result
|
2004-02-08 05:46:42 +01:00
|
|
|
out(state_type& __state, const intern_type* __from,
|
2000-10-05 13:27:02 +02:00
|
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
2004-02-08 05:46:42 +01:00
|
|
|
extern_type* __to, extern_type* __to_end,
|
2000-10-05 13:27:02 +02:00
|
|
|
extern_type*& __to_next) const
|
2004-02-08 05:46:42 +01:00
|
|
|
{
|
|
|
|
return this->do_out(__state, __from, __from_end, __from_next,
|
|
|
|
__to, __to_end, __to_next);
|
2000-10-05 13:27:02 +02:00
|
|
|
}
|
|
|
|
|
2004-01-27 03:58:06 +01:00
|
|
|
/**
|
|
|
|
* @brief Reset conversion state.
|
|
|
|
*
|
|
|
|
* Writes characters to output that would restore @a state to initial
|
|
|
|
* conditions. The idea is that if a partial conversion occurs, then
|
|
|
|
* the converting the characters written by this function would leave
|
|
|
|
* the state in initial conditions, rather than partial conversion
|
|
|
|
* state. It does this by calling codecvt::do_unshift().
|
|
|
|
*
|
|
|
|
* For example, if 4 external characters always converted to 1 internal
|
|
|
|
* character, and input to in() had 6 external characters with state
|
|
|
|
* saved, this function would write two characters to the output and
|
|
|
|
* set the state to initialized conditions.
|
|
|
|
*
|
|
|
|
* The source and destination character sets are determined by the
|
|
|
|
* facet's locale, internal and external types.
|
|
|
|
*
|
|
|
|
* The result returned is a member of codecvt_base::result. If the
|
|
|
|
* state could be reset and data written, returns codecvt_base::ok. If
|
|
|
|
* no conversion is necessary, returns codecvt_base::noconv. If the
|
|
|
|
* output has insufficient space, returns codecvt_base::partial.
|
|
|
|
* Otherwise the reset failed and codecvt_base::error is returned.
|
|
|
|
*
|
|
|
|
* @param state Persistent conversion state data.
|
|
|
|
* @param to Start of output buffer.
|
|
|
|
* @param to_end End of output buffer.
|
|
|
|
* @param to_next Returns start of unused output area.
|
|
|
|
* @return codecvt_base::result.
|
|
|
|
*/
|
2000-10-05 13:27:02 +02:00
|
|
|
result
|
|
|
|
unshift(state_type& __state, extern_type* __to, extern_type* __to_end,
|
|
|
|
extern_type*& __to_next) const
|
|
|
|
{ return this->do_unshift(__state, __to,__to_end,__to_next); }
|
|
|
|
|
2004-01-27 03:58:06 +01:00
|
|
|
/**
|
|
|
|
* @brief Convert from external to internal character set.
|
|
|
|
*
|
|
|
|
* Converts input string of extern_type to output string of
|
|
|
|
* intern_type. This is analogous to mbsrtowcs. It does this by
|
|
|
|
* calling codecvt::do_in.
|
|
|
|
*
|
|
|
|
* The source and destination character sets are determined by the
|
|
|
|
* facet's locale, internal and external types.
|
|
|
|
*
|
|
|
|
* The characters in [from,from_end) are converted and written to
|
|
|
|
* [to,to_end). from_next and to_next are set to point to the
|
|
|
|
* character following the last successfully converted character,
|
|
|
|
* respectively. If the result needed no conversion, from_next and
|
|
|
|
* to_next are not affected.
|
|
|
|
*
|
|
|
|
* The @a state argument should be intialized if the input is at the
|
|
|
|
* beginning and carried from a previous call if continuing
|
|
|
|
* conversion. There are no guarantees about how @a state is used.
|
|
|
|
*
|
2004-11-05 20:58:03 +01:00
|
|
|
* The result returned is a member of codecvt_base::result. If
|
|
|
|
* all the input is converted, returns codecvt_base::ok. If no
|
|
|
|
* conversion is necessary, returns codecvt_base::noconv. If
|
|
|
|
* the input ends early or there is insufficient space in the
|
|
|
|
* output, returns codecvt_base::partial. Otherwise the
|
|
|
|
* conversion failed and codecvt_base::error is returned.
|
2004-01-27 03:58:06 +01:00
|
|
|
*
|
|
|
|
* @param state Persistent conversion state data.
|
|
|
|
* @param from Start of input.
|
|
|
|
* @param from_end End of input.
|
|
|
|
* @param from_next Returns start of unconverted data.
|
|
|
|
* @param to Start of output buffer.
|
|
|
|
* @param to_end End of output buffer.
|
|
|
|
* @param to_next Returns start of unused output area.
|
|
|
|
* @return codecvt_base::result.
|
|
|
|
*/
|
2000-10-05 13:27:02 +02:00
|
|
|
result
|
2004-02-08 05:46:42 +01:00
|
|
|
in(state_type& __state, const extern_type* __from,
|
2000-10-05 13:27:02 +02:00
|
|
|
const extern_type* __from_end, const extern_type*& __from_next,
|
2004-02-08 05:46:42 +01:00
|
|
|
intern_type* __to, intern_type* __to_end,
|
2000-10-05 13:27:02 +02:00
|
|
|
intern_type*& __to_next) const
|
2004-02-08 05:46:42 +01:00
|
|
|
{
|
2000-10-05 13:27:02 +02:00
|
|
|
return this->do_in(__state, __from, __from_end, __from_next,
|
2004-02-08 05:46:42 +01:00
|
|
|
__to, __to_end, __to_next);
|
2000-10-05 13:27:02 +02:00
|
|
|
}
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
int
|
2000-10-05 13:27:02 +02:00
|
|
|
encoding() const throw()
|
|
|
|
{ return this->do_encoding(); }
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
bool
|
2000-10-05 13:27:02 +02:00
|
|
|
always_noconv() const throw()
|
|
|
|
{ return this->do_always_noconv(); }
|
|
|
|
|
|
|
|
int
|
[multiple changes]
2003-02-06 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/22_locale/codecvt/encoding/wchar_t/1.cc (test01):
Explicitly use the "C" locale.
* testsuite/22_locale/codecvt/max_length/wchar_t/1.cc (test01): Same.
2003-02-06 Petur Runolfsson <peturr02@ru.is>
DR 75
DR 305
PR libstdc++/9028 (partial)
PR libstdc++/9224
PR libstdc++/9246
PR libstdc++/9247
* src/codecvt.cc
(codecvt<wchar_t, char, mbstate_t>::do_encoding,
codecvt<wchar_t, char, mbstate_t>::do_length,
codecvt<wchar_t, char, mbstate_t>::do_max_length):
Move...
* config/locale/generic/codecvt_members.cc: ...here.
* config/locale/gnu/codecvt_members.cc: ...and here.
* config/locale/generic/codecvt_members.cc,
* config/locale/gnu/codecvt_members.cc
(codecvt<wchar_t, char, mbstate_t>::do_encoding
codecvt<wchar_t, char, mbstate_t>::do_in,
codecvt<wchar_t, char, mbstate_t>::do_length,
codecvt<wchar_t, char, mbstate_t>::do_max_length,
codecvt<wchar_t, char, mbstate_t>::do_out):
New implementation that handles stateless encodings,
including UTF-8.
* config/locale/generic/codecvt_members.cc,
* config/locale/gnu/codecvt_members.cc,
* config/locale/ieee_1003.1-2001/codecvt_specializations.h,
* include/bits/codecvt.h,
* src/codecvt.cc
(codecvt::length, codecvt::do_length):
Change type of first argument of length and do_length from
'const state_type&' to 'state_type&' according to DR 75.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/1.cc:
Cleanup and check for correct return value from encoding
for "C" locale.
* testsuite/22_locale/codecvt/encoding/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/in/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/8.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/9.cc: New test.
* testsuite/22_locale/codecvt/length/char/1.cc: Cleanup.
* testsuite/22_locale/codecvt/length/char/2.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/length/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/max_length/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/out/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/unicode/1.cc: New test.
* testsuite/22_locale/codecvt/unshift/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/unshift/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/unshift/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/unshfit/wchar_t/4.cc: New test.
From-SVN: r62474
2003-02-06 07:24:21 +01:00
|
|
|
length(state_type& __state, const extern_type* __from,
|
2000-10-05 13:27:02 +02:00
|
|
|
const extern_type* __end, size_t __max) const
|
|
|
|
{ return this->do_length(__state, __from, __end, __max); }
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
int
|
2000-10-05 13:27:02 +02:00
|
|
|
max_length() const throw()
|
|
|
|
{ return this->do_max_length(); }
|
|
|
|
|
|
|
|
protected:
|
2004-02-08 05:46:42 +01:00
|
|
|
explicit
|
2000-10-05 13:27:02 +02:00
|
|
|
__codecvt_abstract_base(size_t __refs = 0) : locale::facet(__refs) { }
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual
|
2000-10-05 13:27:02 +02:00
|
|
|
~__codecvt_abstract_base() { }
|
|
|
|
|
2004-01-27 03:58:06 +01:00
|
|
|
/**
|
|
|
|
* @brief Convert from internal to external character set.
|
|
|
|
*
|
|
|
|
* Converts input string of intern_type to output string of
|
|
|
|
* extern_type. This function is a hook for derived classes to change
|
|
|
|
* the value returned. @see out for more information.
|
|
|
|
*/
|
2000-10-05 13:27:02 +02:00
|
|
|
virtual result
|
2004-02-08 05:46:42 +01:00
|
|
|
do_out(state_type& __state, const intern_type* __from,
|
2000-10-05 13:27:02 +02:00
|
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
|
|
extern_type* __to, extern_type* __to_end,
|
|
|
|
extern_type*& __to_next) const = 0;
|
|
|
|
|
|
|
|
virtual result
|
2004-02-08 05:46:42 +01:00
|
|
|
do_unshift(state_type& __state, extern_type* __to,
|
2000-10-05 13:27:02 +02:00
|
|
|
extern_type* __to_end, extern_type*& __to_next) const = 0;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2000-10-05 13:27:02 +02:00
|
|
|
virtual result
|
2004-02-08 05:46:42 +01:00
|
|
|
do_in(state_type& __state, const extern_type* __from,
|
|
|
|
const extern_type* __from_end, const extern_type*& __from_next,
|
|
|
|
intern_type* __to, intern_type* __to_end,
|
2000-10-05 13:27:02 +02:00
|
|
|
intern_type*& __to_next) const = 0;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
|
|
|
virtual int
|
2000-10-05 13:27:02 +02:00
|
|
|
do_encoding() const throw() = 0;
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual bool
|
2000-10-05 13:27:02 +02:00
|
|
|
do_always_noconv() const throw() = 0;
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual int
|
|
|
|
do_length(state_type&, const extern_type* __from,
|
2000-10-05 13:27:02 +02:00
|
|
|
const extern_type* __end, size_t __max) const = 0;
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual int
|
2000-10-05 13:27:02 +02:00
|
|
|
do_max_length() const throw() = 0;
|
|
|
|
};
|
|
|
|
|
locale_facets.h (isspace, [...]): Add doxygen markup.
2004-11-22 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (isspace, isprint, isupper,
islower, isalpha, isdigit, ispunct, isxdigit, isalnum, isgraph,
toupper, tolower): Add doxygen markup.
(codecvt_byname, ctype_byname, numpunct_byname, collate_byname,
time_get_byname, time_put_byname, moneypunct_byname,
messages_byname): Same.
* include/std/std_fstream.h: Remove superfluous markup.
* include/std/std_sstream.h: Same.
* include/std/std_streambuf.h: Same.
* include/ext/enc_filebuf.h: Adjust markup.
* include/ext/stdio_filebuf.h: Same.
* include/ext/stdio_sync_filebuf.h: Same.
* include/bits/codecvt.h: Same.
* config/os/gnu-linux/ctype_base.h: Same.
* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Same.
* include/tr1/array: Add markup.
* include/tr1/tuple: Same.
* docs/doxygen/run_doxygen: Print arguments.
* docs/doxygen/user.cfg.in: Tweaks.
From-SVN: r91080
2004-11-23 10:18:41 +01:00
|
|
|
/// @brief class codecvt [22.2.1.5].
|
|
|
|
/// NB: Generic, mostly useless implementation.
|
2000-10-05 13:27:02 +02:00
|
|
|
template<typename _InternT, typename _ExternT, typename _StateT>
|
2004-02-08 05:46:42 +01:00
|
|
|
class codecvt
|
2000-10-05 13:27:02 +02:00
|
|
|
: public __codecvt_abstract_base<_InternT, _ExternT, _StateT>
|
|
|
|
{
|
2004-02-08 05:46:42 +01:00
|
|
|
public:
|
2000-10-05 13:27:02 +02:00
|
|
|
// Types:
|
2002-09-11 05:36:45 +02:00
|
|
|
typedef codecvt_base::result result;
|
2004-02-08 05:46:42 +01:00
|
|
|
typedef _InternT intern_type;
|
|
|
|
typedef _ExternT extern_type;
|
|
|
|
typedef _StateT state_type;
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2002-09-11 05:36:45 +02:00
|
|
|
protected:
|
|
|
|
__c_locale _M_c_locale_codecvt;
|
|
|
|
|
|
|
|
public:
|
2004-02-08 05:46:42 +01:00
|
|
|
static locale::id id;
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
explicit
|
|
|
|
codecvt(size_t __refs = 0)
|
2002-09-11 05:36:45 +02:00
|
|
|
: __codecvt_abstract_base<_InternT, _ExternT, _StateT> (__refs) { }
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
explicit
|
2002-09-11 05:36:45 +02:00
|
|
|
codecvt(__c_locale __cloc, size_t __refs = 0);
|
2000-10-05 13:27:02 +02:00
|
|
|
|
|
|
|
protected:
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual
|
2000-10-05 13:27:02 +02:00
|
|
|
~codecvt() { }
|
2001-10-31 21:05:33 +01:00
|
|
|
|
|
|
|
virtual result
|
2004-02-08 05:46:42 +01:00
|
|
|
do_out(state_type& __state, const intern_type* __from,
|
2001-10-31 21:05:33 +01:00
|
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
|
|
extern_type* __to, extern_type* __to_end,
|
|
|
|
extern_type*& __to_next) const;
|
|
|
|
|
|
|
|
virtual result
|
2004-02-08 05:46:42 +01:00
|
|
|
do_unshift(state_type& __state, extern_type* __to,
|
2001-10-31 21:05:33 +01:00
|
|
|
extern_type* __to_end, extern_type*& __to_next) const;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
2001-10-31 21:05:33 +01:00
|
|
|
virtual result
|
2004-02-08 05:46:42 +01:00
|
|
|
do_in(state_type& __state, const extern_type* __from,
|
|
|
|
const extern_type* __from_end, const extern_type*& __from_next,
|
|
|
|
intern_type* __to, intern_type* __to_end,
|
2001-10-31 21:05:33 +01:00
|
|
|
intern_type*& __to_next) const;
|
2004-02-08 05:46:42 +01:00
|
|
|
|
|
|
|
virtual int
|
2001-10-31 21:05:33 +01:00
|
|
|
do_encoding() const throw();
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual bool
|
2001-10-31 21:05:33 +01:00
|
|
|
do_always_noconv() const throw();
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual int
|
|
|
|
do_length(state_type&, const extern_type* __from,
|
2001-10-31 21:05:33 +01:00
|
|
|
const extern_type* __end, size_t __max) const;
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual int
|
2001-10-31 21:05:33 +01:00
|
|
|
do_max_length() const throw();
|
2000-10-05 13:27:02 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _InternT, typename _ExternT, typename _StateT>
|
|
|
|
locale::id codecvt<_InternT, _ExternT, _StateT>::id;
|
|
|
|
|
locale_facets.h (isspace, [...]): Add doxygen markup.
2004-11-22 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (isspace, isprint, isupper,
islower, isalpha, isdigit, ispunct, isxdigit, isalnum, isgraph,
toupper, tolower): Add doxygen markup.
(codecvt_byname, ctype_byname, numpunct_byname, collate_byname,
time_get_byname, time_put_byname, moneypunct_byname,
messages_byname): Same.
* include/std/std_fstream.h: Remove superfluous markup.
* include/std/std_sstream.h: Same.
* include/std/std_streambuf.h: Same.
* include/ext/enc_filebuf.h: Adjust markup.
* include/ext/stdio_filebuf.h: Same.
* include/ext/stdio_sync_filebuf.h: Same.
* include/bits/codecvt.h: Same.
* config/os/gnu-linux/ctype_base.h: Same.
* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Same.
* include/tr1/array: Add markup.
* include/tr1/tuple: Same.
* docs/doxygen/run_doxygen: Print arguments.
* docs/doxygen/user.cfg.in: Tweaks.
From-SVN: r91080
2004-11-23 10:18:41 +01:00
|
|
|
/// @brief class codecvt<char, char, mbstate_t> specialization.
|
2000-10-05 13:27:02 +02:00
|
|
|
template<>
|
2004-02-08 05:46:42 +01:00
|
|
|
class codecvt<char, char, mbstate_t>
|
2000-10-05 13:27:02 +02:00
|
|
|
: public __codecvt_abstract_base<char, char, mbstate_t>
|
|
|
|
{
|
2004-02-08 05:46:42 +01:00
|
|
|
public:
|
2000-10-05 13:27:02 +02:00
|
|
|
// Types:
|
2004-02-08 05:46:42 +01:00
|
|
|
typedef char intern_type;
|
|
|
|
typedef char extern_type;
|
|
|
|
typedef mbstate_t state_type;
|
2002-09-11 05:36:45 +02:00
|
|
|
|
|
|
|
protected:
|
|
|
|
__c_locale _M_c_locale_codecvt;
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2002-09-11 05:36:45 +02:00
|
|
|
public:
|
2000-10-05 13:27:02 +02:00
|
|
|
static locale::id id;
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
explicit
|
2000-10-05 13:27:02 +02:00
|
|
|
codecvt(size_t __refs = 0);
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
explicit
|
2002-09-11 05:36:45 +02:00
|
|
|
codecvt(__c_locale __cloc, size_t __refs = 0);
|
codecvt.h (class __codecvt_abstract_base): Add __c_locale type _M_c_locale_codecvt member.
2002-09-10 Paolo Carlini <pcarlini@unitus.it>
* include/bits/codecvt.h (class __codecvt_abstract_base):
Add __c_locale type _M_c_locale_codecvt member.
(class codecvt<char, char, mbstate_t>,
class codecvt<wchar_t, char, mbstate_t>): Add new
codecvt(__c_locale, size_t) constructor.
(codecvt_byname::codecvt_byname): Update.
* src/codecvt.cc (class codecvt<char, char, mbstate_t>,
class codecvt<wchar_t, char, mbstate_t>): Update codecvt(size_t)
constructor and ~codecvt() destructor; define
codecvt(__c_locale, size_t) constructor.
(codecvt::do_out): Switch to _M_c_locale_codecvt around wcsrtombs call.
(codecvt::do_in): Ditto for mbsrtowcs call.
* src/localename.cc (locale::_Impl::_Impl(const char*, size_t)):
Tweak construction of codecvt facets.
From-SVN: r57011
2002-09-10 21:35:04 +02:00
|
|
|
|
2000-10-05 13:27:02 +02:00
|
|
|
protected:
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual
|
2000-10-05 13:27:02 +02:00
|
|
|
~codecvt();
|
|
|
|
|
|
|
|
virtual result
|
2004-02-08 05:46:42 +01:00
|
|
|
do_out(state_type& __state, const intern_type* __from,
|
2000-10-05 13:27:02 +02:00
|
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
|
|
extern_type* __to, extern_type* __to_end,
|
|
|
|
extern_type*& __to_next) const;
|
|
|
|
|
|
|
|
virtual result
|
2004-02-08 05:46:42 +01:00
|
|
|
do_unshift(state_type& __state, extern_type* __to,
|
2000-10-05 13:27:02 +02:00
|
|
|
extern_type* __to_end, extern_type*& __to_next) const;
|
|
|
|
|
|
|
|
virtual result
|
2004-02-08 05:46:42 +01:00
|
|
|
do_in(state_type& __state, const extern_type* __from,
|
2000-10-05 13:27:02 +02:00
|
|
|
const extern_type* __from_end, const extern_type*& __from_next,
|
2004-02-08 05:46:42 +01:00
|
|
|
intern_type* __to, intern_type* __to_end,
|
2000-10-05 13:27:02 +02:00
|
|
|
intern_type*& __to_next) const;
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual int
|
2000-10-05 13:27:02 +02:00
|
|
|
do_encoding() const throw();
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual bool
|
2000-10-05 13:27:02 +02:00
|
|
|
do_always_noconv() const throw();
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual int
|
|
|
|
do_length(state_type&, const extern_type* __from,
|
2000-10-05 13:27:02 +02:00
|
|
|
const extern_type* __end, size_t __max) const;
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual int
|
2000-10-05 13:27:02 +02:00
|
|
|
do_max_length() const throw();
|
|
|
|
};
|
|
|
|
|
2003-07-05 06:05:45 +02:00
|
|
|
#ifdef _GLIBCXX_USE_WCHAR_T
|
locale_facets.h (isspace, [...]): Add doxygen markup.
2004-11-22 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (isspace, isprint, isupper,
islower, isalpha, isdigit, ispunct, isxdigit, isalnum, isgraph,
toupper, tolower): Add doxygen markup.
(codecvt_byname, ctype_byname, numpunct_byname, collate_byname,
time_get_byname, time_put_byname, moneypunct_byname,
messages_byname): Same.
* include/std/std_fstream.h: Remove superfluous markup.
* include/std/std_sstream.h: Same.
* include/std/std_streambuf.h: Same.
* include/ext/enc_filebuf.h: Adjust markup.
* include/ext/stdio_filebuf.h: Same.
* include/ext/stdio_sync_filebuf.h: Same.
* include/bits/codecvt.h: Same.
* config/os/gnu-linux/ctype_base.h: Same.
* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Same.
* include/tr1/array: Add markup.
* include/tr1/tuple: Same.
* docs/doxygen/run_doxygen: Print arguments.
* docs/doxygen/user.cfg.in: Tweaks.
From-SVN: r91080
2004-11-23 10:18:41 +01:00
|
|
|
/// @brief class codecvt<wchar_t, char, mbstate_t> specialization.
|
2000-10-05 13:27:02 +02:00
|
|
|
template<>
|
2004-02-08 05:46:42 +01:00
|
|
|
class codecvt<wchar_t, char, mbstate_t>
|
2000-10-05 13:27:02 +02:00
|
|
|
: public __codecvt_abstract_base<wchar_t, char, mbstate_t>
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
// Types:
|
2004-02-08 05:46:42 +01:00
|
|
|
typedef wchar_t intern_type;
|
|
|
|
typedef char extern_type;
|
|
|
|
typedef mbstate_t state_type;
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2002-09-11 05:36:45 +02:00
|
|
|
protected:
|
|
|
|
__c_locale _M_c_locale_codecvt;
|
|
|
|
|
|
|
|
public:
|
2004-02-08 05:46:42 +01:00
|
|
|
static locale::id id;
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
explicit
|
2000-10-05 13:27:02 +02:00
|
|
|
codecvt(size_t __refs = 0);
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
explicit
|
codecvt.h (class __codecvt_abstract_base): Add __c_locale type _M_c_locale_codecvt member.
2002-09-10 Paolo Carlini <pcarlini@unitus.it>
* include/bits/codecvt.h (class __codecvt_abstract_base):
Add __c_locale type _M_c_locale_codecvt member.
(class codecvt<char, char, mbstate_t>,
class codecvt<wchar_t, char, mbstate_t>): Add new
codecvt(__c_locale, size_t) constructor.
(codecvt_byname::codecvt_byname): Update.
* src/codecvt.cc (class codecvt<char, char, mbstate_t>,
class codecvt<wchar_t, char, mbstate_t>): Update codecvt(size_t)
constructor and ~codecvt() destructor; define
codecvt(__c_locale, size_t) constructor.
(codecvt::do_out): Switch to _M_c_locale_codecvt around wcsrtombs call.
(codecvt::do_in): Ditto for mbsrtowcs call.
* src/localename.cc (locale::_Impl::_Impl(const char*, size_t)):
Tweak construction of codecvt facets.
From-SVN: r57011
2002-09-10 21:35:04 +02:00
|
|
|
codecvt(__c_locale __cloc, size_t __refs = 0);
|
|
|
|
|
2000-10-05 13:27:02 +02:00
|
|
|
protected:
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual
|
2000-10-05 13:27:02 +02:00
|
|
|
~codecvt();
|
|
|
|
|
|
|
|
virtual result
|
2004-02-08 05:46:42 +01:00
|
|
|
do_out(state_type& __state, const intern_type* __from,
|
2000-10-05 13:27:02 +02:00
|
|
|
const intern_type* __from_end, const intern_type*& __from_next,
|
|
|
|
extern_type* __to, extern_type* __to_end,
|
|
|
|
extern_type*& __to_next) const;
|
|
|
|
|
|
|
|
virtual result
|
|
|
|
do_unshift(state_type& __state,
|
|
|
|
extern_type* __to, extern_type* __to_end,
|
|
|
|
extern_type*& __to_next) const;
|
|
|
|
|
|
|
|
virtual result
|
|
|
|
do_in(state_type& __state,
|
|
|
|
const extern_type* __from, const extern_type* __from_end,
|
|
|
|
const extern_type*& __from_next,
|
|
|
|
intern_type* __to, intern_type* __to_end,
|
|
|
|
intern_type*& __to_next) const;
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual
|
2000-10-05 13:27:02 +02:00
|
|
|
int do_encoding() const throw();
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual
|
2000-10-05 13:27:02 +02:00
|
|
|
bool do_always_noconv() const throw();
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual
|
[multiple changes]
2003-02-06 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/22_locale/codecvt/encoding/wchar_t/1.cc (test01):
Explicitly use the "C" locale.
* testsuite/22_locale/codecvt/max_length/wchar_t/1.cc (test01): Same.
2003-02-06 Petur Runolfsson <peturr02@ru.is>
DR 75
DR 305
PR libstdc++/9028 (partial)
PR libstdc++/9224
PR libstdc++/9246
PR libstdc++/9247
* src/codecvt.cc
(codecvt<wchar_t, char, mbstate_t>::do_encoding,
codecvt<wchar_t, char, mbstate_t>::do_length,
codecvt<wchar_t, char, mbstate_t>::do_max_length):
Move...
* config/locale/generic/codecvt_members.cc: ...here.
* config/locale/gnu/codecvt_members.cc: ...and here.
* config/locale/generic/codecvt_members.cc,
* config/locale/gnu/codecvt_members.cc
(codecvt<wchar_t, char, mbstate_t>::do_encoding
codecvt<wchar_t, char, mbstate_t>::do_in,
codecvt<wchar_t, char, mbstate_t>::do_length,
codecvt<wchar_t, char, mbstate_t>::do_max_length,
codecvt<wchar_t, char, mbstate_t>::do_out):
New implementation that handles stateless encodings,
including UTF-8.
* config/locale/generic/codecvt_members.cc,
* config/locale/gnu/codecvt_members.cc,
* config/locale/ieee_1003.1-2001/codecvt_specializations.h,
* include/bits/codecvt.h,
* src/codecvt.cc
(codecvt::length, codecvt::do_length):
Change type of first argument of length and do_length from
'const state_type&' to 'state_type&' according to DR 75.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/1.cc:
Cleanup and check for correct return value from encoding
for "C" locale.
* testsuite/22_locale/codecvt/encoding/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/encoding/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/in/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/8.cc: New test.
* testsuite/22_locale/codecvt/in/wchar_t/9.cc: New test.
* testsuite/22_locale/codecvt/length/char/1.cc: Cleanup.
* testsuite/22_locale/codecvt/length/char/2.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/length/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/length/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/max_length/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/max_length/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/out/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/4.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/5.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/6.cc: New test.
* testsuite/22_locale/codecvt/out/wchar_t/7.cc: New test.
* testsuite/22_locale/codecvt/unicode/1.cc: New test.
* testsuite/22_locale/codecvt/unshift/wchar_t/1.cc: Cleanup.
* testsuite/22_locale/codecvt/unshift/wchar_t/2.cc: New test.
* testsuite/22_locale/codecvt/unshift/wchar_t/3.cc: New test.
* testsuite/22_locale/codecvt/unshfit/wchar_t/4.cc: New test.
From-SVN: r62474
2003-02-06 07:24:21 +01:00
|
|
|
int do_length(state_type&, const extern_type* __from,
|
2000-10-05 13:27:02 +02:00
|
|
|
const extern_type* __end, size_t __max) const;
|
|
|
|
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual int
|
2000-10-05 13:27:02 +02:00
|
|
|
do_max_length() const throw();
|
|
|
|
};
|
2003-07-05 06:05:45 +02:00
|
|
|
#endif //_GLIBCXX_USE_WCHAR_T
|
2000-10-05 13:27:02 +02:00
|
|
|
|
locale_facets.h (isspace, [...]): Add doxygen markup.
2004-11-22 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (isspace, isprint, isupper,
islower, isalpha, isdigit, ispunct, isxdigit, isalnum, isgraph,
toupper, tolower): Add doxygen markup.
(codecvt_byname, ctype_byname, numpunct_byname, collate_byname,
time_get_byname, time_put_byname, moneypunct_byname,
messages_byname): Same.
* include/std/std_fstream.h: Remove superfluous markup.
* include/std/std_sstream.h: Same.
* include/std/std_streambuf.h: Same.
* include/ext/enc_filebuf.h: Adjust markup.
* include/ext/stdio_filebuf.h: Same.
* include/ext/stdio_sync_filebuf.h: Same.
* include/bits/codecvt.h: Same.
* config/os/gnu-linux/ctype_base.h: Same.
* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Same.
* include/tr1/array: Add markup.
* include/tr1/tuple: Same.
* docs/doxygen/run_doxygen: Print arguments.
* docs/doxygen/user.cfg.in: Tweaks.
From-SVN: r91080
2004-11-23 10:18:41 +01:00
|
|
|
/// @brief class codecvt_byname [22.2.1.6].
|
2000-10-05 13:27:02 +02:00
|
|
|
template<typename _InternT, typename _ExternT, typename _StateT>
|
|
|
|
class codecvt_byname : public codecvt<_InternT, _ExternT, _StateT>
|
|
|
|
{
|
|
|
|
public:
|
2004-02-08 05:46:42 +01:00
|
|
|
explicit
|
|
|
|
codecvt_byname(const char* __s, size_t __refs = 0)
|
codecvt.h (class __codecvt_abstract_base): Add __c_locale type _M_c_locale_codecvt member.
2002-09-10 Paolo Carlini <pcarlini@unitus.it>
* include/bits/codecvt.h (class __codecvt_abstract_base):
Add __c_locale type _M_c_locale_codecvt member.
(class codecvt<char, char, mbstate_t>,
class codecvt<wchar_t, char, mbstate_t>): Add new
codecvt(__c_locale, size_t) constructor.
(codecvt_byname::codecvt_byname): Update.
* src/codecvt.cc (class codecvt<char, char, mbstate_t>,
class codecvt<wchar_t, char, mbstate_t>): Update codecvt(size_t)
constructor and ~codecvt() destructor; define
codecvt(__c_locale, size_t) constructor.
(codecvt::do_out): Switch to _M_c_locale_codecvt around wcsrtombs call.
(codecvt::do_in): Ditto for mbsrtowcs call.
* src/localename.cc (locale::_Impl::_Impl(const char*, size_t)):
Tweak construction of codecvt facets.
From-SVN: r57011
2002-09-10 21:35:04 +02:00
|
|
|
: codecvt<_InternT, _ExternT, _StateT>(__refs)
|
2004-02-08 05:46:42 +01:00
|
|
|
{
|
2003-10-22 20:58:35 +02:00
|
|
|
if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
|
|
|
|
{
|
2004-04-07 05:33:36 +02:00
|
|
|
this->_S_destroy_c_locale(this->_M_c_locale_codecvt);
|
|
|
|
this->_S_create_c_locale(this->_M_c_locale_codecvt, __s);
|
2003-10-22 20:58:35 +02:00
|
|
|
}
|
codecvt.h (class __codecvt_abstract_base): Add __c_locale type _M_c_locale_codecvt member.
2002-09-10 Paolo Carlini <pcarlini@unitus.it>
* include/bits/codecvt.h (class __codecvt_abstract_base):
Add __c_locale type _M_c_locale_codecvt member.
(class codecvt<char, char, mbstate_t>,
class codecvt<wchar_t, char, mbstate_t>): Add new
codecvt(__c_locale, size_t) constructor.
(codecvt_byname::codecvt_byname): Update.
* src/codecvt.cc (class codecvt<char, char, mbstate_t>,
class codecvt<wchar_t, char, mbstate_t>): Update codecvt(size_t)
constructor and ~codecvt() destructor; define
codecvt(__c_locale, size_t) constructor.
(codecvt::do_out): Switch to _M_c_locale_codecvt around wcsrtombs call.
(codecvt::do_in): Ditto for mbsrtowcs call.
* src/localename.cc (locale::_Impl::_Impl(const char*, size_t)):
Tweak construction of codecvt facets.
From-SVN: r57011
2002-09-10 21:35:04 +02:00
|
|
|
}
|
|
|
|
|
2000-10-05 13:27:02 +02:00
|
|
|
protected:
|
2004-02-08 05:46:42 +01:00
|
|
|
virtual
|
2000-10-05 13:27:02 +02:00
|
|
|
~codecvt_byname() { }
|
|
|
|
};
|
|
|
|
|
2003-07-05 06:05:45 +02:00
|
|
|
#endif // _CODECVT_H
|