Skip to content

R
riscv-gcc-1
Commit b7e64db2 by Paolo Carlini Committed by Paolo Carlini
Options

locale_facets.tcc (money_get::do_get(string_type&)): Fix parsing of the remaining sign characters. 

2004-02-16  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/locale_facets.tcc (money_get::do_get(string_type&)):
	Fix parsing of the remaining sign characters.
	* 22_locale/money_get/get/char/2.cc: Tweak: now, correctly,
	the input is scanned 'til eof.
	* 22_locale/money_get/get/char/4.cc: Likewise.
	* 22_locale/money_get/get/wchar_t/2.cc: Likewise.
	* 22_locale/money_get/get/wchar_t/4.cc: Likewise.
	* 22_locale/money_get/get/char/8.cc: Tweak: override do_neg_format,
	not do_pos_format: the former is the only one that matters during
	input.
	* 22_locale/money_get/get/wchar_t/8.cc: Likewise.

	* 22_locale/money_get/get/char/6.cc: Minor tweak.
	* 22_locale/money_get/get/wchar_t/6.cc: Likewise.

From-SVN: r77896
parent 9ac97460
Showing with 36 additions and 36 deletions
libstdc++-v3/ChangeLog
2004-02-16 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (money_get::do_get(string_type&)):
Fix parsing of the remaining sign characters.
* 22_locale/money_get/get/char/2.cc: Tweak: now, correctly,
the input is scanned 'til eof.
* 22_locale/money_get/get/char/4.cc: Likewise.
* 22_locale/money_get/get/wchar_t/2.cc: Likewise.
* 22_locale/money_get/get/wchar_t/4.cc: Likewise.
* 22_locale/money_get/get/char/8.cc: Tweak: override do_neg_format,
not do_pos_format: the former is the only one that matters during
input.
* 22_locale/money_get/get/wchar_t/8.cc: Likewise.
* 22_locale/money_get/get/char/6.cc: Minor tweak.
* 22_locale/money_get/get/wchar_t/6.cc: Likewise.
2004-02-15 David Asher <david.asher@cavium.com> 2004-02-15 David Asher <david.asher@cavium.com>
PR libstdc++/11352 PR libstdc++/11352
......
libstdc++-v3/include/bits/locale_facets.tcc
...@@ -1207,7 +1207,7 @@ namespace std ...@@ -1207,7 +1207,7 @@ namespace std
|| ((static_cast<part>(__p.field[3]) != money_base::none) || ((static_cast<part>(__p.field[3]) != money_base::none)
&& __i == 2)) && __i == 2))
{ {
// According to 22.2.6.1.2.2, symbol is required // According to 22.2.6.1.2, p2, symbol is required
// if (__io.flags() & ios_base::showbase), // if (__io.flags() & ios_base::showbase),
// otherwise is optional and consumed only if // otherwise is optional and consumed only if
// other characters are needed to complete the // other characters are needed to complete the
...@@ -1293,9 +1293,8 @@ namespace std ...@@ -1293,9 +1293,8 @@ namespace std
{ {
const size_type __len = __sign.size(); const size_type __len = __sign.size();
size_type __i = 1; size_type __i = 1;
for (; __beg != __end && __i < __len; ++__i) for (; __beg != __end && __i < __len
for (; __beg != __end && *__beg == __sign[__i]; ++__beg, ++__i);
&& *__beg != __sign[__i]; ++__beg);
if (__i != __len) if (__i != __len)
__testvalid = false; __testvalid = false;
......
libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc
...@@ -81,7 +81,7 @@ void test02() ...@@ -81,7 +81,7 @@ void test02()
ios_base::iostate err10 = ios_base::goodbit; ios_base::iostate err10 = ios_base::goodbit;
mon_get.get(is_it10, end, true, iss, err10, result10); mon_get.get(is_it10, end, true, iss, err10, result10);
VERIFY( result10 == digits2 ); VERIFY( result10 == digits2 );
VERIFY( err10 == ios_base::goodbit ); VERIFY( err10 == ios_base::eofbit );
iss.str("(HKD .01)"); iss.str("(HKD .01)");
iterator_type is_it11(iss); iterator_type is_it11(iss);
...@@ -89,7 +89,7 @@ void test02() ...@@ -89,7 +89,7 @@ void test02()
ios_base::iostate err11 = ios_base::goodbit; ios_base::iostate err11 = ios_base::goodbit;
mon_get.get(is_it11, end, true, iss, err11, result11); mon_get.get(is_it11, end, true, iss, err11, result11);
VERIFY( result11 == digits4 ); VERIFY( result11 == digits4 );
VERIFY( err11 == ios_base::goodbit ); VERIFY( err11 == ios_base::eofbit );
// for the "en_HK" locale the parsing of the very same input streams must // for the "en_HK" locale the parsing of the very same input streams must
// be successful without showbase too, since the symbol field appears in // be successful without showbase too, since the symbol field appears in
...@@ -111,7 +111,7 @@ void test02() ...@@ -111,7 +111,7 @@ void test02()
ios_base::iostate err13 = ios_base::goodbit; ios_base::iostate err13 = ios_base::goodbit;
mon_get.get(is_it13, end, true, iss, err13, result13); mon_get.get(is_it13, end, true, iss, err13, result13);
VERIFY( result13 == digits2 ); VERIFY( result13 == digits2 );
VERIFY( err13 == ios_base::goodbit ); VERIFY( err13 == ios_base::eofbit );
iss.str("(HKD .01)"); iss.str("(HKD .01)");
iterator_type is_it14(iss); iterator_type is_it14(iss);
...@@ -119,7 +119,7 @@ void test02() ...@@ -119,7 +119,7 @@ void test02()
ios_base::iostate err14 = ios_base::goodbit; ios_base::iostate err14 = ios_base::goodbit;
mon_get.get(is_it14, end, true, iss, err14, result14); mon_get.get(is_it14, end, true, iss, err14, result14);
VERIFY( result14 == digits4 ); VERIFY( result14 == digits4 );
VERIFY( err14 == ios_base::goodbit ); VERIFY( err14 == ios_base::eofbit );
} }
int main() int main()
......
libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
void test04() void test04()
{ {
using namespace std; using namespace std;
typedef money_base::part part;
typedef money_base::pattern pattern;
typedef istreambuf_iterator<char> iterator_type; typedef istreambuf_iterator<char> iterator_type;
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
...@@ -64,7 +62,7 @@ void test04() ...@@ -64,7 +62,7 @@ void test04()
ios_base::iostate err03 = ios_base::goodbit; ios_base::iostate err03 = ios_base::goodbit;
mon_get.get(is_it03, end, true, iss, err03, result3); mon_get.get(is_it03, end, true, iss, err03, result3);
VERIFY( result3 == digits4 ); VERIFY( result3 == digits4 );
VERIFY( err03 == ios_base::goodbit ); VERIFY( err03 == ios_base::eofbit );
} }
int main() int main()
......
libstdc++-v3/testsuite/22_locale/money_get/get/char/6.cc
// 2001-09-12 Benjamin Kosnik <bkoz@redhat.com> // 2001-09-12 Benjamin Kosnik <bkoz@redhat.com>
// Copyright (C) 2001, 2002, 2003 Free Software Foundation // Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 // software; you can redistribute it and/or modify it under the
...@@ -35,12 +35,6 @@ struct My_money_io : public std::moneypunct<char,false> ...@@ -35,12 +35,6 @@ struct My_money_io : public std::moneypunct<char,false>
int do_frac_digits() const { return 2; } int do_frac_digits() const { return 2; }
pattern do_pos_format() const
{
pattern pat = { { symbol, none, sign, value } };
return pat;
}
pattern do_neg_format() const pattern do_neg_format() const
{ {
pattern pat = { { symbol, none, sign, value } }; pattern pat = { { symbol, none, sign, value } };
......
libstdc++-v3/testsuite/22_locale/money_get/get/char/8.cc
...@@ -34,7 +34,7 @@ struct My_money_io_a : public std::moneypunct<char,false> ...@@ -34,7 +34,7 @@ struct My_money_io_a : public std::moneypunct<char,false>
int do_frac_digits() const { return 2; } int do_frac_digits() const { return 2; }
pattern do_pos_format() const pattern do_neg_format() const
{ {
pattern pat = { { sign, value, space, symbol } }; pattern pat = { { sign, value, space, symbol } };
return pat; return pat;
...@@ -51,7 +51,7 @@ struct My_money_io_b : public std::moneypunct<char,false> ...@@ -51,7 +51,7 @@ struct My_money_io_b : public std::moneypunct<char,false>
int do_frac_digits() const { return 2; } int do_frac_digits() const { return 2; }
pattern do_pos_format() const pattern do_neg_format() const
{ {
pattern pat = { { sign, value, symbol, none } }; pattern pat = { { sign, value, symbol, none } };
return pat; return pat;
......
libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc
...@@ -81,7 +81,7 @@ void test02() ...@@ -81,7 +81,7 @@ void test02()
ios_base::iostate err10 = ios_base::goodbit; ios_base::iostate err10 = ios_base::goodbit;
mon_get.get(is_it10, end, true, iss, err10, result10); mon_get.get(is_it10, end, true, iss, err10, result10);
VERIFY( result10 == digits2 ); VERIFY( result10 == digits2 );
VERIFY( err10 == ios_base::goodbit ); VERIFY( err10 == ios_base::eofbit );
iss.str(L"(HKD .01)"); iss.str(L"(HKD .01)");
iterator_type is_it11(iss); iterator_type is_it11(iss);
...@@ -89,7 +89,7 @@ void test02() ...@@ -89,7 +89,7 @@ void test02()
ios_base::iostate err11 = ios_base::goodbit; ios_base::iostate err11 = ios_base::goodbit;
mon_get.get(is_it11, end, true, iss, err11, result11); mon_get.get(is_it11, end, true, iss, err11, result11);
VERIFY( result11 == digits4 ); VERIFY( result11 == digits4 );
VERIFY( err11 == ios_base::goodbit ); VERIFY( err11 == ios_base::eofbit );
// for the "en_HK" locale the parsing of the very same input streams must // for the "en_HK" locale the parsing of the very same input streams must
// be successful without showbase too, since the symbol field appears in // be successful without showbase too, since the symbol field appears in
...@@ -111,7 +111,7 @@ void test02() ...@@ -111,7 +111,7 @@ void test02()
ios_base::iostate err13 = ios_base::goodbit; ios_base::iostate err13 = ios_base::goodbit;
mon_get.get(is_it13, end, true, iss, err13, result13); mon_get.get(is_it13, end, true, iss, err13, result13);
VERIFY( result13 == digits2 ); VERIFY( result13 == digits2 );
VERIFY( err13 == ios_base::goodbit ); VERIFY( err13 == ios_base::eofbit );
iss.str(L"(HKD .01)"); iss.str(L"(HKD .01)");
iterator_type is_it14(iss); iterator_type is_it14(iss);
...@@ -119,7 +119,7 @@ void test02() ...@@ -119,7 +119,7 @@ void test02()
ios_base::iostate err14 = ios_base::goodbit; ios_base::iostate err14 = ios_base::goodbit;
mon_get.get(is_it14, end, true, iss, err14, result14); mon_get.get(is_it14, end, true, iss, err14, result14);
VERIFY( result14 == digits4 ); VERIFY( result14 == digits4 );
VERIFY( err14 == ios_base::goodbit ); VERIFY( err14 == ios_base::eofbit );
} }
int main() int main()
......
libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
void test04() void test04()
{ {
using namespace std; using namespace std;
typedef money_base::part part;
typedef money_base::pattern pattern;
typedef istreambuf_iterator<wchar_t> iterator_type; typedef istreambuf_iterator<wchar_t> iterator_type;
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
...@@ -64,7 +62,7 @@ void test04() ...@@ -64,7 +62,7 @@ void test04()
ios_base::iostate err03 = ios_base::goodbit; ios_base::iostate err03 = ios_base::goodbit;
mon_get.get(is_it03, end, true, iss, err03, result3); mon_get.get(is_it03, end, true, iss, err03, result3);
VERIFY( result3 == digits4 ); VERIFY( result3 == digits4 );
VERIFY( err03 == ios_base::goodbit ); VERIFY( err03 == ios_base::eofbit );
} }
int main() int main()
......
libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/6.cc
// 2001-09-12 Benjamin Kosnik <bkoz@redhat.com> // 2001-09-12 Benjamin Kosnik <bkoz@redhat.com>
// Copyright (C) 2001, 2002, 2003 Free Software Foundation // Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 // software; you can redistribute it and/or modify it under the
...@@ -35,12 +35,6 @@ struct My_money_io : public std::moneypunct<wchar_t,false> ...@@ -35,12 +35,6 @@ struct My_money_io : public std::moneypunct<wchar_t,false>
int do_frac_digits() const { return 2; } int do_frac_digits() const { return 2; }
pattern do_pos_format() const
{
pattern pat = { { symbol, none, sign, value } };
return pat;
}
pattern do_neg_format() const pattern do_neg_format() const
{ {
pattern pat = { { symbol, none, sign, value } }; pattern pat = { { symbol, none, sign, value } };
......
libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/8.cc
...@@ -34,7 +34,7 @@ struct My_money_io_a : public std::moneypunct<wchar_t,false> ...@@ -34,7 +34,7 @@ struct My_money_io_a : public std::moneypunct<wchar_t,false>
int do_frac_digits() const { return 2; } int do_frac_digits() const { return 2; }
pattern do_pos_format() const pattern do_neg_format() const
{ {
pattern pat = { { sign, value, space, symbol } }; pattern pat = { { sign, value, space, symbol } };
return pat; return pat;
...@@ -51,7 +51,7 @@ struct My_money_io_b : public std::moneypunct<wchar_t,false> ...@@ -51,7 +51,7 @@ struct My_money_io_b : public std::moneypunct<wchar_t,false>
int do_frac_digits() const { return 2; } int do_frac_digits() const { return 2; }
pattern do_pos_format() const pattern do_neg_format() const
{ {
pattern pat = { { sign, value, symbol, none } }; pattern pat = { { sign, value, symbol, none } };
return pat; return pat;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment