OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

locale_facets.tcc (time_get::_M_extract_via_format): Use narrow to get from __format[__i] a char __c representing a formatting code... 

2003-12-17  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/locale_facets.tcc (time_get::_M_extract_via_format):
	Use narrow to get from __format[__i] a char __c representing a
	formatting code, don't use it to compare *__beg to __format[__i].
	* testsuite/22_locale/time_get/get_date/wchar_t/4.cc: New.

From-SVN: r74755
This commit is contained in:
Paolo Carlini 2003-12-17 22:14:09 +00:00 committed by Paolo Carlini
parent 7a681365b9
commit 7e08b3b816
3 changed files with 74 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2003-12-17 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (time_get::_M_extract_via_format):
Use narrow to get from __format[__i] a char __c representing a
formatting code, don't use it to compare *__beg to __format[__i].
* testsuite/22_locale/time_get/get_date/wchar_t/4.cc: New.
2003-12-17 Paolo Carlini <pcarlini@suse.de>
* testsuite/performance/container_benchmark.cc: Tweak outputs.

9
libstdc++-v3/include/bits/locale_facets.tcc
View File

@ -1509,14 +1509,13 @@ namespace std
for (size_t __i = 0; __beg != __end && __i < __len && !__err; ++__i)
{
char __c = __format[__i];
if (__c == '%')
if (__ctype.narrow(__format[__i], 0) == '%')
{
// Verify valid formatting code, attempt to extract.
__c = __format[++__i];
char __c = __ctype.narrow(__format[++__i], 0);
int __mem = 0;
if (__c == 'E' || __c == 'O')
__c = __format[++__i];
__c = __ctype.narrow(__format[++__i], 0);
switch (__c)
{
const char* __cs;
@ -1690,7 +1689,7 @@ namespace std
else
{
// Verify format and input match, extract and discard.
if (__c == __ctype.narrow(*__beg, 0))
if (__format[__i] == *__beg)
++__beg;
else
__err |= ios_base::failbit;

63
libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc Normal file
View File

@ -0,0 +1,63 @@
// 2003-12-17 Paolo Carlini <pcarlini@suse.de>
// Copyright (C) 2003 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING. If not, write to the Free
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
// 22.2.5.1.1 time_get members
#include <locale>
#include <sstream>
#include <testsuite_hooks.h>
void test01()
{
using namespace std;
bool test __attribute__((unused)) = true;
typedef istreambuf_iterator<wchar_t> iterator_type;
locale loc_tw = __gnu_test::try_named_locale("zh_TW");
iterator_type end;
wistringstream iss;
iss.imbue(loc_tw);
const time_get<wchar_t>& tim_get = use_facet<time_get<wchar_t> >(iss.getloc());
const ios_base::iostate good = ios_base::goodbit;
ios_base::iostate errorstate = good;
const wchar_t wstr[] = { 0x897f, 0x5143, L'2', L'0', L'0', L'3',
0x5e74, L'1', L'2', 0x6708, L'1', L'7',
0x65e5 , 0x0 };
iss.str(wstr);
iterator_type is_it01(iss);
tm time01;
tim_get.get_date(is_it01, end, iss, errorstate, &time01);
VERIFY( errorstate == ios_base::eofbit );
VERIFY( time01.tm_mon == 11 );
VERIFY( time01.tm_mday == 17 );
VERIFY( time01.tm_year == 103 );
}
int main()
{
test01();
return 0;
}