New module 'iswctype'.

* modules/iswctype: New file.
* lib/wctype.in.h (iswctype): New declaration.
* lib/iswctype.c: New file.
* lib/iswctype-impl.h: New file.
* m4/iswctype.m4: New file.
* m4/wctype_h.m4 (gl_WCTYPE_H): Test whether iswctype is declared.
(gl_WCTYPE_H_DEFAULTS): Initialize GNULIB_ISWCTYPE.
* modules/wctype-h (Makefile.am): Substitute GNULIB_ISWCTYPE.
* tests/test-wctype-h-c++.cc: Test the declaration of iswctype.
* doc/posix-functions/iswctype.texi: Mention the new module and the
HP-UX 11.00 problem.

diff --git a/ChangeLog b/ChangeLog
index daf65354ebc4ab45cffd74e1276b1df8b38342ec..a37ab001cd668d9e3834a438febcc2f9591259ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-02-06  Bruno Haible  <bruno@clisp.org>
+
+       New module 'iswctype'.
+       * modules/iswctype: New file.
+       * lib/wctype.in.h (iswctype): New declaration.
+       * lib/iswctype.c: New file.
+       * lib/iswctype-impl.h: New file.
+       * m4/iswctype.m4: New file.
+       * m4/wctype_h.m4 (gl_WCTYPE_H): Test whether iswctype is declared.
+       (gl_WCTYPE_H_DEFAULTS): Initialize GNULIB_ISWCTYPE.
+       * modules/wctype-h (Makefile.am): Substitute GNULIB_ISWCTYPE.
+       * tests/test-wctype-h-c++.cc: Test the declaration of iswctype.
+       * doc/posix-functions/iswctype.texi: Mention the new module and the
+       HP-UX 11.00 problem.
+
 2011-02-06  Bruno Haible  <bruno@clisp.org>
 
        New module 'wctype'.

diff --git a/doc/posix-functions/iswctype.texi b/doc/posix-functions/iswctype.texi
index 5691b1d6c99460f521d91e77cb9a062f018f7d88..144df4a141d336f099bbca3203bb8fb8ee4dea5e 100644 (file)
--- a/doc/posix-functions/iswctype.texi
+++ b/doc/posix-functions/iswctype.texi
@@ -4,18 +4,22 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswctype.html}
 
-Gnulib module: ---
+Gnulib module: iswctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+IRIX 5.3, Solaris 2.5.1.
+@item
+This function is declared in @code{<wchar.h>}, not in @code{<wctype.h>}, on
+some platforms:
+HP-UX 11.00.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-IRIX 5.3, Solaris 2.5.1.
-@item
 On AIX and Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/lib/iswctype-impl.h b/lib/iswctype-impl.h
new file mode 100644 (file)
index 0000000..8a88d6f
--- /dev/null
+++ b/lib/iswctype-impl.h
@@ -0,0 +1,22 @@
+/* Test whether a wide character has a given property.
+   Copyright (C) 2011 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2011.
+
+   This program 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 of the License, or
+   (at your option) any later version.
+
+   This program 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 program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+int
+iswctype (wint_t wc, wctype_t desc)
+{
+  return ((int (*) (wint_t)) desc) (wc);
+}

diff --git a/lib/iswctype.c b/lib/iswctype.c
new file mode 100644 (file)
index 0000000..6f4c362
--- /dev/null
+++ b/lib/iswctype.c
@@ -0,0 +1,23 @@
+/* Test whether a wide character has a given property.
+   Copyright (C) 2011 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2011.
+
+   This program 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 of the License, or
+   (at your option) any later version.
+
+   This program 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 program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wctype.h>
+
+#include "iswctype-impl.h"

diff --git a/lib/wctype.in.h b/lib/wctype.in.h
index f88e506b9ecc465e19aee0271c146a525a478b1e..a295a091fc57fb94516e9e7ba0a1290f1b070d88 100644 (file)
--- a/lib/wctype.in.h
+++ b/lib/wctype.in.h
@@ -399,6 +399,23 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - "
 # endif
 #endif
 
+/* Test whether a wide character has a given property.
+   The argument WC must be either a wchar_t value or WEOF.
+   The argument DESC must have been returned by the wctype() function.  */
+#if @GNULIB_ISWCTYPE@
+# if !@HAVE_WCTYPE_T@
+_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc));
+# endif
+_GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc));
+_GL_CXXALIASWARN (iswctype);
+#elif defined GNULIB_POSIXCHECK
+# undef iswctype
+# if HAVE_RAW_DECL_ISWCTYPE
+_GL_WARN_ON_USE (iswctype, "iswctype is unportable - "
+                 "use gnulib module iswctype for portability");
+# endif
+#endif
+
 #if @REPLACE_ISWCNTRL@ || defined __MINGW32__
 _GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc));
 _GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc));

diff --git a/m4/iswctype.m4 b/m4/iswctype.m4
new file mode 100644 (file)
index 0000000..2f0120f
--- /dev/null
+++ b/m4/iswctype.m4
@@ -0,0 +1,14 @@
+# iswctype.m4 serial 1
+dnl Copyright (C) 2011 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_ISWCTYPE],
+[
+  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
+  AC_REQUIRE([gl_WCTYPE_H])
+  if test $HAVE_WCTYPE_T = 0; then
+    AC_LIBOBJ([iswctype])
+  fi
+])

diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4
index 23f91759cfd351b4e4b1f825b911a9d898248c03..584083deee40e92e8da827252b273ad7f34806a6 100644 (file)
--- a/m4/wctype_h.m4
+++ b/m4/wctype_h.m4
@@ -146,7 +146,7 @@ AC_DEFUN([gl_WCTYPE_H],
 #endif
 #include <wctype.h>
     ]],
-    [wctype
+    [wctype iswctype
     ])
 ])
 
@@ -163,6 +163,7 @@ AC_DEFUN([gl_WCTYPE_H_DEFAULTS],
 [
   GNULIB_ISWBLANK=0;    AC_SUBST([GNULIB_ISWBLANK])
   GNULIB_WCTYPE=0;      AC_SUBST([GNULIB_WCTYPE])
+  GNULIB_ISWCTYPE=0;    AC_SUBST([GNULIB_ISWCTYPE])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_ISWBLANK=1;      AC_SUBST([HAVE_ISWBLANK])
   HAVE_WCTYPE_T=1;      AC_SUBST([HAVE_WCTYPE_T])

diff --git a/modules/iswctype b/modules/iswctype
new file mode 100644 (file)
index 0000000..7054eaa
--- /dev/null
+++ b/modules/iswctype
@@ -0,0 +1,31 @@
+Description:
+iswctype() function: test whether a wide character has a given property.
+
+Status:
+obsolete
+
+Notice:
+This module is obsolete.
+
+Files:
+lib/iswctype.c
+lib/iswctype-impl.h
+m4/iswctype.m4
+
+Depends-on:
+wctype-h
+
+configure.ac:
+gl_FUNC_ISWCTYPE
+gl_WCTYPE_MODULE_INDICATOR([iswctype])
+
+Makefile.am:
+
+Include:
+<wctype.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible

diff --git a/modules/wctype-h b/modules/wctype-h
index 4c3bdebf74e242e072c82ada4796cab399b923a9..8ff881c4c5c2cb3adcaecab0fbfa2d1c4f713dce 100644 (file)
--- a/modules/wctype-h
+++ b/modules/wctype-h
@@ -29,6 +29,7 @@ wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
              -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
              -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \
              -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \
+             -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \
              -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
              -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
              -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \

diff --git a/tests/test-wctype-h-c++.cc b/tests/test-wctype-h-c++.cc
index 51e9213cebdbd05aab0a72a9a97cd981db1e099a..17337cc90753ed22fbe543bb0b7f2b455381f05b 100644 (file)
--- a/tests/test-wctype-h-c++.cc
+++ b/tests/test-wctype-h-c++.cc
@@ -43,6 +43,10 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::iswxdigit, int, (wint_t));
 SIGNATURE_CHECK (GNULIB_NAMESPACE::wctype, wctype_t, (const char *));
 #endif
 
+#if GNULIB_TEST_ISWCTYPE
+SIGNATURE_CHECK (GNULIB_NAMESPACE::iswctype, int, (wint_t, wctype_t));
+#endif
+
 SIGNATURE_CHECK (GNULIB_NAMESPACE::towlower, wint_t, (wint_t));
 SIGNATURE_CHECK (GNULIB_NAMESPACE::towupper, wint_t, (wint_t));