Skip to content

utf8.h: Add UNICODE_IS_NONCHAR_GIVEN_NOT_SUPER #23735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2025
Merged

utf8.h: Add UNICODE_IS_NONCHAR_GIVEN_NOT_SUPER #23735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion regexec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11658,7 +11658,7 @@ Perl_is_grapheme(pTHX_ const U8 * strbeg, const U8 * s, const U8 * strend, const
PERL_ARGS_ASSERT_IS_GRAPHEME;

if ( UNLIKELY(UNICODE_IS_SUPER(cp))
|| UNLIKELY(UNICODE_IS_NONCHAR(cp)))
|| UNLIKELY(UNICODE_IS_NONCHAR_GIVEN_NOT_SUPER(cp)))
{
/* These are considered graphemes */
return true;
Expand Down
2 changes: 1 addition & 1 deletion utf8.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1937,7 +1937,7 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * const s0,
possible_problems |= UTF8_GOT_SUPER;
}
}
else if (UNLIKELY(UNICODE_IS_NONCHAR(uv))) {
else if (UNLIKELY(UNICODE_IS_NONCHAR_GIVEN_NOT_SUPER(uv))) {
if (flags & (UTF8_DISALLOW_NONCHAR|UTF8_WARN_NONCHAR)) {
possible_problems |= UTF8_GOT_NONCHAR;
}
Expand Down
8 changes: 5 additions & 3 deletions utf8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,11 +1112,13 @@ non-character code points
* the Unicode legal max */
#define UNICODE_IS_END_PLANE_NONCHAR_GIVEN_NOT_SUPER(uv) \
UNLIKELY(((UV) (uv) & 0xFFFE) == 0xFFFE)
#define UNICODE_IS_NONCHAR_GIVEN_NOT_SUPER(uv) \
( UNLIKELY(UNICODE_IS_32_CONTIGUOUS_NONCHARS(uv)) \
|| UNLIKELY(UNICODE_IS_END_PLANE_NONCHAR_GIVEN_NOT_SUPER(uv)))

#define UNICODE_IS_NONCHAR(uv) \
( UNLIKELY(UNICODE_IS_32_CONTIGUOUS_NONCHARS(uv)) \
|| ( UNLIKELY(UNICODE_IS_END_PLANE_NONCHAR_GIVEN_NOT_SUPER(uv)) \
&& LIKELY(! UNICODE_IS_SUPER(uv))))
( LIKELY(! UNICODE_IS_SUPER(uv)) \
&& UNLIKELY(UNICODE_IS_NONCHAR_GIVEN_NOT_SUPER(uv)))

/*
=for apidoc Am|bool|UTF8_IS_NONCHAR|const U8 *s|const U8 *e
Expand Down
Loading