From 215ae3bcb32bfc8163a7aa718703919e2c6305b2 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 14 Dec 2007 19:32:03 +0000 Subject: 2007-12-14 Benjamin Kosnik PR libstdc++/30127 PR libstdc++/34449 * include/bits/locale_classes.h (use_facet): Check facet hierarchy. (has_facet): Same. * testsuite/22_locale/global_templates/user_facet_hierarchies.cc: New. * testsuite/22_locale/global_templates/ standard_facet_hierarchies.cc: New. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@130941 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 10 ++ libstdc++-v3/include/bits/locale_classes.h | 17 +++- .../global_templates/standard_facet_hierarchies.cc | 84 ++++++++++++++++ .../global_templates/user_facet_hierarchies.cc | 108 +++++++++++++++++++++ 4 files changed, 216 insertions(+), 3 deletions(-) create mode 100644 libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc create mode 100644 libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc (limited to 'libstdc++-v3') diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cd72b2fad09..d53fc0ff509 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2007-12-14 Benjamin Kosnik + + PR libstdc++/30127 + PR libstdc++/34449 + * include/bits/locale_classes.h (use_facet): Check facet hierarchy. + (has_facet): Same. + * testsuite/22_locale/global_templates/user_facet_hierarchies.cc: New. + * testsuite/22_locale/global_templates/ + standard_facet_hierarchies.cc: New. + 2007-12-11 Benjamin Kosnik PR libstdc++/34015 diff --git a/libstdc++-v3/include/bits/locale_classes.h b/libstdc++-v3/include/bits/locale_classes.h index 60de2695677..4eee8621b53 100644 --- a/libstdc++-v3/include/bits/locale_classes.h +++ b/libstdc++-v3/include/bits/locale_classes.h @@ -579,7 +579,17 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { const size_t __i = _Facet::id._M_id(); const locale::facet** __facets = __loc._M_impl->_M_facets; - return (__i < __loc._M_impl->_M_facets_size && __facets[__i]); + bool __b(false); + try + { + if (__i < __loc._M_impl->_M_facets_size + && dynamic_cast(__facets[__i]) != NULL) + __b = true; + + } + catch (...) + { } + return __b; } /** @@ -601,9 +611,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { const size_t __i = _Facet::id._M_id(); const locale::facet** __facets = __loc._M_impl->_M_facets; - if (!(__i < __loc._M_impl->_M_facets_size && __facets[__i])) + if (__i >= __loc._M_impl->_M_facets_size + || dynamic_cast(__facets[__i]) == NULL) __throw_bad_cast(); - return static_cast(*__facets[__i]); + return dynamic_cast(*__facets[__i]); } diff --git a/libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc b/libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc new file mode 100644 index 00000000000..6025867ec45 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc @@ -0,0 +1,84 @@ +// Copyright (C) 2007 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include + +// Based on Langer Kreft "Standard C++ IOStreams and Locales" p 316-318 +// PR libstdc++/30127 +// PR libstdc++/34449 +int main() +{ + bool test __attribute__((unused)) = true; + + using std::locale; + using std::has_facet; + using std::use_facet; + typedef std::ctype base_facet; + typedef std::ctype_byname derived_facet; + + locale loc_c = locale::classic(); + locale loc_base = loc_c; + locale loc_derived(loc_c, new derived_facet("")); + + bool b; + + // Standard base facet. + VERIFY( has_facet(loc_c) ); + VERIFY( has_facet(loc_base) ); + VERIFY( has_facet(loc_derived) ); + + // Standard derived facet. + VERIFY( !has_facet(loc_c) ); + VERIFY( !has_facet(loc_base) ); + VERIFY( has_facet(loc_derived) ); + + + // 1 + try + { + if (has_facet(loc_base)) + { + use_facet(loc_base).widen('k'); + VERIFY( true ); + } + } + catch (...) + { + // Expect no exception. + VERIFY( true ); + } + + // 2 + try + { + if (has_facet(loc_derived)) + use_facet(loc_derived).widen('k'); + else + VERIFY( true ); + } + catch (...) + { + // Expect no exception. + VERIFY( true ); + } + + return 0; +} diff --git a/libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc b/libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc new file mode 100644 index 00000000000..139223f2aa7 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc @@ -0,0 +1,108 @@ +// Copyright (C) 2007 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include + +// Based on Langer Kreft "Standard C++ IOStreams and Locales" p 316-318 +struct base_facet: public std::locale::facet +{ + virtual std::string msg() const + { return "base class"; } + + static std::locale::id id; +}; + +std::locale::id base_facet::id; + + +struct derived_facet: public base_facet +{ + virtual std::string msg() const + { return "derived class"; } + + virtual std::string msg_repeater() const + { return "derived class derived class"; } + +}; + +// PR libstdc++/30127 +// PR libstdc++/34449 +int main() +{ + bool test __attribute__((unused)) = true; + + using std::locale; + using std::has_facet; + using std::use_facet; + + locale loc_c = locale::classic(); + locale loc_base(loc_c, new base_facet); + locale loc_derived(loc_c, new derived_facet); + + bool b; + + // Standard facets. + VERIFY( has_facet >(loc_c) ); + VERIFY( has_facet >(loc_base) ); + VERIFY( has_facet >(loc_derived) ); + + // User defined base facet. + VERIFY( !has_facet(loc_c) ); + VERIFY( has_facet(loc_base) ); + VERIFY( has_facet(loc_derived) ); + + // User defined derived facet. + VERIFY( !has_facet(loc_c) ); + VERIFY( !has_facet(loc_base) ); + VERIFY( has_facet(loc_derived) ); + + + // 1 + try + { + if (has_facet(loc_base)) + { + use_facet(loc_base).msg_repeater(); + VERIFY( false ); + } + } + catch (...) + { + // Expect no exception. + VERIFY( true ); + } + + // 2 + try + { + if (has_facet(loc_derived)) + use_facet(loc_derived).msg(); + else + VERIFY( true ); + } + catch (...) + { + // Expect no exception. + VERIFY( true ); + } + + return 0; +} -- cgit v1.2.3