The function 'btoc32' is like 'btowc', except that it may (in theory) produce
char32_t values instead of wchar_t values.
2020-01-04 Bruno Haible <br...@clisp.org>
btoc32: Add tests.
* tests/test-btoc32.c: New file, based on tests/test-btowc.c.
* tests/test-btoc32-1.sh: New file, based on tests/test-btowc1.sh.
* tests/test-btoc32-2.sh: New file, based on tests/test-btowc2.sh.
* modules/btoc32-tests: New file, based on modules/btowc-tests.
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.
>From 3afaa18548fed7085e138d68847b970922e9f067 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
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 <br...@clisp.org>
+
+ 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 <br...@clisp.org>
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 <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2020. */
+
+#include <config.h>
+
+/* Specification. */
+#include <uchar.h>
+
+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:
+<uchar.h>
+
+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
>From 4c7a6ab152c0e68c156abbc664966f109049353c Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Sat, 4 Jan 2020 10:07:12 +0100
Subject: [PATCH 2/2] btoc32: Add tests.
* tests/test-btoc32.c: New file, based on tests/test-btowc.c.
* tests/test-btoc32-1.sh: New file, based on tests/test-btowc1.sh.
* tests/test-btoc32-2.sh: New file, based on tests/test-btowc2.sh.
* modules/btoc32-tests: New file, based on modules/btowc-tests.
---
ChangeLog | 6 +++++
modules/btoc32-tests | 21 +++++++++++++++++
tests/test-btoc32-1.sh | 15 ++++++++++++
tests/test-btoc32-2.sh | 15 ++++++++++++
tests/test-btoc32.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 121 insertions(+)
create mode 100644 modules/btoc32-tests
create mode 100755 tests/test-btoc32-1.sh
create mode 100755 tests/test-btoc32-2.sh
create mode 100644 tests/test-btoc32.c
diff --git a/ChangeLog b/ChangeLog
index 80fe741..aa54dd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2020-01-04 Bruno Haible <br...@clisp.org>
+ btoc32: Add tests.
+ * tests/test-btoc32.c: New file, based on tests/test-btowc.c.
+ * tests/test-btoc32-1.sh: New file, based on tests/test-btowc1.sh.
+ * tests/test-btoc32-2.sh: New file, based on tests/test-btowc2.sh.
+ * modules/btoc32-tests: New file, based on modules/btowc-tests.
+
btoc32: New module.
* lib/uchar.in.h (btoc32): New declaration.
* lib/btoc32.c: New file.
diff --git a/modules/btoc32-tests b/modules/btoc32-tests
new file mode 100644
index 0000000..95900d5
--- /dev/null
+++ b/modules/btoc32-tests
@@ -0,0 +1,21 @@
+Files:
+tests/test-btoc32-1.sh
+tests/test-btoc32-2.sh
+tests/test-btoc32.c
+tests/signature.h
+tests/macros.h
+m4/locale-fr.m4
+m4/codeset.m4
+
+Depends-on:
+setlocale
+
+configure.ac:
+gt_LOCALE_FR
+gt_LOCALE_FR_UTF8
+
+Makefile.am:
+TESTS += test-btoc32-1.sh test-btoc32-2.sh
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+check_PROGRAMS += test-btoc32
+test_btoc32_LDADD = $(LDADD) $(LIB_SETLOCALE)
diff --git a/tests/test-btoc32-1.sh b/tests/test-btoc32-1.sh
new file mode 100755
index 0000000..ce860ae
--- /dev/null
+++ b/tests/test-btoc32-1.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Test in an ISO-8859-1 or ISO-8859-15 locale.
+: ${LOCALE_FR=fr_FR}
+if test $LOCALE_FR = none; then
+ if test -f /usr/bin/localedef; then
+ echo "Skipping test: no traditional french locale is installed"
+ else
+ echo "Skipping test: no traditional french locale is supported"
+ fi
+ exit 77
+fi
+
+LC_ALL=$LOCALE_FR \
+${CHECKER} ./test-btoc32${EXEEXT} 1
diff --git a/tests/test-btoc32-2.sh b/tests/test-btoc32-2.sh
new file mode 100755
index 0000000..b9cdb99
--- /dev/null
+++ b/tests/test-btoc32-2.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Test whether a specific UTF-8 locale is installed.
+: ${LOCALE_FR_UTF8=fr_FR.UTF-8}
+if test $LOCALE_FR_UTF8 = none; then
+ if test -f /usr/bin/localedef; then
+ echo "Skipping test: no french Unicode locale is installed"
+ else
+ echo "Skipping test: no french Unicode locale is supported"
+ fi
+ exit 77
+fi
+
+LC_ALL=$LOCALE_FR_UTF8 \
+${CHECKER} ./test-btoc32${EXEEXT} 2
diff --git a/tests/test-btoc32.c b/tests/test-btoc32.c
new file mode 100644
index 0000000..f5cfbe4
--- /dev/null
+++ b/tests/test-btoc32.c
@@ -0,0 +1,64 @@
+/* Test of conversion of unibyte character to 32-bit wide character.
+ Copyright (C) 2008-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 <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <br...@clisp.org>, 2008. */
+
+#include <config.h>
+
+#include <uchar.h>
+
+#include "signature.h"
+SIGNATURE_CHECK (btoc32, wint_t, (int));
+
+#include <locale.h>
+#include <stdio.h>
+#include <wchar.h>
+
+#include "macros.h"
+
+int
+main (int argc, char *argv[])
+{
+ int c;
+
+ /* configure should already have checked that the locale is supported. */
+ if (setlocale (LC_ALL, "") == NULL)
+ return 1;
+
+ ASSERT (btoc32 (EOF) == WEOF);
+
+ if (argc > 1)
+ switch (argv[1][0])
+ {
+ case '1':
+ /* Locale encoding is ISO-8859-1 or ISO-8859-15. */
+ for (c = 0; c < 0x80; c++)
+ ASSERT (btoc32 (c) == c);
+ for (c = 0xA0; c < 0x100; c++)
+ ASSERT (btoc32 (c) != WEOF);
+ return 0;
+
+ case '2':
+ /* Locale encoding is UTF-8. */
+ for (c = 0; c < 0x80; c++)
+ ASSERT (btoc32 (c) == c);
+ for (c = 0x80; c < 0x100; c++)
+ ASSERT (btoc32 (c) == WEOF);
+ return 0;
+ }
+
+ return 1;
+}
--
2.7.4
