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

locale_facets.tcc (num_get::_M_extract_int): Admit grouping for octals and hexadecimals too. 

2002-03-01  Paolo Carlini  <pcarlini@unitus.it>

        * include/bits/locale_facets.tcc (num_get::_M_extract_int):
        Admit grouping for octals and hexadecimals too.
        * testsuite/22_locale/num_get_members_char.cc: Add test04.
        (test01): Tweak "." -> "," in void* test.
        * testsuite/22_locale/num_get_members_wchar_t.cc: Ditto.

        * testsuite/27_io/ios_manip_basefield.cc: Remove static keyword.
        * testsuite/27_io/ios_manip_fmtflags.cc: Remove two of them.

	* testsuite/27_io/ios_manip_basefield.cc (test01):
	Fix for 64 bit machines.

From-SVN: r50203
This commit is contained in:
Paolo Carlini 2002-03-01 20:03:21 +01:00 committed by Paolo Carlini
parent 0c78db226f
commit 3adfd94b4f
6 changed files with 165 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,17 @@
2002-03-01 Paolo Carlini <pcarlini@unitus.it>
* include/bits/locale_facets.tcc (num_get::_M_extract_int):
Admit grouping for octals and hexadecimals too.
* testsuite/22_locale/num_get_members_char.cc: Add test04.
(test01): Tweak "." -> "," in void* test.
* testsuite/22_locale/num_get_members_wchar_t.cc: Ditto.
* testsuite/27_io/ios_manip_basefield.cc: Remove static keyword.
* testsuite/27_io/ios_manip_fmtflags.cc: Remove two of them.
* testsuite/27_io/ios_manip_basefield.cc (test01):
Fix for 64 bit machines.
2002-02-28 Richard Henderson <rth@redhat.com>
* config/linker-map.gnu: Export operator new with unsigned long,

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

@ -310,7 +310,7 @@ namespace std
__ctype.widen(_S_atoms, _S_atoms + __len, __watoms);
string __found_grouping;
const string __grouping = __np.grouping();
bool __check_grouping = __grouping.size() && __base == 10;
bool __check_grouping = __grouping.size();
int __sep_pos = 0;
const char_type __sep = __np.thousands_sep();
while (__beg != __end)

67
libstdc++-v3/testsuite/22_locale/num_get_members_char.cc
View File

@ -213,7 +213,7 @@ void test01()
VERIFY( err == goodbit );
// const void
iss.str("0xbffff74c.");
iss.str("0xbffff74c,");
iss.clear();
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, v);
@ -332,11 +332,76 @@ void test03()
#endif
}
struct MyNP : std::numpunct<char>
{
std::string do_grouping() const;
char do_thousands_sep() const;
};
std::string MyNP::do_grouping() const { std::string s("\3"); return s; }
char MyNP::do_thousands_sep() const { return ' '; }
// Testing the correct parsing of grouped hexadecimals and octals.
void test04()
{
using namespace std;
bool test = true;
unsigned long ul;
istringstream iss;
iss.imbue(locale(locale(), new MyNP));
const num_get<char>& ng = use_facet<num_get<char> >(iss.getloc());
const ios_base::iostate goodbit = ios_base::goodbit;
ios_base::iostate err = ios_base::goodbit;
iss.setf(ios::hex, ios::basefield);
iss.str("0xbf fff 74c.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 0xbffff74c );
iss.str("0Xf fff.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 0xffff );
iss.str("f ffe.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 0xfffe );
iss.setf(ios::oct, ios::basefield);
iss.str("07 654 321.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 07654321 );
iss.str("07 777.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 07777 );
iss.str("7 776.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 07776 );
}
int main()
{
test01();
test02();
test03();
test04();
return 0;
}

67
libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc
View File

@ -214,7 +214,7 @@ void test01()
VERIFY( err == goodbit );
// const void
iss.str(L"0xbffff74c.");
iss.str(L"0xbffff74c,");
iss.clear();
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, v);
@ -333,6 +333,70 @@ void test03()
}
#endif
}
struct MyNP : std::numpunct<wchar_t>
{
std::string do_grouping() const;
wchar_t do_thousands_sep() const;
};
std::string MyNP::do_grouping() const { std::string s("\3"); return s; }
wchar_t MyNP::do_thousands_sep() const { return L' '; }
// Testing the correct parsing of grouped hexadecimals and octals.
void test04()
{
using namespace std;
bool test = true;
unsigned long ul;
wistringstream iss;
iss.imbue(locale(locale(), new MyNP));
const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc());
const ios_base::iostate goodbit = ios_base::goodbit;
ios_base::iostate err = ios_base::goodbit;
iss.setf(ios::hex, ios::basefield);
iss.str(L"0xbf fff 74c.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 0xbffff74c );
iss.str(L"0Xf fff.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 0xffff );
iss.str(L"f ffe.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 0xfffe );
iss.setf(ios::oct, ios::basefield);
iss.str(L"07 654 321.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 07654321 );
iss.str(L"07 777.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 07777 );
iss.str(L"7 776.");
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, ul);
VERIFY( err == goodbit );
VERIFY( ul == 07776 );
}
#endif
int main()
@ -341,6 +405,7 @@ int main()
test01();
test02();
test03();
test04();
#endif
return 0;
}

32
libstdc++-v3/testsuite/27_io/ios_manip_basefield.cc
View File

@ -38,7 +38,7 @@ struct MyNP : std::numpunct<char>
char do_thousands_sep() const;
};
std::string MyNP::do_grouping() const { static std::string s("\3"); return s; }
std::string MyNP::do_grouping() const { std::string s("\3"); return s; }
char MyNP::do_thousands_sep() const { return ' '; }
int
@ -46,27 +46,27 @@ test01()
{
bool test = true;
const char lit[] = "037 777 654 322\n:037 776 543 211:\n:037 777 654 322 :\n"
": 037 777 765 433:\n: 037 777 776 544:\n: 04 553 207:\n"
const char lit[] = "0123 456\n: 01 234 567:\n:0123 456 :\n"
": 012 345:\n: 01 234:\n: 04 553 207:\n"
":0361 100 :\n: 030 071:\n: 02 322:\n"
"0x000012 345 678\n";
std::ostringstream oss;
oss.imbue(std::locale(std::locale(), new MyNP));
oss << std::oct << std::showbase;
oss << -0123456l << std::endl;
oss << 0123456l << std::endl;
oss << ":" << std::setw(11);
oss << -01234567l << ":" << std::endl;
oss << 01234567l << ":" << std::endl;
oss << ":" << std::setw(18) << std::left;
oss << -0123456l << ":" << std::endl;
oss << ":" << std::setw(11) << std::left;
oss << 0123456l << ":" << std::endl;
oss << ":" << std::setw(18) << std::right;
oss << -012345l << ":" << std::endl;
oss << ":" << std::setw(11) << std::right;
oss << 012345l << ":" << std::endl;
oss << ":" << std::setw(18) << std::internal;
oss << -01234l << ":" << std::endl;
oss << ":" << std::setw(11) << std::internal;
oss << 01234l << ":" << std::endl;
oss << ":" << std::setw(11);
oss << 1234567l << ":" << std::endl;
@ -128,11 +128,11 @@ main()
// Projected output:
/*
037 777 654 322
:037 776 543 211:
:037 777 654 322 :
: 037 777 765 433:
: 037 777 776 544:
0123 456
: 01 234 567:
:0123 456 :
: 012 345:
: 01 234:
: 04 553 207:
:0361 100 :
: 030 071:

4
libstdc++-v3/testsuite/27_io/ios_manip_fmtflags.cc
View File

@ -41,13 +41,13 @@ struct MyNP : std::numpunct<char>
std::string MyNP::do_truename() const
{
static std::string s("yea");
std::string s("yea");
return s;
}
std::string MyNP::do_falsename() const
{
static std::string s("nay");
std::string s("nay");
return s;
}