From a6dbbbfc876c64514a51fff76c99e002c8ed7580 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 6 Feb 2011 18:46:42 +0100 Subject: [PATCH] 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. --- ChangeLog | 36 ++++++++++++++++ NEWS | 2 + doc/posix-functions/iswalnum.texi | 2 +- doc/posix-functions/iswalpha.texi | 2 +- doc/posix-functions/iswblank.texi | 2 +- doc/posix-functions/iswcntrl.texi | 2 +- doc/posix-functions/iswdigit.texi | 2 +- doc/posix-functions/iswgraph.texi | 2 +- doc/posix-functions/iswlower.texi | 2 +- doc/posix-functions/iswprint.texi | 2 +- doc/posix-functions/iswpunct.texi | 2 +- doc/posix-functions/iswspace.texi | 2 +- doc/posix-functions/iswupper.texi | 2 +- doc/posix-functions/iswxdigit.texi | 2 +- doc/posix-functions/towlower.texi | 2 +- doc/posix-functions/towupper.texi | 2 +- doc/posix-headers/wctype.texi | 2 +- modules/fnmatch | 2 +- modules/mbchar | 2 +- modules/mbswidth | 2 +- modules/quotearg | 2 +- modules/regex | 2 +- modules/wcscasecmp | 2 +- modules/wcsncasecmp | 2 +- modules/wctype | 36 ++-------------- modules/wctype-c++-tests | 19 -------- modules/wctype-h | 50 ++++++++++++++++++++++ modules/wctype-h-c++-tests | 19 ++++++++ modules/wctype-h-tests | 12 ++++++ modules/wctype-tests | 12 ------ modules/wcwidth | 2 +- tests/{test-wctype-c++.cc => test-wctype-h-c++.cc} | 0 tests/{test-wctype.c => test-wctype-h.c} | 0 33 files changed, 145 insertions(+), 87 deletions(-) delete mode 100644 modules/wctype-c++-tests create mode 100644 modules/wctype-h create mode 100644 modules/wctype-h-c++-tests create mode 100644 modules/wctype-h-tests delete mode 100644 modules/wctype-tests rename tests/{test-wctype-c++.cc => test-wctype-h-c++.cc} (100%) rename tests/{test-wctype.c => test-wctype-h.c} (100%) diff --git a/ChangeLog b/ChangeLog index e22787963..34885ab3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,41 @@ 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'. * modules/wcswidth: New file. * lib/wchar.in.h (wcswidth): New declaration. diff --git a/NEWS b/NEWS index 40fa082a0..c13092289 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,8 @@ User visible incompatible changes 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 --git a/doc/posix-functions/iswalnum.texi b/doc/posix-functions/iswalnum.texi index 20612f4a2..154999d61 100644 --- a/doc/posix-functions/iswalnum.texi +++ b/doc/posix-functions/iswalnum.texi @@ -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 --git a/doc/posix-functions/iswalpha.texi b/doc/posix-functions/iswalpha.texi index 7d69c2b12..5046f3b8d 100644 --- a/doc/posix-functions/iswalpha.texi +++ b/doc/posix-functions/iswalpha.texi @@ -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 --git a/doc/posix-functions/iswblank.texi b/doc/posix-functions/iswblank.texi index 453558e0a..057f3ad61 100644 --- a/doc/posix-functions/iswblank.texi +++ b/doc/posix-functions/iswblank.texi @@ -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 --git a/doc/posix-functions/iswcntrl.texi b/doc/posix-functions/iswcntrl.texi index a1f89329d..8b0b127f9 100644 --- a/doc/posix-functions/iswcntrl.texi +++ b/doc/posix-functions/iswcntrl.texi @@ -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 --git a/doc/posix-functions/iswdigit.texi b/doc/posix-functions/iswdigit.texi index 74b0d2829..c21694930 100644 --- a/doc/posix-functions/iswdigit.texi +++ b/doc/posix-functions/iswdigit.texi @@ -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 --git a/doc/posix-functions/iswgraph.texi b/doc/posix-functions/iswgraph.texi index 00e1fdbef..8dd966a99 100644 --- a/doc/posix-functions/iswgraph.texi +++ b/doc/posix-functions/iswgraph.texi @@ -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 --git a/doc/posix-functions/iswlower.texi b/doc/posix-functions/iswlower.texi index ba8d54548..0b21d111b 100644 --- a/doc/posix-functions/iswlower.texi +++ b/doc/posix-functions/iswlower.texi @@ -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 --git a/doc/posix-functions/iswprint.texi b/doc/posix-functions/iswprint.texi index f6ade8224..dc7236b09 100644 --- a/doc/posix-functions/iswprint.texi +++ b/doc/posix-functions/iswprint.texi @@ -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 --git a/doc/posix-functions/iswpunct.texi b/doc/posix-functions/iswpunct.texi index 6d1bca081..af9ea53ce 100644 --- a/doc/posix-functions/iswpunct.texi +++ b/doc/posix-functions/iswpunct.texi @@ -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 --git a/doc/posix-functions/iswspace.texi b/doc/posix-functions/iswspace.texi index 9a73e2fe1..fed4e41f4 100644 --- a/doc/posix-functions/iswspace.texi +++ b/doc/posix-functions/iswspace.texi @@ -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 --git a/doc/posix-functions/iswupper.texi b/doc/posix-functions/iswupper.texi index 99654102c..d51834575 100644 --- a/doc/posix-functions/iswupper.texi +++ b/doc/posix-functions/iswupper.texi @@ -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 --git a/doc/posix-functions/iswxdigit.texi b/doc/posix-functions/iswxdigit.texi index d3105eda8..0fa4f788a 100644 --- a/doc/posix-functions/iswxdigit.texi +++ b/doc/posix-functions/iswxdigit.texi @@ -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 --git a/doc/posix-functions/towlower.texi b/doc/posix-functions/towlower.texi index 2b658aaab..a2282d1e5 100644 --- a/doc/posix-functions/towlower.texi +++ b/doc/posix-functions/towlower.texi @@ -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 --git a/doc/posix-functions/towupper.texi b/doc/posix-functions/towupper.texi index 2a3b3b547..5bb4a15cc 100644 --- a/doc/posix-functions/towupper.texi +++ b/doc/posix-functions/towupper.texi @@ -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 --git a/doc/posix-headers/wctype.texi b/doc/posix-headers/wctype.texi index dd1f9a3ac..13c50145c 100644 --- a/doc/posix-headers/wctype.texi +++ b/doc/posix-headers/wctype.texi @@ -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 --git a/modules/fnmatch b/modules/fnmatch index 6849b4d5e..bf7158fb9 100644 --- a/modules/fnmatch +++ b/modules/fnmatch @@ -14,7 +14,7 @@ extensions alloca stdbool wchar -wctype +wctype-h memchr memcmp mbsrtowcs diff --git a/modules/mbchar b/modules/mbchar index b5e222ac6..d15e932e0 100644 --- a/modules/mbchar +++ b/modules/mbchar @@ -10,7 +10,7 @@ Depends-on: extensions stdbool wchar -wctype +wctype-h wcwidth memcmp diff --git a/modules/mbswidth b/modules/mbswidth index 330748dfe..a7301ab61 100644 --- a/modules/mbswidth +++ b/modules/mbswidth @@ -10,7 +10,7 @@ m4/mbswidth.m4 Depends-on: wchar -wctype +wctype-h mbrtowc mbsinit wcwidth diff --git a/modules/quotearg b/modules/quotearg index 732ce39ff..f62b2c0ff 100644 --- a/modules/quotearg +++ b/modules/quotearg @@ -17,7 +17,7 @@ memcmp quotearg-simple stdbool wchar -wctype +wctype-h xalloc configure.ac: diff --git a/modules/regex b/modules/regex index cbfecdda6..6a8f4c25f 100644 --- a/modules/regex +++ b/modules/regex @@ -28,7 +28,7 @@ stdint ssize_t wchar wcrtomb -wctype +wctype-h configure.ac: gl_REGEX diff --git a/modules/wcscasecmp b/modules/wcscasecmp index b5e8e69a3..18c549c2f 100644 --- a/modules/wcscasecmp +++ b/modules/wcscasecmp @@ -8,7 +8,7 @@ m4/wcscasecmp.m4 Depends-on: wchar -wctype +wctype-h configure.ac: gl_FUNC_WCSCASECMP diff --git a/modules/wcsncasecmp b/modules/wcsncasecmp index 8f4e1ad4a..88f36198d 100644 --- a/modules/wcsncasecmp +++ b/modules/wcsncasecmp @@ -8,7 +8,7 @@ m4/wcsncasecmp.m4 Depends-on: wchar -wctype +wctype-h configure.ac: gl_FUNC_WCSNCASECMP diff --git a/modules/wctype b/modules/wctype index 99dbe44a5..c3c0e808b 100644 --- a/modules/wctype +++ b/modules/wctype @@ -2,49 +2,19 @@ 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 +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 --git a/modules/wctype-c++-tests b/modules/wctype-c++-tests deleted file mode 100644 index 3f794dd66..000000000 --- a/modules/wctype-c++-tests +++ /dev/null @@ -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 --git a/modules/wctype-h b/modules/wctype-h new file mode 100644 index 000000000..99dbe44a5 --- /dev/null +++ b/modules/wctype-h @@ -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 --git a/modules/wctype-h-c++-tests b/modules/wctype-h-c++-tests new file mode 100644 index 000000000..2b22df473 --- /dev/null +++ b/modules/wctype-h-c++-tests @@ -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 --git a/modules/wctype-h-tests b/modules/wctype-h-tests new file mode 100644 index 000000000..5cce746c5 --- /dev/null +++ b/modules/wctype-h-tests @@ -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 --git a/modules/wctype-tests b/modules/wctype-tests deleted file mode 100644 index 41b1b0d9a..000000000 --- a/modules/wctype-tests +++ /dev/null @@ -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 --git a/modules/wcwidth b/modules/wcwidth index fe410f150..e4a9460e9 100644 --- a/modules/wcwidth +++ b/modules/wcwidth @@ -10,7 +10,7 @@ m4/wint_t.m4 Depends-on: extensions wchar -wctype +wctype-h localcharset streq uniwidth/width diff --git a/tests/test-wctype-c++.cc b/tests/test-wctype-h-c++.cc similarity index 100% rename from tests/test-wctype-c++.cc rename to tests/test-wctype-h-c++.cc diff --git a/tests/test-wctype.c b/tests/test-wctype-h.c similarity index 100% rename from tests/test-wctype.c rename to tests/test-wctype-h.c -- 2.11.0