This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[PATCH] Fix _M_extract_int for grouped hexs and octs
- From: Paolo Carlini <pcarlini at unitus dot it>
- To: libstdc++ at gcc dot gnu dot org
- Cc: bkoz at redhat dot com
- Date: Thu, 28 Feb 2002 21:45:12 +0100
- Subject: [PATCH] Fix _M_extract_int for grouped hexs and octs
Hi!
a bunch of espressos later ;-), here it is, fixed as Benjamin suggested. An
unexpected problem I had (i.e., one more coffee) is the following: with this
patch test01() was unexpectedly failing here:
// const void
iss.str("0xbffff74c.");
iss.clear();
err = goodbit;
ng.get(iss.rdbuf(), 0, iss, err, v);
VERIFY( &v != &cv );
VERIFY( err == goodbit );
It turned out to be due to the terminal ".", which happens to be the
thousand_separator of "de_DE", now parsed for hexs too! Therefore I substituted
it with a comma.
I took also the occasion to remove 3 more static keywords lurking around.
Tested x86-linux, as usual.
Is it ok for head, and, after some more testing, 3.1 ??
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.
diff -urN libstdc++-v3-orig/include/bits/locale_facets.tcc
libstdc++-v3/include/bits/locale_facets.tcc
--- libstdc++-v3-orig/include/bits/locale_facets.tcc Tue Feb 26 14:26:36 2002
+++ libstdc++-v3/include/bits/locale_facets.tcc Thu Feb 28 12:58:19 2002
@@ -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)
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get_members_char.cc
libstdc++-v3/testsuite/22_locale/num_get_members_char.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get_members_char.cc Fri Feb 1
01:24:12 2002
+++ libstdc++-v3/testsuite/22_locale/num_get_members_char.cc Thu Feb 28 21:28:34
2002
@@ -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;
}
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get_members_wchar_t.cc
libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get_members_wchar_t.cc Fri Feb 1
01:24:12 2002
+++ libstdc++-v3/testsuite/22_locale/num_get_members_wchar_t.cc Thu Feb 28
21:28:49 2002
@@ -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;
}
diff -urN libstdc++-v3-orig/testsuite/27_io/ios_manip_basefield.cc
libstdc++-v3/testsuite/27_io/ios_manip_basefield.cc
--- libstdc++-v3-orig/testsuite/27_io/ios_manip_basefield.cc Wed Feb 27 20:30:06
2002
+++ libstdc++-v3/testsuite/27_io/ios_manip_basefield.cc Thu Feb 28 19:25:44 2002
@@ -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
diff -urN libstdc++-v3-orig/testsuite/27_io/ios_manip_fmtflags.cc
libstdc++-v3/testsuite/27_io/ios_manip_fmtflags.cc
--- libstdc++-v3-orig/testsuite/27_io/ios_manip_fmtflags.cc Wed Feb 20 22:51:52
2002
+++ libstdc++-v3/testsuite/27_io/ios_manip_fmtflags.cc Thu Feb 28 19:30:01 2002
@@ -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;
}