# HG changeset patch # User Bruno Haible # Date 1297014402 -3600 # Node ID 550f5258de2261b86b06e68388b86ea9c83d8d7e # Parent 7357862f4745cf27a8794da43a63897fd0f8968d Rename module 'wctype' to 'wctype-h'. * modules/wctype-h: Renamed from modules/wctype. * modules/wctype: Simplyfy to a redirection to 'wctype-h'. * modules/wctype-h-tests: Renamed from modules/wctype-tests. (Files, Depends-on, Makefile.am): Update. * modules/wctype-h-c++-tests: Renamed from modules/wctype-c++-tests. (Files, Makefile.am): Update. * tests/test-wctype-h.c: Renamed from tests/test-wctype.c. * tests/test-wctype-h-c++.cc: Renamed from tests/test-wctype-c++.cc. * doc/posix-headers/wctype.texi: Update. * doc/posix-functions/iswalnum.texi: Update. * doc/posix-functions/iswalpha.texi: Update. * doc/posix-functions/iswblank.texi: Update. * doc/posix-functions/iswcntrl.texi: Update. * doc/posix-functions/iswdigit.texi: Update. * doc/posix-functions/iswgraph.texi: Update. * doc/posix-functions/iswlower.texi: Update. * doc/posix-functions/iswprint.texi: Update. * doc/posix-functions/iswpunct.texi: Update. * doc/posix-functions/iswspace.texi: Update. * doc/posix-functions/iswupper.texi: Update. * doc/posix-functions/iswxdigit.texi: Update. * doc/posix-functions/towlower.texi: Update. * doc/posix-functions/towupper.texi: Update. * NEWS: Mention the change. * modules/fnmatch (Dependencies): Add wctype-h, remove wctype. * modules/mbchar (Dependencies): Likewise. * modules/mbswidth (Dependencies): Likewise. * modules/quotearg (Dependencies): Likewise. * modules/regex (Dependencies): Likewise. * modules/wcscasecmp (Dependencies): Likewise. * modules/wcsncasecmp (Dependencies): Likewise. * modules/wcwidth (Dependencies): Likewise. diff -r 7357862f4745 -r 550f5258de22 ChangeLog --- a/ChangeLog Sun Feb 06 15:51:55 2011 +0100 +++ b/ChangeLog Sun Feb 06 18:46:42 2011 +0100 @@ -1,3 +1,39 @@ +2011-02-06 Bruno Haible + + Rename module 'wctype' to 'wctype-h'. + * modules/wctype-h: Renamed from modules/wctype. + * modules/wctype: Simplyfy to a redirection to 'wctype-h'. + * modules/wctype-h-tests: Renamed from modules/wctype-tests. + (Files, Depends-on, Makefile.am): Update. + * modules/wctype-h-c++-tests: Renamed from modules/wctype-c++-tests. + (Files, Makefile.am): Update. + * tests/test-wctype-h.c: Renamed from tests/test-wctype.c. + * tests/test-wctype-h-c++.cc: Renamed from tests/test-wctype-c++.cc. + * doc/posix-headers/wctype.texi: Update. + * doc/posix-functions/iswalnum.texi: Update. + * doc/posix-functions/iswalpha.texi: Update. + * doc/posix-functions/iswblank.texi: Update. + * doc/posix-functions/iswcntrl.texi: Update. + * doc/posix-functions/iswdigit.texi: Update. + * doc/posix-functions/iswgraph.texi: Update. + * doc/posix-functions/iswlower.texi: Update. + * doc/posix-functions/iswprint.texi: Update. + * doc/posix-functions/iswpunct.texi: Update. + * doc/posix-functions/iswspace.texi: Update. + * doc/posix-functions/iswupper.texi: Update. + * doc/posix-functions/iswxdigit.texi: Update. + * doc/posix-functions/towlower.texi: Update. + * doc/posix-functions/towupper.texi: Update. + * NEWS: Mention the change. + * modules/fnmatch (Dependencies): Add wctype-h, remove wctype. + * modules/mbchar (Dependencies): Likewise. + * modules/mbswidth (Dependencies): Likewise. + * modules/quotearg (Dependencies): Likewise. + * modules/regex (Dependencies): Likewise. + * modules/wcscasecmp (Dependencies): Likewise. + * modules/wcsncasecmp (Dependencies): Likewise. + * modules/wcwidth (Dependencies): Likewise. + 2011-02-06 Bruno Haible New module 'wcswidth'. diff -r 7357862f4745 -r 550f5258de22 NEWS --- a/NEWS Sun Feb 06 15:51:55 2011 +0100 +++ b/NEWS Sun Feb 06 18:46:42 2011 +0100 @@ -12,6 +12,8 @@ Date Modules Changes +2011-02-07 wctype This module is renamed to wctype-h. + 2011-01-18 multiarch This no longer #defines AA_APPLE_UNIVERSAL_BUILD; instead, use the shell var APPLE_UNIVERSAL_BUILD. diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswalnum.texi --- a/doc/posix-functions/iswalnum.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswalnum.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswalnum.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswalpha.texi --- a/doc/posix-functions/iswalpha.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswalpha.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswalpha.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswblank.texi --- a/doc/posix-functions/iswblank.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswblank.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswblank.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswcntrl.texi --- a/doc/posix-functions/iswcntrl.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswcntrl.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswcntrl.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswdigit.texi --- a/doc/posix-functions/iswdigit.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswdigit.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswdigit.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswgraph.texi --- a/doc/posix-functions/iswgraph.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswgraph.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswgraph.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswlower.texi --- a/doc/posix-functions/iswlower.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswlower.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswlower.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswprint.texi --- a/doc/posix-functions/iswprint.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswprint.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswprint.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswpunct.texi --- a/doc/posix-functions/iswpunct.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswpunct.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswpunct.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswspace.texi --- a/doc/posix-functions/iswspace.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswspace.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswspace.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswupper.texi --- a/doc/posix-functions/iswupper.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswupper.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswupper.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/iswxdigit.texi --- a/doc/posix-functions/iswxdigit.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/iswxdigit.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/iswxdigit.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/towlower.texi --- a/doc/posix-functions/towlower.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/towlower.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/towlower.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-functions/towupper.texi --- a/doc/posix-functions/towupper.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-functions/towupper.texi Sun Feb 06 18:46:42 2011 +0100 @@ -4,7 +4,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/towupper.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 doc/posix-headers/wctype.texi --- a/doc/posix-headers/wctype.texi Sun Feb 06 15:51:55 2011 +0100 +++ b/doc/posix-headers/wctype.texi Sun Feb 06 18:46:42 2011 +0100 @@ -3,7 +3,7 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/basedefs/wctype.h.html} -Gnulib module: wctype +Gnulib module: wctype-h Portability problems fixed by Gnulib: @itemize diff -r 7357862f4745 -r 550f5258de22 modules/fnmatch --- a/modules/fnmatch Sun Feb 06 15:51:55 2011 +0100 +++ b/modules/fnmatch Sun Feb 06 18:46:42 2011 +0100 @@ -14,7 +14,7 @@ alloca stdbool wchar -wctype +wctype-h memchr memcmp mbsrtowcs diff -r 7357862f4745 -r 550f5258de22 modules/mbchar --- a/modules/mbchar Sun Feb 06 15:51:55 2011 +0100 +++ b/modules/mbchar Sun Feb 06 18:46:42 2011 +0100 @@ -10,7 +10,7 @@ extensions stdbool wchar -wctype +wctype-h wcwidth memcmp diff -r 7357862f4745 -r 550f5258de22 modules/mbswidth --- a/modules/mbswidth Sun Feb 06 15:51:55 2011 +0100 +++ b/modules/mbswidth Sun Feb 06 18:46:42 2011 +0100 @@ -10,7 +10,7 @@ Depends-on: wchar -wctype +wctype-h mbrtowc mbsinit wcwidth diff -r 7357862f4745 -r 550f5258de22 modules/quotearg --- a/modules/quotearg Sun Feb 06 15:51:55 2011 +0100 +++ b/modules/quotearg Sun Feb 06 18:46:42 2011 +0100 @@ -17,7 +17,7 @@ quotearg-simple stdbool wchar -wctype +wctype-h xalloc configure.ac: diff -r 7357862f4745 -r 550f5258de22 modules/regex --- a/modules/regex Sun Feb 06 15:51:55 2011 +0100 +++ b/modules/regex Sun Feb 06 18:46:42 2011 +0100 @@ -28,7 +28,7 @@ ssize_t wchar wcrtomb -wctype +wctype-h configure.ac: gl_REGEX diff -r 7357862f4745 -r 550f5258de22 modules/wcscasecmp --- a/modules/wcscasecmp Sun Feb 06 15:51:55 2011 +0100 +++ b/modules/wcscasecmp Sun Feb 06 18:46:42 2011 +0100 @@ -8,7 +8,7 @@ Depends-on: wchar -wctype +wctype-h configure.ac: gl_FUNC_WCSCASECMP diff -r 7357862f4745 -r 550f5258de22 modules/wcsncasecmp --- a/modules/wcsncasecmp Sun Feb 06 15:51:55 2011 +0100 +++ b/modules/wcsncasecmp Sun Feb 06 18:46:42 2011 +0100 @@ -8,7 +8,7 @@ Depends-on: wchar -wctype +wctype-h configure.ac: gl_FUNC_WCSNCASECMP diff -r 7357862f4745 -r 550f5258de22 modules/wctype --- a/modules/wctype Sun Feb 06 15:51:55 2011 +0100 +++ b/modules/wctype Sun Feb 06 18:46:42 2011 +0100 @@ -2,49 +2,19 @@ A that conforms better to C99. Files: -lib/wctype.in.h -lib/iswblank.c -m4/wctype_h.m4 -m4/wint_t.m4 Depends-on: -include_next -c++defs -warn-on-use +wctype-h configure.ac: -gl_WCTYPE_H Makefile.am: -BUILT_SOURCES += wctype.h - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ - -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ - -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ - -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ - -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ - -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/wctype.in.h; \ - } > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += wctype.h wctype.h-t Include: License: -LGPLv2+ +LGPL Maintainer: -all +Bruno Haible diff -r 7357862f4745 -r 550f5258de22 modules/wctype-c++-tests --- a/modules/wctype-c++-tests Sun Feb 06 15:51:55 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -Files: -tests/test-wctype-c++.cc -tests/signature.h - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-wctype-c++ -check_PROGRAMS += test-wctype-c++ -test_wctype_c___SOURCES = test-wctype-c++.cc -test_wctype_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_EACCESS) -endif diff -r 7357862f4745 -r 550f5258de22 modules/wctype-h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/wctype-h Sun Feb 06 18:46:42 2011 +0100 @@ -0,0 +1,50 @@ +Description: +A that conforms better to C99. + +Files: +lib/wctype.in.h +lib/iswblank.c +m4/wctype_h.m4 +m4/wint_t.m4 + +Depends-on: +include_next +c++defs +warn-on-use + +configure.ac: +gl_WCTYPE_H + +Makefile.am: +BUILT_SOURCES += wctype.h + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ + -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ + -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ + -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ + -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(srcdir)/wctype.in.h; \ + } > $@-t && \ + mv $@-t $@ +MOSTLYCLEANFILES += wctype.h wctype.h-t + +Include: + + +License: +LGPLv2+ + +Maintainer: +all diff -r 7357862f4745 -r 550f5258de22 modules/wctype-h-c++-tests --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/wctype-h-c++-tests Sun Feb 06 18:46:42 2011 +0100 @@ -0,0 +1,19 @@ +Files: +tests/test-wctype-h-c++.cc +tests/signature.h + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-wctype-h-c++ +check_PROGRAMS += test-wctype-h-c++ +test_wctype_h_c___SOURCES = test-wctype-h-c++.cc +test_wctype_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP) $(LIB_EACCESS) +endif diff -r 7357862f4745 -r 550f5258de22 modules/wctype-h-tests --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/wctype-h-tests Sun Feb 06 18:46:42 2011 +0100 @@ -0,0 +1,12 @@ +Files: +tests/test-wctype-h.c +tests/macros.h + +Depends-on: +wctype-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-wctype-h +check_PROGRAMS += test-wctype-h diff -r 7357862f4745 -r 550f5258de22 modules/wctype-tests --- a/modules/wctype-tests Sun Feb 06 15:51:55 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -Files: -tests/test-wctype.c -tests/macros.h - -Depends-on: -wctype-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-wctype -check_PROGRAMS += test-wctype diff -r 7357862f4745 -r 550f5258de22 modules/wcwidth --- a/modules/wcwidth Sun Feb 06 15:51:55 2011 +0100 +++ b/modules/wcwidth Sun Feb 06 18:46:42 2011 +0100 @@ -10,7 +10,7 @@ Depends-on: extensions wchar -wctype +wctype-h localcharset streq uniwidth/width diff -r 7357862f4745 -r 550f5258de22 tests/test-wctype-c++.cc --- a/tests/test-wctype-c++.cc Sun Feb 06 15:51:55 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* Test of substitute in C++ mode. - Copyright (C) 2010-2011 Free Software Foundation, Inc. - - 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 . */ - -/* Written by Bruno Haible , 2010. */ - -#define GNULIB_NAMESPACE gnulib -#include - -#include - -#include "signature.h" - - -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswalnum, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswalpha, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswblank, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswcntrl, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswdigit, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswgraph, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswlower, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswprint, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswpunct, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswspace, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswupper, int, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::iswxdigit, int, (wint_t)); - -SIGNATURE_CHECK (GNULIB_NAMESPACE::towlower, wint_t, (wint_t)); -SIGNATURE_CHECK (GNULIB_NAMESPACE::towupper, wint_t, (wint_t)); - - -int -main () -{ -} diff -r 7357862f4745 -r 550f5258de22 tests/test-wctype-h-c++.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-wctype-h-c++.cc Sun Feb 06 18:46:42 2011 +0100 @@ -0,0 +1,47 @@ +/* Test of substitute in C++ mode. + Copyright (C) 2010-2011 Free Software Foundation, Inc. + + 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 . */ + +/* Written by Bruno Haible , 2010. */ + +#define GNULIB_NAMESPACE gnulib +#include + +#include + +#include "signature.h" + + +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswalnum, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswalpha, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswblank, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswcntrl, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswdigit, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswgraph, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswlower, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswprint, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswpunct, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswspace, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswupper, int, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::iswxdigit, int, (wint_t)); + +SIGNATURE_CHECK (GNULIB_NAMESPACE::towlower, wint_t, (wint_t)); +SIGNATURE_CHECK (GNULIB_NAMESPACE::towupper, wint_t, (wint_t)); + + +int +main () +{ +} diff -r 7357862f4745 -r 550f5258de22 tests/test-wctype-h.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-wctype-h.c Sun Feb 06 18:46:42 2011 +0100 @@ -0,0 +1,70 @@ +/* Test of substitute. + Copyright (C) 2007-2011 Free Software Foundation, Inc. + + 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 . */ + +/* Written by Bruno Haible , 2007. */ + +#include + +#include + +#include "macros.h" + +/* Check that the type wint_t is defined. */ +wint_t a = 'x'; +/* Check that WEOF is defined. */ +wint_t e = WEOF; + +int +main (void) +{ + /* Check that the isw* functions exist as functions or as macros. */ + (void) iswalnum (0); + (void) iswalpha (0); + (void) iswblank (0); + (void) iswcntrl (0); + (void) iswdigit (0); + (void) iswgraph (0); + (void) iswlower (0); + (void) iswprint (0); + (void) iswpunct (0); + (void) iswspace (0); + (void) iswupper (0); + (void) iswxdigit (0); + + /* Check that the isw* functions map WEOF to 0. */ + ASSERT (!iswalnum (e)); + ASSERT (!iswalpha (e)); + ASSERT (!iswblank (e)); + ASSERT (!iswcntrl (e)); + ASSERT (!iswdigit (e)); + ASSERT (!iswgraph (e)); + ASSERT (!iswlower (e)); + ASSERT (!iswprint (e)); + ASSERT (!iswpunct (e)); + ASSERT (!iswspace (e)); + ASSERT (!iswupper (e)); + ASSERT (!iswxdigit (e)); + + /* Check that the tow* functions exist as functions or as macros. */ + (void) towlower (0); + (void) towupper (0); + + /* Check that the tow* functions map WEOF to WEOF. */ + ASSERT (towlower (e) == e); + ASSERT (towupper (e) == e); + + return 0; +} diff -r 7357862f4745 -r 550f5258de22 tests/test-wctype.c --- a/tests/test-wctype.c Sun Feb 06 15:51:55 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/* Test of substitute. - Copyright (C) 2007-2011 Free Software Foundation, Inc. - - 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 . */ - -/* Written by Bruno Haible , 2007. */ - -#include - -#include - -#include "macros.h" - -/* Check that the type wint_t is defined. */ -wint_t a = 'x'; -/* Check that WEOF is defined. */ -wint_t e = WEOF; - -int -main (void) -{ - /* Check that the isw* functions exist as functions or as macros. */ - (void) iswalnum (0); - (void) iswalpha (0); - (void) iswblank (0); - (void) iswcntrl (0); - (void) iswdigit (0); - (void) iswgraph (0); - (void) iswlower (0); - (void) iswprint (0); - (void) iswpunct (0); - (void) iswspace (0); - (void) iswupper (0); - (void) iswxdigit (0); - - /* Check that the isw* functions map WEOF to 0. */ - ASSERT (!iswalnum (e)); - ASSERT (!iswalpha (e)); - ASSERT (!iswblank (e)); - ASSERT (!iswcntrl (e)); - ASSERT (!iswdigit (e)); - ASSERT (!iswgraph (e)); - ASSERT (!iswlower (e)); - ASSERT (!iswprint (e)); - ASSERT (!iswpunct (e)); - ASSERT (!iswspace (e)); - ASSERT (!iswupper (e)); - ASSERT (!iswxdigit (e)); - - /* Check that the tow* functions exist as functions or as macros. */ - (void) towlower (0); - (void) towupper (0); - - /* Check that the tow* functions map WEOF to WEOF. */ - ASSERT (towlower (e) == e); - ASSERT (towupper (e) == e); - - return 0; -}