>From 3afaa18548fed7085e138d68847b970922e9f067 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 4 Jan 2020 10:03:36 +0100 Subject: [PATCH 1/2] btoc32: New module. * lib/uchar.in.h (btoc32): New declaration. * lib/btoc32.c: New file. * m4/uchar.m4 (gl_UCHAR_H_DEFAULTS): Initialize GNULIB_BTOC32. * modules/uchar (Makefile.am): Substitute GNULIB_BTOC32. * modules/btoc32: New file. * tests/test-uchar-c++.cc: Test the signature of btoc32. * doc/posix-functions/btowc.texi: Mention the new module. --- ChangeLog | 11 +++++++++++ doc/posix-functions/btowc.texi | 7 +++++-- lib/btoc32.c | 30 ++++++++++++++++++++++++++++++ lib/uchar.in.h | 8 ++++++++ m4/uchar.m4 | 3 ++- modules/btoc32 | 24 ++++++++++++++++++++++++ modules/uchar | 1 + tests/test-uchar-c++.cc | 4 ++++ 8 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 lib/btoc32.c create mode 100644 modules/btoc32 diff --git a/ChangeLog b/ChangeLog index 2ae1d5a..80fe741 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2020-01-04 Bruno Haible + + btoc32: New module. + * lib/uchar.in.h (btoc32): New declaration. + * lib/btoc32.c: New file. + * m4/uchar.m4 (gl_UCHAR_H_DEFAULTS): Initialize GNULIB_BTOC32. + * modules/uchar (Makefile.am): Substitute GNULIB_BTOC32. + * modules/btoc32: New file. + * tests/test-uchar-c++.cc: Test the signature of btoc32. + * doc/posix-functions/btowc.texi: Mention the new module. + 2020-01-03 Bruno Haible uchar tests: Avoid compilation error with HP cc. diff --git a/doc/posix-functions/btowc.texi b/doc/posix-functions/btowc.texi index b29ae7b..fa1ea9b 100644 --- a/doc/posix-functions/btowc.texi +++ b/doc/posix-functions/btowc.texi @@ -22,8 +22,11 @@ IRIX 6.5. Portability problems not fixed by Gnulib: @itemize @item -On Windows and 32-bit AIX platforms, @code{wchar_t} is a 16-bit type and therefore cannot -accommodate all Unicode characters. +On Windows and 32-bit AIX platforms, @code{wchar_t} is a 16-bit type and +therefore cannot accommodate all Unicode characters. +However, the Gnulib function @code{btoc32}, provided by Gnulib module +@code{btoc32}, operates on 32-bit wide characters and therefore does not have +this limitation. @item In the C or POSIX locales, this function is not consistent with Gnulib's @code{mbrtowc} and can return @code{WEOF}: diff --git a/lib/btoc32.c b/lib/btoc32.c new file mode 100644 index 0000000..8b27875 --- /dev/null +++ b/lib/btoc32.c @@ -0,0 +1,30 @@ +/* Convert unibyte character to 32-bit wide character. + Copyright (C) 2020 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 , 2020. */ + +#include + +/* Specification. */ +#include + +wint_t +btoc32 (int c) +{ + /* In all known locale encodings, unibyte characters correspond only to + characters in the BMP. */ + return btowc (c); +} diff --git a/lib/uchar.in.h b/lib/uchar.in.h index 6f533a1..f377cb4 100644 --- a/lib/uchar.in.h +++ b/lib/uchar.in.h @@ -60,6 +60,14 @@ typedef uint_least32_t char32_t; #endif +/* Convert a single-byte character to a 32-bit wide character. */ +#if @GNULIB_BTOC32@ +_GL_FUNCDECL_SYS (btoc32, wint_t, (int c) _GL_ATTRIBUTE_PURE); +_GL_CXXALIAS_SYS (btoc32, wint_t, (int c)); +_GL_CXXALIASWARN (btoc32); +#endif + + /* Converts a 32-bit wide character to unibyte character. Returns the single-byte representation of WC if it exists, or EOF otherwise. */ diff --git a/m4/uchar.m4 b/m4/uchar.m4 index 4d5f046..2fbe45f 100644 --- a/m4/uchar.m4 +++ b/m4/uchar.m4 @@ -1,4 +1,4 @@ -# uchar.m4 serial 3 +# uchar.m4 serial 4 dnl Copyright (C) 2019-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -37,6 +37,7 @@ AC_DEFUN([gl_UCHAR_MODULE_INDICATOR], AC_DEFUN([gl_UCHAR_H_DEFAULTS], [ + GNULIB_BTOC32=0; AC_SUBST([GNULIB_BTOC32]) GNULIB_C32TOB=0; AC_SUBST([GNULIB_C32TOB]) GNULIB_MBRTOC32=0; AC_SUBST([GNULIB_MBRTOC32]) dnl Assume proper GNU behavior unless another module says otherwise. diff --git a/modules/btoc32 b/modules/btoc32 new file mode 100644 index 0000000..5e5d4a9 --- /dev/null +++ b/modules/btoc32 @@ -0,0 +1,24 @@ +Description: +btoc32() function: convert unibyte character to 32-bit wide character. + +Files: +lib/btoc32.c + +Depends-on: +uchar +btowc + +configure.ac: +gl_UCHAR_MODULE_INDICATOR([btoc32]) + +Makefile.am: +lib_SOURCES += btoc32.c + +Include: + + +License: +LGPLv2+ + +Maintainer: +Bruno Haible diff --git a/modules/uchar b/modules/uchar index 165fae6..f3f83ae 100644 --- a/modules/uchar +++ b/modules/uchar @@ -26,6 +26,7 @@ uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) -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/@''GNULIB_BTOC32''@/$(GNULIB_BTOC32)/g' \ -e 's/@''GNULIB_C32TOB''@/$(GNULIB_C32TOB)/g' \ -e 's/@''GNULIB_MBRTOC32''@/$(GNULIB_MBRTOC32)/g' \ -e 's|@''HAVE_MBRTOC32''@|$(HAVE_MBRTOC32)|g' \ diff --git a/tests/test-uchar-c++.cc b/tests/test-uchar-c++.cc index 392b104..56a3a25 100644 --- a/tests/test-uchar-c++.cc +++ b/tests/test-uchar-c++.cc @@ -24,6 +24,10 @@ #include "signature.h" +#if GNULIB_TEST_BTOC32 +SIGNATURE_CHECK (GNULIB_NAMESPACE::btoc32, wint_t, (int)); +#endif + #if GNULIB_TEST_C32TOB SIGNATURE_CHECK (GNULIB_NAMESPACE::c32tob, int, (wint_t)); #endif -- 2.7.4