2008-06-16 Paolo Carlini <paolo.carlini@oracle.com>

	* include/bits/basic_string.h (stod, stof, stoi, stol, stold, stoll,
	stoul, stoull, to_string, to_wstring): Declare in C++0x mode.
	* src/string_conversions.cc: Add.
	* src/Makefile.am: Update.
	* config/abi/pre/gnu.ver: Adjust exports.
	* src/Makefile.in: Regenerate.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc:
	New.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stold.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stoll.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stoull.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/char/
	to_string.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stod.cc: New.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stof.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stoi.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stol.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stold.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stoll.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stoul.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stoull.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	to_wstring.cc: Likewise.






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

1 files changed, 205 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoi.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoi.cc
new file mode 100644
index 00000000000..d8c637dfdf3
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stoi.cc
@@ -0,0 +1,205 @@
+// { dg-options "-std=gnu++0x" }
+// 2008-06-15  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// Copyright (C) 2008 Free Software Foundation, Inc.
+//
+// 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 21.4 Numeric Conversions [string.conversions]
+
+#include <string>
+#include <limits>
+#include <stdexcept>
+#include <testsuite_hooks.h>
+
+void
+test01()
+{
+#ifdef _GLIBCXX_USE_C99
+
+  bool test __attribute__((unused)) = false;
+  using namespace std;
+
+  try
+    {
+      wstring one;
+      stoi(one);      
+    }
+  catch(std::invalid_argument)
+    {
+      test = true;
+    }
+  catch(...)
+    {
+    }
+  VERIFY( test );
+
+  test = false;
+  try
+    {
+      wstring one(L"a");
+      stoi(one);      
+    }
+  catch(std::invalid_argument)
+    {
+      test = true;
+    }
+  catch(...)
+    {
+    }
+  VERIFY( test );
+
+  int i1 = 0;
+  try
+    {
+      wstring one(L"a");
+      i1 = stoi(one, 0, 16);      
+    }
+  catch(...)
+    {
+      test = false;
+    }
+  VERIFY( test );
+  VERIFY( i1 == 10 );
+
+  size_t idx1 = 0;
+  try
+    {
+      wstring one(L"78");
+      i1 = stoi(one, &idx1, 8);      
+    }
+  catch(...)
+    {
+      test = false;
+    }
+  VERIFY( test );
+  VERIFY( i1 == 7 );
+  VERIFY( idx1 = 1 );
+
+  try
+    {
+      wstring one(L"10112");
+      i1 = stoi(one, &idx1, 2);      
+    }
+  catch(...)
+    {
+      test = false;
+    }
+  VERIFY( test );
+  VERIFY( i1 == 11 );
+  VERIFY( idx1 == 4 );
+
+  try
+    {
+      wstring one(L"0XE");
+      i1 = stoi(one, &idx1, 0);      
+    }
+  catch(...)
+    {
+      test = false;
+    }
+  VERIFY( test );
+  VERIFY( i1 == 14 );
+  VERIFY( idx1 == 3 );
+
+  test = false;
+  try
+    {
+      wstring one(1000, L'9');
+      i1 = stoi(one);
+    }
+  catch(std::out_of_range)
+    {
+      test = true;
+    }
+  catch(...)
+    {
+    }
+  VERIFY( test );
+  VERIFY( i1 == 14 );
+
+  try
+    {
+      i1 = numeric_limits<int>::max();
+      wstring one(to_wstring((long long)i1));
+      i1 = stoi(one);
+    }
+  catch(...)
+    {
+      test = false;
+    }
+  VERIFY( test );
+  VERIFY( i1 == numeric_limits<int>::max() );
+
+  try
+    {
+      i1 = numeric_limits<int>::min();
+      wstring one(to_wstring((long long)i1));
+      i1 = stoi(one);
+    }
+  catch(...)
+    {
+      test = false;
+    }
+  VERIFY( test );
+  VERIFY( i1 == numeric_limits<int>::min() );
+
+  test = false;
+  i1 = 1;
+  try
+    {
+      long long ll0 = numeric_limits<int>::max();
+      ++ll0;
+      wstring one(to_wstring(ll0));
+      i1 = stoi(one);
+    }
+  catch(std::out_of_range)
+    {
+      test = true;
+    }
+  catch(...)
+    {
+    }
+  VERIFY( test );
+  VERIFY( i1 == 1 );
+
+  test = false;
+  try
+    {
+      long long ll1 = numeric_limits<int>::min();
+      --ll1;
+      wstring one(to_wstring(ll1));
+      i1 = stoi(one);
+    }
+  catch(std::out_of_range)
+    {
+      test = true;
+    }
+  catch(...)
+    {
+    }
+  VERIFY( test );
+  VERIFY( i1 == 1 );
+
+#endif
+}
+
+int main()
+{
+  test01();
+  return 0;
+}