]> Savannah Git Hosting - gnulib.git/commitdiff
c32_apply_type_test: New module.
authorBruno Haible <bruno@clisp.org>
Wed, 12 Jul 2023 22:50:29 +0000 (00:50 +0200)
committerBruno Haible <bruno@clisp.org>
Wed, 12 Jul 2023 22:50:29 +0000 (00:50 +0200)
* lib/uchar.in.h (c32_apply_type_test): New declaration.
* lib/c32_apply_type_test.c: New file.
* m4/uchar_h.m4 (gl_UCHAR_H_REQUIRE_DEFAULTS): Initialize
GNULIB_C32_APPLY_TYPE_TEST.
* modules/uchar (Makefile.am): Substitute GNULIB_C32_APPLY_TYPE_TEST.
* modules/c32_apply_type_test: New file.

ChangeLog
lib/c32_apply_type_test.c [new file with mode: 0644]
lib/uchar.in.h
m4/uchar_h.m4
modules/c32_apply_type_test [new file with mode: 0644]
modules/uchar

index 8327925de9797146d0acdcb1e31381646a84c56a..2c3feef5ee2426b46ba1b58bbf6922ce12777256 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2023-07-12  Bruno Haible  <bruno@clisp.org>
 
+       c32_apply_type_test: New module.
+       * lib/uchar.in.h (c32_apply_type_test): New declaration.
+       * lib/c32_apply_type_test.c: New file.
+       * m4/uchar_h.m4 (gl_UCHAR_H_REQUIRE_DEFAULTS): Initialize
+       GNULIB_C32_APPLY_TYPE_TEST.
+       * modules/uchar (Makefile.am): Substitute GNULIB_C32_APPLY_TYPE_TEST.
+       * modules/c32_apply_type_test: New file.
+
        c32_get_type_test: Add tests.
        * tests/test-c32_get_type_test.c: New file.
        * modules/c32_get_type_test-tests: New file.
diff --git a/lib/c32_apply_type_test.c b/lib/c32_apply_type_test.c
new file mode 100644 (file)
index 0000000..f5a844e
--- /dev/null
@@ -0,0 +1,39 @@
+/* Apply a 32-bit wide character property test.
+   Copyright (C) 2011-2023 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file 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 Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2023.  */
+
+#include <config.h>
+
+#define IN_C32_APPLY_TYPE_TEST
+/* Specification.  */
+#include <uchar.h>
+
+#include <string.h>
+#include <wctype.h>
+
+#if _GL_WCHAR_T_IS_UCS4
+_GL_EXTERN_INLINE
+#endif
+int
+c32_apply_type_test (wint_t wc, c32_type_test_t property)
+{
+#if _GL_WCHAR_T_IS_UCS4
+  return iswctype (wc, property);
+#else
+  return property (wc);
+#endif
+}
index 72ec182308f370476e22ca434e9158310b25c15e..edb6a751fd3b05aa78bda997c249845c15d9e7cf 100644 (file)
@@ -669,7 +669,7 @@ _GL_CXXALIASWARN (mbstoc32s);
 #endif
 
 
-#if @GNULIB_C32_GET_TYPE_TEST@
+#if @GNULIB_C32_GET_TYPE_TEST@ || @GNULIB_C32_APPLY_TYPE_TEST@
 /* A scalar type.  Instances of this type, other than (c32_type_test_t) 0,
    represent a character property, sometimes also viewed as a "character class".
    It can be applied to 32-bit wide characters.  It is the counterpart of
@@ -704,6 +704,30 @@ _GL_CXXALIAS_SYS (c32_get_type_test, c32_type_test_t, (const char *name));
 _GL_CXXALIASWARN (c32_get_type_test);
 #endif
 
+/* Test whether a given 32-bit wide character has the specified character
+   property.
+   Return non-zero if true, zero if false or if the argument is WEOF.
+   This function is the counterpart of function 'iswctype' for wide characters.
+ */
+#if @GNULIB_C32_APPLY_TYPE_TEST@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32_APPLY_TYPE_TEST
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) int
+c32_apply_type_test (wint_t wc, c32_type_test_t property)
+{
+  return iswctype (wc, property);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32_apply_type_test, int,
+                  (wint_t wc, c32_type_test_t property)
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32_apply_type_test, int,
+                  (wint_t wc, c32_type_test_t property));
+_GL_CXXALIASWARN (c32_apply_type_test);
+#endif
+
 
 _GL_INLINE_HEADER_END
 
index 0fdaf47dbc7f9eae93455c32872e56d744a06902..2bc52480d192abff5f106abe48051020250147e6 100644 (file)
@@ -1,4 +1,4 @@
-# uchar_h.m4 serial 28
+# uchar_h.m4 serial 29
 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -223,6 +223,7 @@ AC_DEFUN([gl_UCHAR_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32STOMBS])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SWIDTH])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32TOB])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32_APPLY_TYPE_TEST])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32_GET_TYPE_TEST])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOC16])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOC32])
diff --git a/modules/c32_apply_type_test b/modules/c32_apply_type_test
new file mode 100644 (file)
index 0000000..3477413
--- /dev/null
@@ -0,0 +1,25 @@
+Description:
+c32_apply_type_test() function: test whether a 32-bit wide character has
+a given property.
+
+Files:
+lib/c32_apply_type_test.c
+
+Depends-on:
+uchar
+iswctype
+
+configure.ac:
+gl_UCHAR_MODULE_INDICATOR([c32_apply_type_test])
+
+Makefile.am:
+lib_SOURCES += c32_apply_type_test.c
+
+Include:
+<uchar.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
index 6c52c7d3f3bfc4ccee770e938e1e602fbb4dd1ed..1f42c6a08c851a193129c485bea46927952fca14 100644 (file)
@@ -60,6 +60,7 @@ uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H)
              -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_TYPE_TEST''@/$(GNULIB_C32_APPLY_TYPE_TEST)/g' \
              -e 's/@''GNULIB_C32_GET_TYPE_TEST''@/$(GNULIB_C32_GET_TYPE_TEST)/g' \
              -e 's/@''GNULIB_MBRTOC16''@/$(GNULIB_MBRTOC16)/g' \
              -e 's/@''GNULIB_MBRTOC32''@/$(GNULIB_MBRTOC32)/g' \