This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[Patch] Fix libstdc++/11740
- From: Paolo Carlini <pcarlini at unitus dot it>
- To: libstdc++ at gcc dot gnu dot org
- Cc: Benjamin Kosnik <bkoz at redhat dot com>
- Date: Mon, 06 Oct 2003 22:45:26 +0200
- Subject: [Patch] Fix libstdc++/11740
Hi,
in short, we failed to compute and return (M & m) != 0, as per 22.2.1.1.2.
Instead, essentially, we selected all the 1s in m, &&-ed each with the
corresponding bit in M and returned the && of all those, another thing.
Tested x86-linux. Ok??
Paolo.
//////////
2003-10-06 Paolo Carlini <pcarlini@unitus.it>
PR libstdc++/11740
* config/locale/gnu/ctype_members.cc (ctype<wchar_t>::do_is):
Fix to actually return (M & m) != 0 as per 22.2.1.1.2.
* config/locale/generic/ctype_members.cc: Same.
* testsuite/22_locale/ctype/is/wchar_t/11740.cc: New.
diff -prN libstdc++-v3-1/config/locale/generic/ctype_members.cc libstdc++-v3/config/locale/generic/ctype_members.cc
*** libstdc++-v3-1/config/locale/generic/ctype_members.cc Thu Sep 25 18:37:22 2003
--- libstdc++-v3/config/locale/generic/ctype_members.cc Mon Oct 6 22:05:59 2003
*************** namespace std
*** 127,145 ****
ctype<wchar_t>::
do_is(mask __m, char_type __c) const
{
! bool __ret = true;
! bool __match_any = false;
const size_t __bitmasksize = 10;
for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
{
! mask __bit = static_cast<mask>(1 << __bitcur);
if (__m & __bit)
! {
! __match_any = true;
! __ret &= iswctype(__c, _M_convert_to_wmask(__bit));
! }
}
! return __ret & __match_any;
}
const wchar_t*
--- 127,141 ----
ctype<wchar_t>::
do_is(mask __m, char_type __c) const
{
! bool __ret = false;
const size_t __bitmasksize = 10;
for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
{
! const mask __bit = static_cast<mask>(1 << __bitcur);
if (__m & __bit)
! __ret |= iswctype(__c, _M_convert_to_wmask(__bit));
}
! return __ret;
}
const wchar_t*
*************** namespace std
*** 152,158 ****
mask __m = 0;
for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
{
! mask __bit = static_cast<mask>(1 << __bitcur);
if (iswctype(*__lo, _M_convert_to_wmask(__bit)))
__m |= __bit;
}
--- 148,154 ----
mask __m = 0;
for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
{
! const mask __bit = static_cast<mask>(1 << __bitcur);
if (iswctype(*__lo, _M_convert_to_wmask(__bit)))
__m |= __bit;
}
diff -prN libstdc++-v3-1/config/locale/gnu/ctype_members.cc libstdc++-v3/config/locale/gnu/ctype_members.cc
*** libstdc++-v3-1/config/locale/gnu/ctype_members.cc Thu Sep 25 18:37:22 2003
--- libstdc++-v3/config/locale/gnu/ctype_members.cc Mon Oct 6 21:57:38 2003
*************** namespace std
*** 133,152 ****
{
// Highest bitmask in ctype_base == 10, but extra in "C"
// library for blank.
! bool __ret = true;
! bool __match_any = false;
const size_t __bitmasksize = 11;
for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
{
! mask __bit = static_cast<mask>(_ISbit(__bitcur));
if (__m & __bit)
! {
! __match_any = true;
! __ret &= __iswctype_l(__c, _M_convert_to_wmask(__bit),
! _M_c_locale_ctype);
! }
}
! return __ret & __match_any;
}
const wchar_t*
--- 133,148 ----
{
// Highest bitmask in ctype_base == 10, but extra in "C"
// library for blank.
! bool __ret = false;
const size_t __bitmasksize = 11;
for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
{
! const mask __bit = static_cast<mask>(_ISbit(__bitcur));
if (__m & __bit)
! __ret |= __iswctype_l(__c, _M_convert_to_wmask(__bit),
! _M_c_locale_ctype);
}
! return __ret;
}
const wchar_t*
*************** namespace std
*** 161,167 ****
mask __m = 0;
for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
{
! mask __bit = static_cast<mask>(_ISbit(__bitcur));
if (__iswctype_l(*__lo, _M_convert_to_wmask(__bit),
_M_c_locale_ctype))
__m |= __bit;
--- 157,163 ----
mask __m = 0;
for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
{
! const mask __bit = static_cast<mask>(_ISbit(__bitcur));
if (__iswctype_l(*__lo, _M_convert_to_wmask(__bit),
_M_c_locale_ctype))
__m |= __bit;
diff -prN libstdc++-v3-1/testsuite/22_locale/ctype/is/wchar_t/11740.cc libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/11740.cc
*** libstdc++-v3-1/testsuite/22_locale/ctype/is/wchar_t/11740.cc Thu Jan 1 01:00:00 1970
--- libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/11740.cc Mon Oct 6 22:14:47 2003
***************
*** 0 ****
--- 1,89 ----
+ // Copyright (C) 2003 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ // USA.
+
+ // As a special exception, you may use this file as part of a free software
+ // library without restriction. Specifically, if other files instantiate
+ // templates or use macros or inline functions from this file, or you compile
+ // this file and link it with other files to produce an executable, this
+ // file does not by itself cause the resulting executable to be covered by
+ // the GNU General Public License. This exception does not however
+ // invalidate any other reasons why the executable file might be covered by
+ // the GNU General Public License.
+
+ #include <locale>
+ #include <algorithm>
+ #include <cstddef>
+ #include <testsuite_hooks.h>
+
+ // libstdc++/11740
+ void test01()
+ {
+ using namespace std;
+ bool test __attribute__((unused)) = true;
+
+ const wchar_t str[] =
+ L"Is this the real life?\n"
+ L"Is this just fantasy?\n"
+ L"Caught in a landslide\n"
+ L"No escape from reality\n"
+ L"Open your eyes\n"
+ L"Look up to the skies and see\n"
+ L"I'm just a poor boy\n"
+ L"I need no sympathy\n"
+ L"Because I'm easy come, easy go\n"
+ L"Little high, little low"
+ L"Anyway the wind blows\n"
+ L"Doesn't really matter to me\n"
+ L"To me\n"
+ L" -- Queen\n";
+
+ const size_t len = sizeof(str) / sizeof(str[0]) - 1;
+
+ const ctype_base::mask masks[] = {
+ ctype_base::space, ctype_base::print, ctype_base::cntrl,
+ ctype_base::upper, ctype_base::lower, ctype_base::alpha,
+ ctype_base::digit, ctype_base::punct, ctype_base::xdigit,
+ ctype_base::alnum, ctype_base::graph
+ };
+
+ const size_t num_masks = sizeof(masks) / sizeof(masks[0]);
+
+ locale loc;
+ const ctype<wchar_t>& ct = use_facet<ctype<wchar_t> >(loc);
+
+ for (size_t i = 0; i < len; ++i)
+ {
+ for (size_t j = 0; j < num_masks; ++j)
+ {
+ for (size_t k = 0; k < num_masks; ++k)
+ {
+ bool r1 = ct.is(masks[j] | masks[k], str[i]);
+ bool r2 = ct.is(masks[j], str[i]);
+ bool r3 = ct.is(masks[k], str[i]);
+
+ VERIFY( r1 == (r2 || r3) );
+ }
+ }
+ }
+ }
+
+ int main()
+ {
+ test01();
+ return 0;
+ }