locale_facets.tcc (do_get): Honor $22.2.6.3.3/8 and make sure the number of digits required after the...

2003-05-26  Brendan Kehoe  <brendan@zen.org>

    * include/bits/locale_facets.tcc (do_get): Honor $22.2.6.3.3/8 and
    make sure the number of digits required after the decimal-point
    (if any) is exactly the value returned by frac_digits().
    * testsuite/22_locale/money_get/get/char/9.cc: New.
    * testsuite/22_locale/money_get/get/wchar_t/9.cc: New.

From-SVN: r67196

3 files changed, 184 insertions, 0 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5e70b6e..455331d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -10,6 +10,8 @@
 	* include/bits/locale_facets.tcc (do_get): Honor $22.2.6.3.3/8 and
 	make sure the number of digits required after the decimal-point
 	(if any) is exactly the value returned by frac_digits().
+	* testsuite/22_locale/money_get/get/char/9.cc: New.
+	* testsuite/22_locale/money_get/get/wchar_t/9.cc: New.
 
 2003-05-27  Jonathan Wakely  <redi@gcc.gnu.org>
 
diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/9.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/9.cc
new file mode 100644
index 0000000..cb56e1a
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/9.cc
@@ -0,0 +1,91 @@
+// 2003-05-27 Brendan Kehoe  <brendan@zen.org>
+
+// 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.6.3.3/8
+// The number of digits required after the decimal point (if any) is exactly
+// the value returned by frac_digits().
+
+#include <locale>
+#include <sstream>
+
+class dublin : public std::moneypunct<char> {
+public:
+  int do_frac_digits() const { return 3; }
+};
+
+int main()
+{
+  std::istringstream liffey;
+  std::string coins;
+
+  std::locale eire(std::locale::classic(), new dublin);
+  liffey.imbue(eire);
+
+  const std::money_get<char>& greed
+    = std::use_facet<std::money_get<char> >(liffey.getloc());
+
+  typedef std::istreambuf_iterator<char> iterator_type;
+  iterator_type is(liffey);
+  iterator_type end;
+
+  std::ios_base::iostate err01 = std::ios_base::goodbit;
+
+  int fails = 0;
+
+  // Feed it 1 digit too many, which should fail.
+  liffey.str("12.3456");
+  greed.get(is, end, false, liffey, err01, coins);
+  if (! (err01 & std::ios_base::failbit ))
+    fails |= 0x01;
+
+  err01 = std::ios_base::goodbit;
+
+  // Feed it exactly what it wants, which should succeed.
+  liffey.str("12.345");
+  greed.get(is, end, false, liffey, err01, coins);
+  if ( err01 & std::ios_base::failbit )
+    fails |= 0x02;
+
+  err01 = std::ios_base::goodbit;
+
+  // Feed it 1 digit too few, which should fail.
+  liffey.str("12.34");
+  greed.get(is, end, false, liffey, err01, coins);
+  if (! ( err01 & std::ios_base::failbit ))
+    fails |= 0x04;
+
+  err01 = std::ios_base::goodbit;
+
+  // Feed it only a decimal-point, which should fail.
+  liffey.str("12.");
+  greed.get(is, end, false, liffey, err01, coins);
+  if (! (err01 & std::ios_base::failbit ))
+    fails |= 0x08;
+
+  err01 = std::ios_base::goodbit;
+
+  // Feed it no decimal-point at all, which should succeed.
+  liffey.str("12");
+  greed.get(is, end, false, liffey, err01, coins);
+  if ( err01 & std::ios_base::failbit )
+    fails |= 0x10;
+
+  return fails;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/9.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/9.cc
new file mode 100644
index 0000000..989066b
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/9.cc
@@ -0,0 +1,91 @@
+// 2003-05-27 Brendan Kehoe  <brendan@zen.org>
+
+// 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.6.3.3/8
+// The number of digits required after the decimal point (if any) is exactly
+// the value returned by frac_digits().
+
+#include <locale>
+#include <sstream>
+
+class dublin : public std::moneypunct<wchar_t> {
+public:
+  int do_frac_digits() const { return 3; }
+};
+
+int main()
+{
+  std::wistringstream liffey;
+  std::wstring coins;
+
+  std::locale eire(std::locale::classic(), new dublin);
+  liffey.imbue(eire);
+
+  const std::money_get<wchar_t>& greed
+    = std::use_facet<std::money_get<wchar_t> >(liffey.getloc());
+
+  typedef std::istreambuf_iterator<wchar_t> iterator_type;
+  iterator_type is(liffey);
+  iterator_type end;
+
+  std::ios_base::iostate err01 = std::ios_base::goodbit;
+
+  int fails = 0;
+
+  // Feed it 1 digit too many, which should fail.
+  liffey.str(L"12.3456");
+  greed.get(is, end, false, liffey, err01, coins);
+  if (! (err01 & std::ios_base::failbit ))
+    fails |= 0x01;
+
+  err01 = std::ios_base::goodbit;
+
+  // Feed it exactly what it wants, which should succeed.
+  liffey.str(L"12.345");
+  greed.get(is, end, false, liffey, err01, coins);
+  if ( err01 & std::ios_base::failbit )
+    fails |= 0x02;
+
+  err01 = std::ios_base::goodbit;
+
+  // Feed it 1 digit too few, which should fail.
+  liffey.str(L"12.34");
+  greed.get(is, end, false, liffey, err01, coins);
+  if (! ( err01 & std::ios_base::failbit ))
+    fails |= 0x04;
+
+  err01 = std::ios_base::goodbit;
+
+  // Feed it only a decimal-point, which should fail.
+  liffey.str(L"12.");
+  greed.get(is, end, false, liffey, err01, coins);
+  if (! (err01 & std::ios_base::failbit ))
+    fails |= 0x08;
+
+  err01 = std::ios_base::goodbit;
+
+  // Feed it no decimal-point at all, which should succeed.
+  liffey.str(L"12");
+  greed.get(is, end, false, liffey, err01, coins);
+  if ( err01 & std::ios_base::failbit )
+    fails |= 0x10;
+
+  return fails;
+}