re PR libstdc++/11740 (ctype<wchar_t>::do_is(mask, wchar_t) doesn't handle multiple bits in mask.)

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.

From-SVN: r72167

4 files changed, 108 insertions, 19 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3b9fe29..6814671 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,13 @@
 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.
+
+2003-10-06  Paolo Carlini  <pcarlini@unitus.it>
+
 	* include/bits/locale_facets.tcc (__pad<>::_S_pad):
 	Improve performance-wise: avoid one traits::copy, avoid
 	the __builtin_alloca, streamline.
diff --git a/libstdc++-v3/config/locale/generic/ctype_members.cc b/libstdc++-v3/config/locale/generic/ctype_members.cc
index 814672a..61880e7 100644
--- a/libstdc++-v3/config/locale/generic/ctype_members.cc
+++ b/libstdc++-v3/config/locale/generic/ctype_members.cc
@@ -127,19 +127,15 @@ namespace std
   ctype<wchar_t>::
   do_is(mask __m, char_type __c) const
   { 
-    bool __ret = true;
-    bool __match_any = false;
+    bool __ret = false;
     const size_t __bitmasksize = 10; 
     for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
       {
-	mask __bit = static_cast<mask>(1 << __bitcur);
+	const mask __bit = static_cast<mask>(1 << __bitcur);
 	if (__m & __bit)
-	  {
-	    __match_any = true;
-	    __ret &= iswctype(__c, _M_convert_to_wmask(__bit));
-	  }
+	  __ret |= iswctype(__c, _M_convert_to_wmask(__bit));
       }
-    return __ret & __match_any;    
+    return __ret;    
   }
   
   const wchar_t* 
@@ -152,7 +148,7 @@ namespace std
 	mask __m = 0;
 	for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
 	  { 
-	    mask __bit = static_cast<mask>(1 << __bitcur);
+	    const mask __bit = static_cast<mask>(1 << __bitcur);
 	    if (iswctype(*__lo, _M_convert_to_wmask(__bit)))
 	      __m |= __bit;
 	  }
diff --git a/libstdc++-v3/config/locale/gnu/ctype_members.cc b/libstdc++-v3/config/locale/gnu/ctype_members.cc
index 7ab4f19..79a14f5 100644
--- a/libstdc++-v3/config/locale/gnu/ctype_members.cc
+++ b/libstdc++-v3/config/locale/gnu/ctype_members.cc
@@ -133,20 +133,16 @@ namespace std
   { 
     // Highest bitmask in ctype_base == 10, but extra in "C"
     // library for blank.
-    bool __ret = true;
-    bool __match_any = false;
+    bool __ret = false;
     const size_t __bitmasksize = 11; 
     for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
       {
-	mask __bit = static_cast<mask>(_ISbit(__bitcur));
+	const 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); 
-	  }
+	  __ret |= __iswctype_l(__c, _M_convert_to_wmask(__bit), 
+				_M_c_locale_ctype); 
       }
-    return __ret & __match_any;    
+    return __ret;    
   }
   
   const wchar_t* 
@@ -161,7 +157,7 @@ namespace std
 	mask __m = 0;
 	for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
 	  { 
-	    mask __bit = static_cast<mask>(_ISbit(__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 --git a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/11740.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/11740.cc
new file mode 100644
index 0000000..074d830
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/11740.cc
@@ -0,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;
+}