2004-03-15 Paolo Carlini <pcarlini@suse.de>

	* include/bits/locale_facets.tcc (money_get<>::_M_extract):
	Adjust the logic underlying the parsing of symbol to deal
	correctly with an optional sign component (i.e., when either
	negative_sign or positive_sign is empty)
	* testsuite/22_locale/money_get/get/char/19.cc: New.
	* testsuite/22_locale/money_get/get/wchar_t/19.cc: New.

2004-03-15  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/locale_facets.tcc (money_get<>::_M_extract):
	Do not accept an incomplete currency symbol.
	* testsuite/22_locale/money_get/get/char/18.cc: New.
	* testsuite/22_locale/money_get/get/wchar_t/18.cc: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79491 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 125 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/19.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/19.cc
new file mode 100644
index 00000000000..93c63e6ea29
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/19.cc
@@ -0,0 +1,125 @@
+// 2004-03-15  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2004 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.1.1 money_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+struct My_money_io_01 : public std::moneypunct<wchar_t, false>
+{
+  std::wstring do_curr_symbol() const { return L"$"; }
+  std::wstring do_positive_sign() const { return L""; }
+  std::wstring do_negative_sign() const { return L""; }
+
+  pattern do_neg_format() const
+  {
+    pattern pat = { { value, symbol, none, sign } };
+    return pat;
+  }
+};
+
+struct My_money_io_02 : public std::moneypunct<wchar_t, false>
+{
+  std::wstring do_curr_symbol() const { return L"%"; }
+  std::wstring do_positive_sign() const { return L""; }
+  std::wstring do_negative_sign() const { return L"-"; }
+
+  pattern do_neg_format() const
+  {
+    pattern pat = { { value, symbol, sign, none } };
+    return pat;
+  }
+};
+
+struct My_money_io_03 : public std::moneypunct<wchar_t, false>
+{
+  std::wstring do_curr_symbol() const { return L"&"; }
+  std::wstring do_positive_sign() const { return L""; }
+  std::wstring do_negative_sign() const { return L""; }
+
+  pattern do_neg_format() const
+  {
+    pattern pat = { { value, space, symbol, sign } };
+    return pat;
+  }
+};
+
+// When both do_positive_sign and do_negative_sign return an empty
+// string, patterns of the forms { value, symbol, none, sign },
+// { value, symbol, sign, none } and { X, Y, symbol, sign } imply
+// that the symbol is not consumed since no other characters are
+// needed to complete the format.
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+
+  bool test __attribute__((unused)) = true;
+
+  // basic construction
+  locale loc_01(locale::classic(), new My_money_io_01);
+  locale loc_02(locale::classic(), new My_money_io_02);
+  locale loc_03(locale::classic(), new My_money_io_03);
+
+  iterator_type end, end01, end02, end03;
+  wistringstream iss_01, iss_02, iss_03;
+  iss_01.imbue(loc_01);
+  iss_02.imbue(loc_02);
+  iss_03.imbue(loc_03);
+  // cache the money_get facet
+  const money_get<wchar_t>& mon_get_01 =
+    use_facet<money_get<wchar_t> >(iss_01.getloc());
+  const money_get<wchar_t>& mon_get_02 =
+    use_facet<money_get<wchar_t> >(iss_02.getloc());
+  const money_get<wchar_t>& mon_get_03 =
+    use_facet<money_get<wchar_t> >(iss_03.getloc());
+
+  iss_01.str(L"10$"); 
+  iterator_type is_it01(iss_01);
+  wstring result01;
+  ios_base::iostate err01 = ios_base::goodbit;
+  end01 = mon_get_01.get(is_it01, end, false, iss_01, err01, result01);
+  VERIFY( err01 == ios_base::goodbit );
+  VERIFY( *end01 == L'$' );
+
+  iss_02.str(L"50%");
+  iterator_type is_it02(iss_02);
+  wstring result02;
+  ios_base::iostate err02 = ios_base::goodbit;
+  end02 = mon_get_02.get(is_it02, end, false, iss_02, err02, result02);
+  VERIFY( err02 == ios_base::goodbit );
+  VERIFY( *end02 == L'%' );
+
+  iss_03.str(L"7 &");
+  iterator_type is_it03(iss_03);
+  wstring result03;
+  ios_base::iostate err03 = ios_base::goodbit;
+  end03 = mon_get_03.get(is_it03, end, false, iss_03, err03, result03);
+  VERIFY( err03 == ios_base::goodbit );
+  VERIFY( *end03 == L'&' );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}