gcc/libstdc++-v3/testsuite/testsuite_character.h

539 lines
13 KiB
C
Raw Normal View History

re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
// -*- C++ -*-
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
// Testing character type and state type with char_traits and codecvt
// specializations for the C++ library testsuite.
//
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
// Copyright (C) 2003, 2005 Free Software Foundation, Inc.
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00: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.
#ifndef _GLIBCXX_TESTSUITE_CHARACTER_H
#define _GLIBCXX_TESTSUITE_CHARACTER_H
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
#include <climits>
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
#include <string> // for char_traits
#include <locale> // for codecvt
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
#include <ext/pod_char_traits.h>
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
namespace __gnu_test
{
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
struct pod_int
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
int value;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
};
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
inline bool
operator==(const pod_int& lhs, const pod_int& rhs)
{ return lhs.value == rhs.value; }
inline bool
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
operator<(const pod_int& lhs, const pod_int& rhs)
{ return lhs.value < rhs.value; }
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
struct pod_state
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
unsigned long value;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
};
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
inline bool
operator==(const pod_state& lhs, const pod_state& rhs)
{ return lhs.value == rhs.value; }
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
inline bool
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
operator<(const pod_state& lhs, const pod_state& rhs)
{ return lhs.value < rhs.value; }
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
// Alternate character types.
using __gnu_cxx::character;
typedef character<unsigned char, pod_int, pod_state> pod_char;
typedef character<unsigned char, unsigned int, pod_state> pod_uchar;
typedef character<unsigned short, unsigned int> pod_ushort;
typedef character<unsigned int, unsigned long> pod_uint;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
// Specializations.
// pod_char
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
template<>
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
template<typename V2>
inline pod_char::char_type
pod_char::char_type::from(const V2& v)
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
char_type ret = { static_cast<value_type>(v.value) };
return ret;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
}
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
template<>
template<typename V2>
inline V2
pod_char::char_type::to(const char_type& c)
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
V2 ret = { c.value };
return ret;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
}
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
// pod_uchar
template<>
template<typename V2>
inline pod_uchar::char_type
pod_uchar::char_type::from(const V2& v)
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{
char_type ret;
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
ret.value = (v >> 5);
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
return ret;
}
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
template<>
template<typename V2>
inline V2
pod_uchar::char_type::to(const char_type& c)
{ return static_cast<V2>(c.value << 5); }
}; // namespace __gnu_test
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
namespace std
{
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
// codecvt specialization
//
// The conversion performed by the specialization is not supposed to
// be useful, rather it has been designed to demonstrate the
// essential features of stateful conversions:
// * Number and value of bytes for each internal character depends on the
// state in addition to the character itself.
// * Unshift produces an unshift sequence and resets the state. On input
// the unshift sequence causes the state to be reset.
//
// The conversion for output is as follows:
// 1. Calculate the value tmp by xor-ing the state and the internal
// character
// 2. Split tmp into either two or three bytes depending on the value of
// state. Output those bytes.
// 3. tmp becomes the new value of state.
template<>
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
class codecvt<__gnu_test::pod_uchar, char, __gnu_test::pod_state>
: public __codecvt_abstract_base<__gnu_test::pod_uchar, char,
__gnu_test::pod_state>
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{
public:
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
typedef codecvt_base::result result;
typedef __gnu_test::pod_uchar intern_type;
typedef char extern_type;
typedef __gnu_test::pod_state state_type;
typedef __codecvt_abstract_base<intern_type, extern_type, state_type>
base_type;
explicit codecvt(size_t refs = 0) : base_type(refs)
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{ }
static locale::id id;
protected:
~codecvt()
{ }
virtual result
do_out(state_type& state, const intern_type* from,
const intern_type* from_end, const intern_type*& from_next,
extern_type* to, extern_type* to_limit,
extern_type*& to_next) const
{
while (from < from_end && to < to_limit)
{
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
unsigned char tmp = (state.value ^ from->value);
if (state.value & 0x8)
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{
if (to >= to_limit - 2)
break;
*to++ = (tmp & 0x7);
*to++ = ((tmp >> 3) & 0x7);
*to++ = ((tmp >> 6) & 0x3);
}
else
{
if (to >= to_limit - 1)
break;
*to++ = (tmp & 0xf);
*to++ = ((tmp >> 4) & 0xf);
}
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
state.value = tmp;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
++from;
}
from_next = from;
to_next = to;
return (from < from_end) ? partial : ok;
}
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_limit,
intern_type*& to_next) const
{
while (from < from_end && to < to_limit)
{
unsigned char c = *from;
if (c & 0xc0)
{
// Unshift sequence
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
state.value &= c;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
++from;
continue;
}
unsigned char tmp;
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
if (state.value & 0x8)
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{
if (from >= from_end - 2)
break;
tmp = (*from++ & 0x7);
tmp |= ((*from++ << 3) & 0x38);
tmp |= ((*from++ << 6) & 0xc0);
}
else
{
if (from >= from_end - 1)
break;
tmp = (*from++ & 0xf);
tmp |= ((*from++ << 4) & 0xf0);
}
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
to->value = (tmp ^ state.value);
state.value = tmp;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
++to;
}
from_next = from;
to_next = to;
return (from < from_end) ? partial : ok;
}
virtual result
do_unshift(state_type& state, extern_type* to, extern_type* to_limit,
extern_type*& to_next) const
{
for (unsigned int i = 0; i < CHAR_BIT; ++i)
{
unsigned int mask = (1 << i);
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
if (state.value & mask)
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{
if (to == to_limit)
{
to_next = to;
return partial;
}
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
state.value &= ~mask;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
*to++ = static_cast<unsigned char>(~mask);
}
}
to_next = to;
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
return state.value == 0 ? ok : error;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
}
virtual int
do_encoding() const throw()
{ return -1; }
virtual bool
do_always_noconv() const throw()
{ return false; }
virtual int
do_length(state_type& state, const extern_type* from,
const extern_type* end, size_t max) const
{
const extern_type* beg = from;
while (from < end && max)
{
unsigned char c = *from;
if (c & 0xc0)
{
// Unshift sequence
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
state.value &= c;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
++from;
continue;
}
unsigned char tmp;
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
if (state.value & 0x8)
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
{
if (from >= end - 2)
break;
tmp = (*from++ & 0x7);
tmp |= ((*from++ << 3) & 0x38);
tmp |= ((*from++ << 6) & 0xc0);
}
else
{
if (from >= end - 1)
break;
tmp = (*from++ & 0xf);
tmp |= ((*from++ << 4) & 0xf0);
}
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
state.value = tmp;
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
--max;
}
return from - beg;
}
// Maximum 8 bytes unshift sequence followed by max 3 bytes for
// one character.
virtual int
do_max_length() const throw()
{ return 11; }
};
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
template<>
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
class ctype<__gnu_test::pod_uchar>
: public __ctype_abstract_base<__gnu_test::pod_uchar>
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
{
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
public:
typedef __gnu_test::pod_uchar char_type;
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
explicit ctype(size_t refs = 0)
: __ctype_abstract_base<__gnu_test::pod_uchar>(refs) { }
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
static locale::id id;
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
protected:
~ctype()
{ }
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
virtual bool
do_is(mask m, char_type c) const
{ return false; }
virtual const char_type*
do_is(const char_type* low, const char_type* high, mask* vec) const
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
{
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
fill_n(vec, high - low, mask());
return high;
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
}
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
virtual const char_type*
do_scan_is(mask m, const char_type* low, const char_type* high) const
{ return high; }
virtual const char_type*
do_scan_not(mask m, const char_type* low, const char_type* high) const
{ return low; }
virtual char_type
do_toupper(char_type c) const
{ return c; }
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
virtual const char_type*
do_toupper(char_type* low, const char_type* high) const
{ return high; }
virtual char_type
do_tolower(char_type c) const
{ return c; }
virtual const char_type*
do_tolower(char_type* low, const char_type* high) const
{ return high; }
virtual char_type
do_widen(char c) const
{ return __gnu_test::pod_uchar::from<char>(c); }
virtual const char*
do_widen(const char* low, const char* high, char_type* dest) const
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
{
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
transform(low, high, dest, &__gnu_test::pod_uchar::from<char>);
return high;
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
}
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
virtual char
do_narrow(char_type, char dfault) const
{ return dfault; }
virtual const char_type*
do_narrow(const char_type* low, const char_type* high,
char dfault, char* dest) const
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
{
pod_char_traits.h (__gnu_cxx::character): Add char_type. 2005-04-14 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pod_char_traits.h (__gnu_cxx::character): Add char_type. (character::to): New. (character::from): New. (operator==): Add state parameter. (operator<): Same. (char_traits::copy): Use std::copy. (char_traits::assign): Use std::fill_n. (char_traits::to_char_type): Use character::from. (char_traits::to_int_type): Use character::to. * testsuite/testsuite_character.h (__gnu_test::character): Remove. (__gnu_test::conversion_state): Remove. (__gnu_test::pod_char): Remove. (pod_char): New typedef. (pod_uchar): New typedef. (pod_ushort): New typedef. * testsuite/testsuite_character.cc: Fixups. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Same. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/close/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/open/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc: Same. * testsuite/27_io/basic_ios/imbue/14072.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. From-SVN: r98165
2005-04-15 02:06:26 +00:00
fill_n(dest, high - low, dfault);
return high;
test.html: Update. 2005-04-06 Benjamin Kosnik <bkoz@redhat.com> * docs/html/test.html: Update. * testsuite/printnow.c: Remove. * scripts/check_survey.in: Remove. * testsuite/abi_check.cc: To... * testuite/testsuite_abi_check.cc: ...here. * testsuite/libstdc++-abi/abi.exp: Change abi_check.cc to testsuite_abi_check.cc. * testsuite/testsuite_hooks.h: Move character related bits to... * testsuite/testsuite_character.h: ...here. * testsuite/testsuite_character.cc: ... and here. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-in.cc: Use testsuite_character.h. * testsuite/21_strings/basic_string/inserters_extractors/pod/ 10081-out.cc: Same. * testsuite/22_locale/numpunct/members/pod/1.cc: Same. * testsuite/22_locale/numpunct/members/pod/2.cc: Same. * testsuite/27_io/basic_filebuf/2.cc: Same. * testsuite/27_io/basic_fstream/2.cc: Same. * testsuite/27_io/basic_istream/2.cc: Same. * testsuite/27_io/basic_istream/extractors_arithmetic/pod/ 3983-1.cc: Same. * testsuite/27_io/basic_istream/extractors_character/char/ 9826.cc: Same. * testsuite/27_io/basic_istream/extractors_character/pod/ 3983-2.cc: Same. * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Same. * testsuite/27_io/basic_istream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_ostream/2.cc: Same. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Same. * testsuite/27_io/basic_streambuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/2.cc: Same. * testsuite/27_io/basic_stringbuf/4.cc: Same. * testsuite/27_io/basic_stringstream/2.cc: Same. * testsuite/27_io/fpos/1.cc: Same. * testsuite/ext/mt_allocator/tune-1.cc: Same. * testsuite/ext/mt_allocator/tune-2.cc: Same. * testsuite/ext/stdio_filebuf/char/1.cc: Same. * testsuite/lib/libstdc++.exp (v3-build_support): Add testsuite_character.cc. * testsuite/Makefile.am (libv3test_a_SOURCES): Add testsuite_character.cc. * testsuite/Makefile.in: Regenerate. * configure.ac: Remove use of check_survey. * configure: Regenerate. * testsuite/Makefile.am: Remove check-script and check-script-install rules. * testsuite/Makefile.in: Regenerate. From-SVN: r97772
2005-04-07 04:16:26 +00:00
}
};
// numpunct specializations
template<>
class numpunct<__gnu_test::pod_uint>
: public locale::facet
{
public:
typedef __gnu_test::pod_uint char_type;
typedef basic_string<char_type> string_type;
static locale::id id;
explicit
numpunct(size_t refs = 0)
: locale::facet(refs)
{ }
char_type
decimal_point() const
{ return this->do_decimal_point(); }
char_type
thousands_sep() const
{ return this->do_thousands_sep(); }
string
grouping() const
{ return this->do_grouping(); }
string_type
truename() const
{ return this->do_truename(); }
string_type
falsename() const
{ return this->do_falsename(); }
protected:
~numpunct()
{ }
virtual char_type
do_decimal_point() const
{ return char_type(); }
virtual char_type
do_thousands_sep() const
{ return char_type(); }
virtual string
do_grouping() const
{ return string(); }
virtual string_type
do_truename() const
{ return string_type(); }
virtual string_type
do_falsename() const
{ return string_type(); }
};
template<>
class moneypunct<__gnu_test::pod_uint>
: public locale::facet, public money_base
{
public:
typedef __gnu_test::pod_uint char_type;
typedef basic_string<char_type> string_type;
static locale::id id;
static const bool intl = false;
explicit
moneypunct(size_t refs = 0)
: locale::facet(refs)
{ }
char_type
decimal_point() const
{ return this->do_decimal_point(); }
char_type
thousands_sep() const
{ return this->do_thousands_sep(); }
string
grouping() const
{ return this->do_grouping(); }
string_type
curr_symbol() const
{ return this->do_curr_symbol(); }
string_type
positive_sign() const
{ return this->do_positive_sign(); }
string_type
negative_sign() const
{ return this->do_negative_sign(); }
int
frac_digits() const
{ return this->do_frac_digits(); }
pattern
pos_format() const
{ return this->do_pos_format(); }
pattern
neg_format() const
{ return this->do_neg_format(); }
protected:
~moneypunct()
{ }
virtual char_type
do_decimal_point() const
{ return char_type(); }
virtual char_type
do_thousands_sep() const
{ return char_type(); }
virtual string
do_grouping() const
{ return string(); }
virtual string_type
do_curr_symbol() const
{ return string_type(); }
string_type
do_positive_sign() const
{ return string_type(); }
string_type
do_negative_sign() const
{ return string_type(); }
int
do_frac_digits() const
{ return 0; }
pattern
do_pos_format() const
{ return pattern(); }
pattern
do_neg_format() const
{ return pattern(); }
};
re PR libstdc++/12790 (basic_filebuf doesn't handle stateful encodings) 2003-11-03 Petur Runolfsson <peturr02@ru.is> PR libstdc++/12790 * include/bits/fstream.tcc: Delete _M_last_overflowed. (basic_filebuf::basic_filebuf): Initialize _M_state_last. (basic_filebuf::open, basic_filebuf::close): Assign _M_state_beg to _M_state_cur and _M_state_last. (basic_filebuf::close): Call _M_terminate_output to handle unshift and flushing. (basic_filebuf::underflow): Assign _M_state_last, throw exception instead of calling abort when codecvt::max_length() is bad. (basic_filebuf::seekoff): Use _M_state_last when calling codecvt::length(), pass correct state to _M_seek. (basic_filebuf::seekpos): Pass __pos.state() to _M_seek. (basic_filebuf::_M_seek): Add __state_type parameter, set _M_state_cur correctly, store the resulting state in the return value and use _M_terminate_output to handle flushing and unshift. (basic_filebuf::_M_terminate_output): Flush contents of output buffer, if any, then call codecvt::unshift as needed and output the result. (basic_filebuf::sync): Move here, don't modify _M_writing or _M_reading. * include/std/std_fstream.h (basic_filebuf::_M_state_last): Declare it. (basic_filebuf::_M_last_overflowed): Delete. (basic_filebuf::_M_seek): Add __state_type parameter. (basic_filebuf::sync): Declare only. (basic_filebuf::_M_output_unshift): Delete. (basic_filebuf::_M_terminate_output): Declare it. * testsuite/testsuite_character.h: Define character class and state class plus char_traits and codecvt specializations for same for testing support for stateful encodings. * testsuite/27_io/basic_filebuf/close/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-1.cc, * testsuite/27_io/basic_filebuf/close/char/12790-2.cc, * testsuite/27_io/basic_filebuf/close/char/12790-3.cc, * testsuite/27_io/basic_filebuf/close/char/12790-4.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/open/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/seekoff/wchar_t/3.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/char/12790-4.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-3.cc, * testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc, * testsuite/27_io/basic_filebuf/sync/char/1.cc, * testsuite/27_io/basic_filebuf/sync/wchar_t/1.cc: New tests. * testsuite/27_io/basic_filebuf/3.cc, * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc, * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc, * testsuite/27_io/basic_fstream/3.cc, * testsuite/27_io/basic_ifstream/3.cc, * testsuite/27_io/basic_ofstream/3.cc: Use streamoff as off_type and fpos<state_type> as pos_type. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc, * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Check that sync does *not* set _M_writing to false. From-SVN: r73245
2003-11-04 05:27:41 +00:00
} // namespace std
#endif // _GLIBCXX_TESTSUITE_CHARACTER_H