From 431281765fa097b99ee7a4737a55fd2a6f3f0e96 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 27 Dec 2024 23:41:50 +0100 Subject: [PATCH] Rename module uchar to uchar-h. * modules/uchar-h: Renamed from modules/uchar. * modules/uchar-h-tests: Renamed from modules/uchar-tests. * modules/uchar-h-c++-tests: Renamed from modules/uchar-c++-tests. * tests/test-uchar-h.c: Renamed from tests/test-uchar.c. * tests/test-uchar-h-c++.cc: Renamed from tests/test-uchar-c++.cc. * tests/test-uchar-h-c++2.cc: Renamed from tests/test-uchar-c++2.cc. * doc/posix-headers/uchar.texi: Update. * modules/* (Depends-on): Update. * modules/uchar: New file. --- ChangeLog | 13 +++ doc/posix-headers/uchar.texi | 6 +- modules/btoc32 | 2 +- modules/c32_apply_mapping | 2 +- modules/c32_apply_type_test | 2 +- modules/c32_get_mapping | 2 +- modules/c32_get_type_test | 2 +- modules/c32isalnum | 2 +- modules/c32isalpha | 2 +- modules/c32isblank | 2 +- modules/c32iscntrl | 2 +- modules/c32isdigit | 2 +- modules/c32isgraph | 2 +- modules/c32islower | 2 +- modules/c32isprint | 2 +- modules/c32ispunct | 2 +- modules/c32isspace | 2 +- modules/c32isupper | 2 +- modules/c32isxdigit | 2 +- modules/c32rtomb | 2 +- modules/c32snrtombs | 2 +- modules/c32srtombs | 2 +- modules/c32stombs | 2 +- modules/c32swidth | 2 +- modules/c32tob | 2 +- modules/c32tolower | 2 +- modules/c32toupper | 2 +- modules/c32width | 2 +- modules/dfa | 2 +- modules/fnmatch | 2 +- modules/mbchar | 2 +- modules/mbiter | 2 +- modules/mbiterf | 2 +- modules/mbmemcasecoll | 2 +- modules/mbrtoc16 | 2 +- modules/mbrtoc32 | 2 +- modules/mbscasecmp | 2 +- modules/mbsnrtoc32s | 2 +- modules/mbsrtoc32s | 2 +- modules/mbstoc32s | 2 +- modules/mbswidth | 2 +- modules/mbuiter | 2 +- modules/mbuiterf | 2 +- modules/mcel | 2 +- modules/posixcheck | 2 +- modules/quotearg | 2 +- modules/uchar | 98 ++-------------- modules/uchar-c23 | 2 +- modules/uchar-h | 109 ++++++++++++++++++ .../{uchar-c++-tests => uchar-h-c++-tests} | 14 +-- modules/uchar-h-tests | 12 ++ modules/uchar-tests | 12 -- ...{test-uchar-c++.cc => test-uchar-h-c++.cc} | 0 ...est-uchar-c++2.cc => test-uchar-h-c++2.cc} | 0 tests/{test-uchar.c => test-uchar-h.c} | 0 55 files changed, 196 insertions(+), 158 deletions(-) create mode 100644 modules/uchar-h rename modules/{uchar-c++-tests => uchar-h-c++-tests} (72%) create mode 100644 modules/uchar-h-tests delete mode 100644 modules/uchar-tests rename tests/{test-uchar-c++.cc => test-uchar-h-c++.cc} (100%) rename tests/{test-uchar-c++2.cc => test-uchar-h-c++2.cc} (100%) rename tests/{test-uchar.c => test-uchar-h.c} (100%) diff --git a/ChangeLog b/ChangeLog index 23e8e7126d..15a235c764 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2024-12-27 Bruno Haible + + Rename module uchar to uchar-h. + * modules/uchar-h: Renamed from modules/uchar. + * modules/uchar-h-tests: Renamed from modules/uchar-tests. + * modules/uchar-h-c++-tests: Renamed from modules/uchar-c++-tests. + * tests/test-uchar-h.c: Renamed from tests/test-uchar.c. + * tests/test-uchar-h-c++.cc: Renamed from tests/test-uchar-c++.cc. + * tests/test-uchar-h-c++2.cc: Renamed from tests/test-uchar-c++2.cc. + * doc/posix-headers/uchar.texi: Update. + * modules/* (Depends-on): Update. + * modules/uchar: New file. + 2024-12-27 Bruno Haible Rename module termios to termios-h. diff --git a/doc/posix-headers/uchar.texi b/doc/posix-headers/uchar.texi index 9c918b0842..9abb4bc65d 100644 --- a/doc/posix-headers/uchar.texi +++ b/doc/posix-headers/uchar.texi @@ -9,11 +9,11 @@ Defines the types @code{char16_t}, @code{char32_t} and declares the functions @code{mbrtoc16}, @code{c16rtomb}, @code{mbrtoc32}, @code{c32rtomb}. -Gnulib module: uchar or uchar-c23 -@mindex uchar +Gnulib module: uchar-h or uchar-c23 +@mindex uchar-h @mindex uchar-c23 -Portability problems fixed by either Gnulib module @code{uchar} or @code{uchar-c23}: +Portability problems fixed by either Gnulib module @code{uchar-h} or @code{uchar-c23}: @itemize @item This header file is missing on many non-glibc platforms: diff --git a/modules/btoc32 b/modules/btoc32 index e6385398ec..e2acebb402 100644 --- a/modules/btoc32 +++ b/modules/btoc32 @@ -5,7 +5,7 @@ Files: lib/btoc32.c Depends-on: -uchar +uchar-h mbszero mbrtoc32 btowc diff --git a/modules/c32_apply_mapping b/modules/c32_apply_mapping index 49308259d0..103c037084 100644 --- a/modules/c32_apply_mapping +++ b/modules/c32_apply_mapping @@ -6,7 +6,7 @@ Files: lib/c32_apply_mapping.c Depends-on: -uchar +uchar-h towctrans configure.ac: diff --git a/modules/c32_apply_type_test b/modules/c32_apply_type_test index 3477413f86..6619441042 100644 --- a/modules/c32_apply_type_test +++ b/modules/c32_apply_type_test @@ -6,7 +6,7 @@ Files: lib/c32_apply_type_test.c Depends-on: -uchar +uchar-h iswctype configure.ac: diff --git a/modules/c32_get_mapping b/modules/c32_get_mapping index 140a92e99b..de2a3b63de 100644 --- a/modules/c32_get_mapping +++ b/modules/c32_get_mapping @@ -6,7 +6,7 @@ Files: lib/c32_get_mapping.c Depends-on: -uchar +uchar-h wctrans c32tolower c32toupper diff --git a/modules/c32_get_type_test b/modules/c32_get_type_test index 4b54660714..e511bd51c7 100644 --- a/modules/c32_get_type_test +++ b/modules/c32_get_type_test @@ -6,7 +6,7 @@ Files: lib/c32_get_type_test.c Depends-on: -uchar +uchar-h wctype c32isalnum c32isalpha diff --git a/modules/c32isalnum b/modules/c32isalnum index 8b82528b00..f79abc276c 100644 --- a/modules/c32isalnum +++ b/modules/c32isalnum @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h localcharset [test $REPLACE_MBSTATE_T = 1] diff --git a/modules/c32isalpha b/modules/c32isalpha index c1470238b8..4eab9a07e5 100644 --- a/modules/c32isalpha +++ b/modules/c32isalpha @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h localcharset [test $REPLACE_MBSTATE_T = 1] diff --git a/modules/c32isblank b/modules/c32isblank index f231f95600..ca7463ca62 100644 --- a/modules/c32isblank +++ b/modules/c32isblank @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h iswblank diff --git a/modules/c32iscntrl b/modules/c32iscntrl index cc4c80cb08..84924150dd 100644 --- a/modules/c32iscntrl +++ b/modules/c32iscntrl @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h localcharset [test $REPLACE_MBSTATE_T = 1] diff --git a/modules/c32isdigit b/modules/c32isdigit index 986bf79e28..4da5e9b11e 100644 --- a/modules/c32isdigit +++ b/modules/c32isdigit @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h iswdigit diff --git a/modules/c32isgraph b/modules/c32isgraph index a6519a6208..6de4e60a7a 100644 --- a/modules/c32isgraph +++ b/modules/c32isgraph @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h localcharset [test $REPLACE_MBSTATE_T = 1] diff --git a/modules/c32islower b/modules/c32islower index 378ac90a2b..f78c0a91ec 100644 --- a/modules/c32islower +++ b/modules/c32islower @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h localcharset [test $REPLACE_MBSTATE_T = 1] diff --git a/modules/c32isprint b/modules/c32isprint index 5d6d4703d0..9fe3c71731 100644 --- a/modules/c32isprint +++ b/modules/c32isprint @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h localcharset [test $REPLACE_MBSTATE_T = 1] diff --git a/modules/c32ispunct b/modules/c32ispunct index 39c1286a78..46eb66b4bb 100644 --- a/modules/c32ispunct +++ b/modules/c32ispunct @@ -15,7 +15,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h iswpunct diff --git a/modules/c32isspace b/modules/c32isspace index a2dd36876d..d2372d8d12 100644 --- a/modules/c32isspace +++ b/modules/c32isspace @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h localcharset [test $REPLACE_MBSTATE_T = 1] diff --git a/modules/c32isupper b/modules/c32isupper index 2e5972d137..840c2b58fe 100644 --- a/modules/c32isupper +++ b/modules/c32isupper @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h localcharset [test $REPLACE_MBSTATE_T = 1] diff --git a/modules/c32isxdigit b/modules/c32isxdigit index a1c498fe3b..1a95a30c46 100644 --- a/modules/c32isxdigit +++ b/modules/c32isxdigit @@ -15,7 +15,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h iswxdigit diff --git a/modules/c32rtomb b/modules/c32rtomb index 8331aa178a..1d7170164b 100644 --- a/modules/c32rtomb +++ b/modules/c32rtomb @@ -11,7 +11,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h attribute [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1] wchar [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1] wcrtomb [test $HAVE_C32RTOMB = 0 || test $REPLACE_C32RTOMB = 1] diff --git a/modules/c32snrtombs b/modules/c32snrtombs index e1bd41470d..b3d2f698c4 100644 --- a/modules/c32snrtombs +++ b/modules/c32snrtombs @@ -7,7 +7,7 @@ lib/wcsnrtombs-impl.h lib/c32srtombs-state.c Depends-on: -uchar +uchar-h wchar assert-h c32rtomb diff --git a/modules/c32srtombs b/modules/c32srtombs index ac1aaa7a0b..b81cc88263 100644 --- a/modules/c32srtombs +++ b/modules/c32srtombs @@ -7,7 +7,7 @@ lib/wcsrtombs-impl.h lib/c32srtombs-state.c Depends-on: -uchar +uchar-h wchar assert-h c32rtomb diff --git a/modules/c32stombs b/modules/c32stombs index 103c8758c0..1e1b24cb91 100644 --- a/modules/c32stombs +++ b/modules/c32stombs @@ -5,7 +5,7 @@ Files: lib/c32stombs.c Depends-on: -uchar +uchar-h wchar mbszero c32srtombs diff --git a/modules/c32swidth b/modules/c32swidth index 70891d9fb1..628c2981f4 100644 --- a/modules/c32swidth +++ b/modules/c32swidth @@ -10,7 +10,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wcswidth c32width diff --git a/modules/c32tob b/modules/c32tob index 6637b82492..bbb3eedd19 100644 --- a/modules/c32tob +++ b/modules/c32tob @@ -11,7 +11,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h mbszero c32rtomb wctob diff --git a/modules/c32tolower b/modules/c32tolower index eb139aa16f..a6b5fef200 100644 --- a/modules/c32tolower +++ b/modules/c32tolower @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h localcharset [test $REPLACE_MBSTATE_T = 1] diff --git a/modules/c32toupper b/modules/c32toupper index 9f7c3c516b..103554d60f 100644 --- a/modules/c32toupper +++ b/modules/c32toupper @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wctype-h localcharset [test $REPLACE_MBSTATE_T = 1] diff --git a/modules/c32width b/modules/c32width index d2e262abab..b91bb7502f 100644 --- a/modules/c32width +++ b/modules/c32width @@ -14,7 +14,7 @@ m4/locale-zh.m4 m4/codeset.m4 Depends-on: -uchar +uchar-h wchar wcwidth uniwidth/width diff --git a/modules/dfa b/modules/dfa index 60b0086fc5..aac8a9866a 100644 --- a/modules/dfa +++ b/modules/dfa @@ -31,7 +31,7 @@ stdint-h stdio-h stdlib-h string-h -uchar +uchar-h # The lonesome_lower array requires ISO C 23 semantics for char32_t. # But uchar-c23 has a global effect, therefore leave it to each package # to enable it. diff --git a/modules/fnmatch b/modules/fnmatch index 4384e9b5dc..601038e084 100644 --- a/modules/fnmatch +++ b/modules/fnmatch @@ -19,7 +19,7 @@ libc-config [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1] stdbool-h [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1] stdckdint-h [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1] strnlen [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1] -uchar [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1] +uchar-h [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1] memchr [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1] memcmp [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1] mempcpy [test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1] diff --git a/modules/mbchar b/modules/mbchar index 060db39482..4554d04b52 100644 --- a/modules/mbchar +++ b/modules/mbchar @@ -10,7 +10,7 @@ Depends-on: extensions extern-inline stdbool-h -uchar +uchar-h c32isalnum c32isalpha c32isblank diff --git a/modules/mbiter b/modules/mbiter index 508dbf0d05..e2d2db6e95 100644 --- a/modules/mbiter +++ b/modules/mbiter @@ -13,7 +13,7 @@ mbchar mbrtoc32 mbsinit mbszero -uchar +uchar-h stdbool-h configure.ac: diff --git a/modules/mbiterf b/modules/mbiterf index 5b28b1b685..7393cedcf1 100644 --- a/modules/mbiterf +++ b/modules/mbiterf @@ -13,7 +13,7 @@ mbchar mbrtoc32 mbsinit mbszero -uchar +uchar-h stdbool-h configure.ac: diff --git a/modules/mbmemcasecoll b/modules/mbmemcasecoll index f6f3b5791a..b13c6f5b1a 100644 --- a/modules/mbmemcasecoll +++ b/modules/mbmemcasecoll @@ -9,7 +9,7 @@ lib/mbmemcasecoll.c Depends-on: stdbool-h wchar -uchar +uchar-h malloca mbszero mbrtoc32 diff --git a/modules/mbrtoc16 b/modules/mbrtoc16 index 19cc559fb6..c5a0a05122 100644 --- a/modules/mbrtoc16 +++ b/modules/mbrtoc16 @@ -12,7 +12,7 @@ m4/mbrtowc.m4 m4/mbstate_t.m4 Depends-on: -uchar +uchar-h uchar-c23 [test $HAVE_MBRTOC16 = 0 || test $REPLACE_MBRTOC16 = 1] mbrtoc32 [test $HAVE_MBRTOC16 = 0 || test $REPLACE_MBRTOC16 = 1] mbsinit [test $HAVE_MBRTOC16 = 0 || test $REPLACE_MBRTOC16 = 1] diff --git a/modules/mbrtoc32 b/modules/mbrtoc32 index 75c2b6fe45..ac2391dd79 100644 --- a/modules/mbrtoc32 +++ b/modules/mbrtoc32 @@ -22,7 +22,7 @@ m4/threadlib.m4 m4/visibility.m4 Depends-on: -uchar +uchar-h attribute [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1] c99 [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0] hard-locale [{ test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1; } && test $REPLACE_MBSTATE_T = 0] diff --git a/modules/mbscasecmp b/modules/mbscasecmp index 113df00173..473fd018c9 100644 --- a/modules/mbscasecmp +++ b/modules/mbscasecmp @@ -9,7 +9,7 @@ c32tolower mbuiterf [test "$GNULIB_MCEL_PREFER" != yes] stdlib-h string-h -uchar +uchar-h configure.ac: gl_STRING_MODULE_INDICATOR([mbscasecmp]) diff --git a/modules/mbsnrtoc32s b/modules/mbsnrtoc32s index 4134968a94..afd01fa9ca 100644 --- a/modules/mbsnrtoc32s +++ b/modules/mbsnrtoc32s @@ -7,7 +7,7 @@ lib/mbsnrtowcs-impl.h lib/mbsrtoc32s-state.c Depends-on: -uchar +uchar-h wchar assert-h mbrtoc32 diff --git a/modules/mbsrtoc32s b/modules/mbsrtoc32s index 816ce046d3..39fcd49b5c 100644 --- a/modules/mbsrtoc32s +++ b/modules/mbsrtoc32s @@ -7,7 +7,7 @@ lib/mbsrtowcs-impl.h lib/mbsrtoc32s-state.c Depends-on: -uchar +uchar-h wchar assert-h mbrtoc32 diff --git a/modules/mbstoc32s b/modules/mbstoc32s index f926ef1561..0c405139f8 100644 --- a/modules/mbstoc32s +++ b/modules/mbstoc32s @@ -5,7 +5,7 @@ Files: lib/mbstoc32s.c Depends-on: -uchar +uchar-h wchar mbszero mbsrtoc32s diff --git a/modules/mbswidth b/modules/mbswidth index 3c2e17dc06..58e092d10d 100644 --- a/modules/mbswidth +++ b/modules/mbswidth @@ -10,7 +10,7 @@ m4/mbswidth.m4 Depends-on: wchar -uchar +uchar-h mbrtoc32 mbsinit mbszero diff --git a/modules/mbuiter b/modules/mbuiter index ea29a5ca50..42c449c313 100644 --- a/modules/mbuiter +++ b/modules/mbuiter @@ -13,7 +13,7 @@ mbchar mbrtoc32 mbsinit mbszero -uchar +uchar-h stdbool-h strnlen1 diff --git a/modules/mbuiterf b/modules/mbuiterf index a659a8b9ce..83307eb033 100644 --- a/modules/mbuiterf +++ b/modules/mbuiterf @@ -13,7 +13,7 @@ mbchar mbrtoc32 mbsinit mbszero -uchar +uchar-h stdbool-h strnlen1 diff --git a/modules/mcel b/modules/mcel index f81bb5b048..356b08eb91 100644 --- a/modules/mcel +++ b/modules/mcel @@ -12,7 +12,7 @@ extern-inline limits-h mbrtoc32 stdbool-h -uchar +uchar-h verify configure.ac: diff --git a/modules/posixcheck b/modules/posixcheck index e069fc6dc1..a7fd34fa0e 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -46,7 +46,7 @@ sys_wait-h termios-h threads-h time-h -uchar +uchar-h unistd utime-h utmp diff --git a/modules/quotearg b/modules/quotearg index c052d3458b..e716268d70 100644 --- a/modules/quotearg +++ b/modules/quotearg @@ -23,7 +23,7 @@ quotearg-simple localcharset stdbool-h stdint-h -uchar +uchar-h xalloc configure.ac: diff --git a/modules/uchar b/modules/uchar index cd31ab993d..6472212691 100644 --- a/modules/uchar +++ b/modules/uchar @@ -1,103 +1,20 @@ Description: A GNU-like . +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'uchar-h' instead. + Files: -lib/uchar.in.h -m4/uchar_h.m4 -m4/stdint.m4 Depends-on: -gen-header -include_next -snippet/arg-nonnull -snippet/c++defs -snippet/warn-on-use -extern-inline -assert-h -stdint-h -wchar -wctype-h +uchar-h configure.ac: -gl_UCHAR_H -gl_UCHAR_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += uchar.h - -uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ - -e 's/@''HAVE_UCHAR_H''@/$(HAVE_UCHAR_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_UCHAR_H''@|$(NEXT_UCHAR_H)|g' \ - -e 's|@''CXX_HAS_CHAR8_TYPE''@|$(CXX_HAS_CHAR8_TYPE)|g' \ - -e 's|@''CXX_HAS_UCHAR_TYPES''@|$(CXX_HAS_UCHAR_TYPES)|g' \ - -e 's|@''SMALL_WCHAR_T''@|$(SMALL_WCHAR_T)|g' \ - -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR8_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR8_T)|g' \ - -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR16_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR16_T)|g' \ - -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR32_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR32_T)|g' \ - -e 's/@''GNULIB_BTOC32''@/$(GNULIB_BTOC32)/g' \ - -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ - -e 's/@''GNULIB_C32ISALNUM''@/$(GNULIB_C32ISALNUM)/g' \ - -e 's/@''GNULIB_C32ISALPHA''@/$(GNULIB_C32ISALPHA)/g' \ - -e 's/@''GNULIB_C32ISBLANK''@/$(GNULIB_C32ISBLANK)/g' \ - -e 's/@''GNULIB_C32ISCNTRL''@/$(GNULIB_C32ISCNTRL)/g' \ - -e 's/@''GNULIB_C32ISDIGIT''@/$(GNULIB_C32ISDIGIT)/g' \ - -e 's/@''GNULIB_C32ISGRAPH''@/$(GNULIB_C32ISGRAPH)/g' \ - -e 's/@''GNULIB_C32ISLOWER''@/$(GNULIB_C32ISLOWER)/g' \ - -e 's/@''GNULIB_C32ISPRINT''@/$(GNULIB_C32ISPRINT)/g' \ - -e 's/@''GNULIB_C32ISPUNCT''@/$(GNULIB_C32ISPUNCT)/g' \ - -e 's/@''GNULIB_C32ISSPACE''@/$(GNULIB_C32ISSPACE)/g' \ - -e 's/@''GNULIB_C32ISUPPER''@/$(GNULIB_C32ISUPPER)/g' \ - -e 's/@''GNULIB_C32ISXDIGIT''@/$(GNULIB_C32ISXDIGIT)/g' \ - -e 's/@''GNULIB_C32TOLOWER''@/$(GNULIB_C32TOLOWER)/g' \ - -e 's/@''GNULIB_C32TOUPPER''@/$(GNULIB_C32TOUPPER)/g' \ - -e 's/@''GNULIB_C32WIDTH''@/$(GNULIB_C32WIDTH)/g' \ - -e 's/@''GNULIB_C32RTOMB''@/$(GNULIB_C32RTOMB)/g' \ - -e 's/@''GNULIB_C32SNRTOMBS''@/$(GNULIB_C32SNRTOMBS)/g' \ - -e 's/@''GNULIB_C32SRTOMBS''@/$(GNULIB_C32SRTOMBS)/g' \ - -e 's/@''GNULIB_C32STOMBS''@/$(GNULIB_C32STOMBS)/g' \ - -e 's/@''GNULIB_C32SWIDTH''@/$(GNULIB_C32SWIDTH)/g' \ - -e 's/@''GNULIB_C32TOB''@/$(GNULIB_C32TOB)/g' \ - -e 's/@''GNULIB_C32_APPLY_MAPPING''@/$(GNULIB_C32_APPLY_MAPPING)/g' \ - -e 's/@''GNULIB_C32_APPLY_TYPE_TEST''@/$(GNULIB_C32_APPLY_TYPE_TEST)/g' \ - -e 's/@''GNULIB_C32_GET_MAPPING''@/$(GNULIB_C32_GET_MAPPING)/g' \ - -e 's/@''GNULIB_C32_GET_TYPE_TEST''@/$(GNULIB_C32_GET_TYPE_TEST)/g' \ - -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ - -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \ - -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \ - -e 's/@''GNULIB_MBRTOC16''@/$(GNULIB_MBRTOC16)/g' \ - -e 's/@''GNULIB_MBRTOC32''@/$(GNULIB_MBRTOC32)/g' \ - -e 's/@''GNULIB_MBSNRTOC32S''@/$(GNULIB_MBSNRTOC32S)/g' \ - -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ - -e 's/@''GNULIB_MBSRTOC32S''@/$(GNULIB_MBSRTOC32S)/g' \ - -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ - -e 's/@''GNULIB_MBSTOC32S''@/$(GNULIB_MBSTOC32S)/g' \ - -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ - -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ - -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ - -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ - -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ - -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ - -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ - -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ - -e 's|@''HAVE_C32RTOMB''@|$(HAVE_C32RTOMB)|g' \ - -e 's|@''HAVE_MBRTOC16''@|$(HAVE_MBRTOC16)|g' \ - -e 's|@''HAVE_MBRTOC32''@|$(HAVE_MBRTOC32)|g' \ - -e 's|@''REPLACE_C32RTOMB''@|$(REPLACE_C32RTOMB)|g' \ - -e 's|@''REPLACE_MBRTOC16''@|$(REPLACE_MBRTOC16)|g' \ - -e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - $(srcdir)/uchar.in.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += uchar.h uchar.h-t Include: @@ -106,4 +23,3 @@ License: LGPLv2+ Maintainer: -all diff --git a/modules/uchar-c23 b/modules/uchar-c23 index 06d920bf5f..3a12219922 100644 --- a/modules/uchar-c23 +++ b/modules/uchar-c23 @@ -6,7 +6,7 @@ lib/lc-charset-unicode.h lib/lc-charset-unicode.c Depends-on: -uchar +uchar-h wchar iconv localcharset diff --git a/modules/uchar-h b/modules/uchar-h new file mode 100644 index 0000000000..cd31ab993d --- /dev/null +++ b/modules/uchar-h @@ -0,0 +1,109 @@ +Description: +A GNU-like . + +Files: +lib/uchar.in.h +m4/uchar_h.m4 +m4/stdint.m4 + +Depends-on: +gen-header +include_next +snippet/arg-nonnull +snippet/c++defs +snippet/warn-on-use +extern-inline +assert-h +stdint-h +wchar +wctype-h + +configure.ac: +gl_UCHAR_H +gl_UCHAR_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += uchar.h + +uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ + -e 's/@''HAVE_UCHAR_H''@/$(HAVE_UCHAR_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_UCHAR_H''@|$(NEXT_UCHAR_H)|g' \ + -e 's|@''CXX_HAS_CHAR8_TYPE''@|$(CXX_HAS_CHAR8_TYPE)|g' \ + -e 's|@''CXX_HAS_UCHAR_TYPES''@|$(CXX_HAS_UCHAR_TYPES)|g' \ + -e 's|@''SMALL_WCHAR_T''@|$(SMALL_WCHAR_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR8_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR8_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR16_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR16_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR32_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR32_T)|g' \ + -e 's/@''GNULIB_BTOC32''@/$(GNULIB_BTOC32)/g' \ + -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ + -e 's/@''GNULIB_C32ISALNUM''@/$(GNULIB_C32ISALNUM)/g' \ + -e 's/@''GNULIB_C32ISALPHA''@/$(GNULIB_C32ISALPHA)/g' \ + -e 's/@''GNULIB_C32ISBLANK''@/$(GNULIB_C32ISBLANK)/g' \ + -e 's/@''GNULIB_C32ISCNTRL''@/$(GNULIB_C32ISCNTRL)/g' \ + -e 's/@''GNULIB_C32ISDIGIT''@/$(GNULIB_C32ISDIGIT)/g' \ + -e 's/@''GNULIB_C32ISGRAPH''@/$(GNULIB_C32ISGRAPH)/g' \ + -e 's/@''GNULIB_C32ISLOWER''@/$(GNULIB_C32ISLOWER)/g' \ + -e 's/@''GNULIB_C32ISPRINT''@/$(GNULIB_C32ISPRINT)/g' \ + -e 's/@''GNULIB_C32ISPUNCT''@/$(GNULIB_C32ISPUNCT)/g' \ + -e 's/@''GNULIB_C32ISSPACE''@/$(GNULIB_C32ISSPACE)/g' \ + -e 's/@''GNULIB_C32ISUPPER''@/$(GNULIB_C32ISUPPER)/g' \ + -e 's/@''GNULIB_C32ISXDIGIT''@/$(GNULIB_C32ISXDIGIT)/g' \ + -e 's/@''GNULIB_C32TOLOWER''@/$(GNULIB_C32TOLOWER)/g' \ + -e 's/@''GNULIB_C32TOUPPER''@/$(GNULIB_C32TOUPPER)/g' \ + -e 's/@''GNULIB_C32WIDTH''@/$(GNULIB_C32WIDTH)/g' \ + -e 's/@''GNULIB_C32RTOMB''@/$(GNULIB_C32RTOMB)/g' \ + -e 's/@''GNULIB_C32SNRTOMBS''@/$(GNULIB_C32SNRTOMBS)/g' \ + -e 's/@''GNULIB_C32SRTOMBS''@/$(GNULIB_C32SRTOMBS)/g' \ + -e 's/@''GNULIB_C32STOMBS''@/$(GNULIB_C32STOMBS)/g' \ + -e 's/@''GNULIB_C32SWIDTH''@/$(GNULIB_C32SWIDTH)/g' \ + -e 's/@''GNULIB_C32TOB''@/$(GNULIB_C32TOB)/g' \ + -e 's/@''GNULIB_C32_APPLY_MAPPING''@/$(GNULIB_C32_APPLY_MAPPING)/g' \ + -e 's/@''GNULIB_C32_APPLY_TYPE_TEST''@/$(GNULIB_C32_APPLY_TYPE_TEST)/g' \ + -e 's/@''GNULIB_C32_GET_MAPPING''@/$(GNULIB_C32_GET_MAPPING)/g' \ + -e 's/@''GNULIB_C32_GET_TYPE_TEST''@/$(GNULIB_C32_GET_TYPE_TEST)/g' \ + -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ + -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \ + -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \ + -e 's/@''GNULIB_MBRTOC16''@/$(GNULIB_MBRTOC16)/g' \ + -e 's/@''GNULIB_MBRTOC32''@/$(GNULIB_MBRTOC32)/g' \ + -e 's/@''GNULIB_MBSNRTOC32S''@/$(GNULIB_MBSNRTOC32S)/g' \ + -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ + -e 's/@''GNULIB_MBSRTOC32S''@/$(GNULIB_MBSRTOC32S)/g' \ + -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ + -e 's/@''GNULIB_MBSTOC32S''@/$(GNULIB_MBSTOC32S)/g' \ + -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ + -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ + -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ + -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ + -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ + -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ + -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ + -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ + -e 's|@''HAVE_C32RTOMB''@|$(HAVE_C32RTOMB)|g' \ + -e 's|@''HAVE_MBRTOC16''@|$(HAVE_MBRTOC16)|g' \ + -e 's|@''HAVE_MBRTOC32''@|$(HAVE_MBRTOC32)|g' \ + -e 's|@''REPLACE_C32RTOMB''@|$(REPLACE_C32RTOMB)|g' \ + -e 's|@''REPLACE_MBRTOC16''@|$(REPLACE_MBRTOC16)|g' \ + -e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/uchar.in.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += uchar.h uchar.h-t + +Include: + + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/uchar-c++-tests b/modules/uchar-h-c++-tests similarity index 72% rename from modules/uchar-c++-tests rename to modules/uchar-h-c++-tests index bf6640f712..52a4f9c7f2 100644 --- a/modules/uchar-c++-tests +++ b/modules/uchar-h-c++-tests @@ -1,6 +1,6 @@ Files: -tests/test-uchar-c++.cc -tests/test-uchar-c++2.cc +tests/test-uchar-h-c++.cc +tests/test-uchar-h-c++2.cc tests/signature.h Status: @@ -33,11 +33,11 @@ gl_CONDITIONAL([CXX_HAVE_CUCHAR], [test $gl_cv_cxxheader_cuchar != no]) Makefile.am: if ANSICXX -TESTS += test-uchar-c++ -check_PROGRAMS += test-uchar-c++ -test_uchar_c___SOURCES = test-uchar-c++.cc +TESTS += test-uchar-h-c++ +check_PROGRAMS += test-uchar-h-c++ +test_uchar_h_c___SOURCES = test-uchar-h-c++.cc if CXX_HAVE_CUCHAR -test_uchar_c___SOURCES += test-uchar-c++2.cc +test_uchar_h_c___SOURCES += test-uchar-h-c++2.cc endif -test_uchar_c___LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) $(LIBC32CONV) +test_uchar_h_c___LDADD = $(LDADD) $(LIBUNISTRING) $(MBRTOWC_LIB) $(LIBC32CONV) endif diff --git a/modules/uchar-h-tests b/modules/uchar-h-tests new file mode 100644 index 0000000000..55ceb2c818 --- /dev/null +++ b/modules/uchar-h-tests @@ -0,0 +1,12 @@ +Files: +tests/test-uchar-h.c + +Depends-on: +assert-h +uchar-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-uchar-h +check_PROGRAMS += test-uchar-h diff --git a/modules/uchar-tests b/modules/uchar-tests deleted file mode 100644 index 5df13a09a4..0000000000 --- a/modules/uchar-tests +++ /dev/null @@ -1,12 +0,0 @@ -Files: -tests/test-uchar.c - -Depends-on: -assert-h -uchar-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-uchar -check_PROGRAMS += test-uchar diff --git a/tests/test-uchar-c++.cc b/tests/test-uchar-h-c++.cc similarity index 100% rename from tests/test-uchar-c++.cc rename to tests/test-uchar-h-c++.cc diff --git a/tests/test-uchar-c++2.cc b/tests/test-uchar-h-c++2.cc similarity index 100% rename from tests/test-uchar-c++2.cc rename to tests/test-uchar-h-c++2.cc diff --git a/tests/test-uchar.c b/tests/test-uchar-h.c similarity index 100% rename from tests/test-uchar.c rename to tests/test-uchar-h.c -- 2.39.5