+2009-04-18 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR libstdc++/39802
+ * include/bits/locale_facets.tcc (num_get<>::_M_extract_int
+ (_InIter, _InIter, ios_base&, ios_base::iostate&, _ValueT&)):
+ Always accept negative values, for unsigned types too.
+ * testsuite/22_locale/num_get/get/char/39802.cc: New.
+ * testsuite/22_locale/num_get/get/wchar_t/39802.cc: Likewise.
+
2009-04-18 Jan Hubicka <jh@suse.cz>
* include/debug/formater.h: Include bits/c++config.h.
* include/bits/c++config (_GLIBCXX_PURE, _GLIBCXX_CONST,
_GLIBCXX_NORETURN): New.
* include/bits/stl_tree.h (_Rb_tree_increment, _Rb_tree_increment,
- _Rb_tree_decrement, _Rb_tree_decrement, _Rb_tree_black_count): Mark pure.
- * include/c_compatibility/stdatomic.h (atomic_flag_test_and_set_explicit,
- atomic_flag_clear_explicit, __atomic_flag_wait_explicit,
- __atomic_flag_for_address): Mark by throw ().
+ _Rb_tree_decrement, _Rb_tree_decrement, _Rb_tree_black_count):
+ Mark pure.
+ * include/c_compatibility/stdatomic.h
+ (atomic_flag_test_and_set_explicit, atomic_flag_clear_explicit,
+ __atomic_flag_wait_explicit, __atomic_flag_for_address):
+ Mark by throw ().
* src/atomic.cc (atomic_flag_test_and_set_explicit,
atomic_flag_clear_explicit, __atomic_flag_wait_explicit,
__atomic_flag_for_address): Mark by throw ().
if (!__testeof)
{
__c = *__beg;
- if (__gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
- __negative = __c == __lit[__num_base::_S_iminus];
+ __negative = __c == __lit[__num_base::_S_iminus];
if ((__negative || __c == __lit[__num_base::_S_iplus])
&& !(__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
&& !(__c == __lc->_M_decimal_point))
__found_grouping.reserve(32);
bool __testfail = false;
bool __testoverflow = false;
- const __unsigned_type __max = __negative
+ const __unsigned_type __max =
+ (__negative && __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
? -__gnu_cxx::__numeric_traits<_ValueT>::__min
: __gnu_cxx::__numeric_traits<_ValueT>::__max;
const __unsigned_type __smax = __max / __base;
}
else if (__testoverflow)
{
- if (__negative)
+ if (__negative
+ && __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
__v = __gnu_cxx::__numeric_traits<_ValueT>::__min;
else
__v = __gnu_cxx::__numeric_traits<_ValueT>::__max;
--- /dev/null
+// Copyright (C) 2009 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 3, 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 COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1 num_get members
+
+#include <locale>
+#include <sstream>
+#include <limits>
+#include <testsuite_hooks.h>
+
+// libstdc++/39802
+void test01()
+{
+ using namespace std;
+ typedef istreambuf_iterator<char> iterator_type;
+
+ bool test __attribute__((unused)) = true;
+
+ stringstream ss;
+ const num_get<char>& ng = use_facet<num_get<char> >(ss.getloc());
+ ios_base::iostate err;
+ iterator_type end;
+ const string empty;
+
+ unsigned long ul0 = 1;
+ const unsigned long ul1 = numeric_limits<unsigned long>::max();
+
+ ss << "-0";
+ err = ios_base::goodbit;
+ end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( ul0 == 0 );
+
+ ss.clear();
+ ss.str(empty);
+ ss << "-1";
+ err = ios_base::goodbit;
+ end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( ul0 == ul1 );
+
+ ss.clear();
+ ss.str(empty);
+ ss << '-' << ul1;
+ err = ios_base::goodbit;
+ end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( ul0 == 1 );
+
+ ss.clear();
+ ss.str(empty);
+ ss << '-' << ul1 << '0';
+ err = ios_base::goodbit;
+ end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+ VERIFY( err == (ios_base::eofbit | ios_base::failbit) );
+ VERIFY( ul0 == ul1 );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
--- /dev/null
+// Copyright (C) 2009 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 3, 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 COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1 num_get members
+
+#include <locale>
+#include <sstream>
+#include <limits>
+#include <testsuite_hooks.h>
+
+// libstdc++/39802
+void test01()
+{
+ using namespace std;
+ typedef istreambuf_iterator<wchar_t> iterator_type;
+
+ bool test __attribute__((unused)) = true;
+
+ wstringstream ss;
+ const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(ss.getloc());
+ ios_base::iostate err;
+ iterator_type end;
+ const wstring empty;
+
+ unsigned long ul0 = 1;
+ const unsigned long ul1 = numeric_limits<unsigned long>::max();
+
+ ss << L"-0";
+ err = ios_base::goodbit;
+ end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( ul0 == 0 );
+
+ ss.clear();
+ ss.str(empty);
+ ss << L"-1";
+ err = ios_base::goodbit;
+ end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( ul0 == ul1 );
+
+ ss.clear();
+ ss.str(empty);
+ ss << L'-' << ul1;
+ err = ios_base::goodbit;
+ end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+ VERIFY( err == ios_base::eofbit );
+ VERIFY( ul0 == 1 );
+
+ ss.clear();
+ ss.str(empty);
+ ss << L'-' << ul1 << L'0';
+ err = ios_base::goodbit;
+ end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+ VERIFY( err == (ios_base::eofbit | ios_base::failbit) );
+ VERIFY( ul0 == ul1 );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
projects / platform / upstream / gcc.git / commitdiff