From 1f2a3bfd403bb3ead447946b09b5da7408fdf501 Mon Sep 17 00:00:00 2001 From: Mir Immad Date: Thu, 12 Mar 2026 19:32:28 +0530 Subject: [PATCH] [libc]: implement 'iswalnum' entrypoint (#185581) - Added entry points for `iswalnum` for the following platforms: - baremetal/arm - baremetal/riscv - dawin/aarch64 - linux/x86_64 - linux/arm - linux/aarch64 - linux/riscv - windows - Added a unit test for `iswalnum` part of #185136 --- libc/config/baremetal/arm/entrypoints.txt | 1 + libc/config/baremetal/riscv/entrypoints.txt | 1 + libc/config/darwin/aarch64/entrypoints.txt | 1 + libc/config/linux/aarch64/entrypoints.txt | 1 + libc/config/linux/arm/entrypoints.txt | 1 + libc/config/linux/riscv/entrypoints.txt | 1 + libc/config/linux/x86_64/entrypoints.txt | 1 + libc/config/windows/entrypoints.txt | 1 + libc/include/wctype.yaml | 6 ++++++ libc/src/wctype/CMakeLists.txt | 13 ++++++++++- libc/src/wctype/iswalnum.cpp | 20 +++++++++++++++++ libc/src/wctype/iswalnum.h | 20 +++++++++++++++++ libc/test/src/wctype/CMakeLists.txt | 10 +++++++++ libc/test/src/wctype/iswalnum_test.cpp | 24 +++++++++++++++++++++ 14 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 libc/src/wctype/iswalnum.cpp create mode 100644 libc/src/wctype/iswalnum.h create mode 100644 libc/test/src/wctype/iswalnum_test.cpp diff --git a/libc/config/baremetal/arm/entrypoints.txt b/libc/config/baremetal/arm/entrypoints.txt index f352e8df5259..7a7d78d28318 100644 --- a/libc/config/baremetal/arm/entrypoints.txt +++ b/libc/config/baremetal/arm/entrypoints.txt @@ -302,6 +302,7 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.wctype.iswgraph libc.src.wctype.iswcntrl libc.src.wctype.iswdigit + libc.src.wctype.iswalnum libc.src.wctype.iswlower libc.src.wctype.iswspace libc.src.wctype.iswblank diff --git a/libc/config/baremetal/riscv/entrypoints.txt b/libc/config/baremetal/riscv/entrypoints.txt index 6011b67975c6..73235b0a33b0 100644 --- a/libc/config/baremetal/riscv/entrypoints.txt +++ b/libc/config/baremetal/riscv/entrypoints.txt @@ -299,6 +299,7 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.wctype.iswgraph libc.src.wctype.iswcntrl libc.src.wctype.iswdigit + libc.src.wctype.iswalnum libc.src.wctype.iswlower libc.src.wctype.iswspace libc.src.wctype.iswblank diff --git a/libc/config/darwin/aarch64/entrypoints.txt b/libc/config/darwin/aarch64/entrypoints.txt index 7fe6d1b21dd8..04b2de76aa5b 100644 --- a/libc/config/darwin/aarch64/entrypoints.txt +++ b/libc/config/darwin/aarch64/entrypoints.txt @@ -105,6 +105,7 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.wctype.iswgraph libc.src.wctype.iswcntrl libc.src.wctype.iswdigit + libc.src.wctype.iswalnum libc.src.wctype.iswlower libc.src.wctype.iswspace libc.src.wctype.iswblank diff --git a/libc/config/linux/aarch64/entrypoints.txt b/libc/config/linux/aarch64/entrypoints.txt index 658015cbefae..1e8826b9498c 100644 --- a/libc/config/linux/aarch64/entrypoints.txt +++ b/libc/config/linux/aarch64/entrypoints.txt @@ -372,6 +372,7 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.wctype.iswgraph libc.src.wctype.iswcntrl libc.src.wctype.iswdigit + libc.src.wctype.iswalnum libc.src.wctype.iswlower libc.src.wctype.iswspace libc.src.wctype.iswblank diff --git a/libc/config/linux/arm/entrypoints.txt b/libc/config/linux/arm/entrypoints.txt index 92ffe7e8d0bd..e7764ad3c0a0 100644 --- a/libc/config/linux/arm/entrypoints.txt +++ b/libc/config/linux/arm/entrypoints.txt @@ -197,6 +197,7 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.wctype.iswgraph libc.src.wctype.iswcntrl libc.src.wctype.iswdigit + libc.src.wctype.iswalnum libc.src.wctype.iswlower libc.src.wctype.iswspace libc.src.wctype.iswblank diff --git a/libc/config/linux/riscv/entrypoints.txt b/libc/config/linux/riscv/entrypoints.txt index 689f7384776d..a202b41030bd 100644 --- a/libc/config/linux/riscv/entrypoints.txt +++ b/libc/config/linux/riscv/entrypoints.txt @@ -376,6 +376,7 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.wctype.iswgraph libc.src.wctype.iswcntrl libc.src.wctype.iswdigit + libc.src.wctype.iswalnum libc.src.wctype.iswlower libc.src.wctype.iswspace libc.src.wctype.iswblank diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt index 939b64797b7f..0c9f4aec0ae0 100644 --- a/libc/config/linux/x86_64/entrypoints.txt +++ b/libc/config/linux/x86_64/entrypoints.txt @@ -421,6 +421,7 @@ set(TARGET_LIBC_ENTRYPOINTS libc.src.wctype.iswgraph libc.src.wctype.iswcntrl libc.src.wctype.iswdigit + libc.src.wctype.iswalnum libc.src.wctype.iswlower libc.src.wctype.iswspace libc.src.wctype.iswblank diff --git a/libc/config/windows/entrypoints.txt b/libc/config/windows/entrypoints.txt index 28608e8c327d..accd2b9a1333 100644 --- a/libc/config/windows/entrypoints.txt +++ b/libc/config/windows/entrypoints.txt @@ -108,6 +108,7 @@ set(TARGET_LIBC_ENTRYPOINTS # wctype.h entrypoints libc.src.wctype.iswalpha + libc.src.wctype.iswalnum libc.src.wctype.iswgraph libc.src.wctype.iswcntrl libc.src.wctype.iswlower diff --git a/libc/include/wctype.yaml b/libc/include/wctype.yaml index b55288271ace..be01dd221537 100644 --- a/libc/include/wctype.yaml +++ b/libc/include/wctype.yaml @@ -44,3 +44,9 @@ functions: return_type: int arguments: - type: wint_t + - name: iswalnum + standards: + - stdc + return_type: int + arguments: + - type: wint_t diff --git a/libc/src/wctype/CMakeLists.txt b/libc/src/wctype/CMakeLists.txt index 7e40ef426906..47d87d620c02 100644 --- a/libc/src/wctype/CMakeLists.txt +++ b/libc/src/wctype/CMakeLists.txt @@ -26,7 +26,18 @@ add_entrypoint_object( HDRS iswdigit.h DEPENDS - libc.src.__support.wctype_utils + libc.src.__support.wctype_utils +) + +add_entrypoint_object( + iswalnum + SRCS + iswalnum.cpp + HDRS + iswalnum.h + DEPENDS + libc.src.__support.wctype_utils + libc.hdr.types.wint_t ) add_entrypoint_object( diff --git a/libc/src/wctype/iswalnum.cpp b/libc/src/wctype/iswalnum.cpp new file mode 100644 index 000000000000..a9ada6bd6548 --- /dev/null +++ b/libc/src/wctype/iswalnum.cpp @@ -0,0 +1,20 @@ +//===-- Implementation of iswalnum ----------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +/**/ +#include "src/wctype/iswalnum.h" +#include "src/__support/common.h" +#include "src/__support/wctype_utils.h" + +#include "hdr/types/wint_t.h" + +namespace LIBC_NAMESPACE_DECL { + +LLVM_LIBC_FUNCTION(int, iswalnum, (wint_t c)) { + return internal::isalnum(static_cast(c)); +} +} // namespace LIBC_NAMESPACE_DECL diff --git a/libc/src/wctype/iswalnum.h b/libc/src/wctype/iswalnum.h new file mode 100644 index 000000000000..0f98189c6b5b --- /dev/null +++ b/libc/src/wctype/iswalnum.h @@ -0,0 +1,20 @@ +//===-- Implementation header for iswalnum ----------------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_LIBC_SRC_WCTYPE_ISWALNUM_H +#define LLVM_LIBC_SRC_WCTYPE_ISWALNUM_H + +#include "hdr/types/wint_t.h" +#include "src/__support/common.h" + +namespace LIBC_NAMESPACE_DECL { + +int iswalnum(wint_t c); +} // namespace LIBC_NAMESPACE_DECL + +#endif // LLVM_LIBC_SRC_WCTYPE_ISWALNUM_H diff --git a/libc/test/src/wctype/CMakeLists.txt b/libc/test/src/wctype/CMakeLists.txt index 70ace3b22534..066ad7d79cdd 100644 --- a/libc/test/src/wctype/CMakeLists.txt +++ b/libc/test/src/wctype/CMakeLists.txt @@ -81,3 +81,13 @@ add_libc_test( DEPENDS libc.src.wctype.iswxdigit ) + +add_libc_test( + iswalnum_test + SUITE + libc_wctype_unittests + SRCS + iswalnum_test.cpp + DEPENDS + libc.src.wctype.iswalnum +) diff --git a/libc/test/src/wctype/iswalnum_test.cpp b/libc/test/src/wctype/iswalnum_test.cpp new file mode 100644 index 000000000000..f258da57f452 --- /dev/null +++ b/libc/test/src/wctype/iswalnum_test.cpp @@ -0,0 +1,24 @@ +//===-- Unittests for iswalnum --------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "src/wctype/iswalnum.h" +#include "test/UnitTest/Test.h" + +TEST(LlvmLibciswalnum, SimpleTest) { + EXPECT_NE(LIBC_NAMESPACE::iswalnum('A'), 0); + EXPECT_NE(LIBC_NAMESPACE::iswalnum('z'), 0); + EXPECT_NE(LIBC_NAMESPACE::iswalnum('0'), 0); + + EXPECT_EQ(LIBC_NAMESPACE::iswalnum(' '), 0); + EXPECT_EQ(LIBC_NAMESPACE::iswalnum('?'), 0); + EXPECT_EQ(LIBC_NAMESPACE::iswalnum('\0'), 0); + EXPECT_EQ(LIBC_NAMESPACE::iswalnum(-1), 0); + EXPECT_EQ(LIBC_NAMESPACE::iswalnum('a'), 1); + EXPECT_EQ(LIBC_NAMESPACE::iswalnum('Z'), 1); + EXPECT_EQ(LIBC_NAMESPACE::iswalnum('9'), 1); +}