This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Fix _M_extract_int for grouped hexs and octs
- From: Paolo Carlini <pcarlini at unitus dot it>
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 28 Feb 2002 22:22:34 +0100
- Subject: [v3] Fix _M_extract_int for grouped hexs and octs
Hi,
as discussed yesterday on libstdc++, the below fixes the parsing of grouped hexs
and octs. I took the occasion to tweak a couple of tests for the AIX "static"
problem. Tested x86-linux, approved by Benjamin Kosnik and committed to head. I
will shortly pull it to the branch.
Ciao, Paolo.
///////////////
2002-02-28 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.
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/locale_facets.tcc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gcc/libstdc++-v3/include/bits/locale_facets.tcc 2002/02/26 20:56:24
1.64
+++ gcc/libstdc++-v3/include/bits/locale_facets.tcc 2002/02/28 21:16:39
1.65
@@ -310,7 +310,7 @@
__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)
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/27_io/ios_manip_basefield.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gcc/libstdc++-v3/testsuite/27_io/ios_manip_basefield.cc 2002/02/27
19:54:32 1.8
+++ gcc/libstdc++-v3/testsuite/27_io/ios_manip_basefield.cc 2002/02/28
21:16:43 1.9
@@ -38,7 +38,7 @@
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
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/27_io/ios_manip_fmtflags.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gcc/libstdc++-v3/testsuite/27_io/ios_manip_fmtflags.cc 2002/02/20
21:06:42 1.6
+++ gcc/libstdc++-v3/testsuite/27_io/ios_manip_fmtflags.cc 2002/02/28
21:16:43 1.7
@@ -41,13 +41,13 @@
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;
}
===================================================================
RCS file:
/cvs/gcc/gcc/libstdc++-v3/testsuite/22_locale/num_get_members_char.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gcc/libstdc++-v3/testsuite/22_locale/num_get_members_char.cc
2002/02/01 00:24:12 1.7
+++ gcc/libstdc++-v3/testsuite/22_locale/num_get_members_char.cc
2002/02/28 21:16:45 1.8
@@ -213,7 +213,7 @@
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 @@
#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;
}
===================================================================
RCS file:
/cvs/gcc/gcc/libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcc/libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc
2002/02/01 00:24:12 1.5
+++ gcc/libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc
2002/02/28 21:16:45 1.6
@@ -214,7 +214,7 @@
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 @@
}
#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 @@
test01();
test02();
test03();
+ test04();
#endif
return 0;
}