Skip to content

Commit

Permalink
Fix compilation warnings about UTF8_\w+_PERL_EXTENDED
Browse files Browse the repository at this point in the history
Commit b66abe3 added these symbols to
two #defines, but neglected to remove the special casing that had been
used when it wasn't in them.
  • Loading branch information
khwilliamson committed Oct 9, 2024
1 parent 82c4939 commit 713aa00
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
20 changes: 8 additions & 12 deletions inline.h
Original file line number Diff line number Diff line change
Expand Up @@ -2075,8 +2075,7 @@ Perl_is_utf8_string_flags(const U8 *s, STRLEN len, const U32 flags)
const U8 * first_variant;

PERL_ARGS_ASSERT_IS_UTF8_STRING_FLAGS;
assert(0 == (flags & ~(UTF8_DISALLOW_ILLEGAL_INTERCHANGE
|UTF8_DISALLOW_PERL_EXTENDED)));
assert(0 == (flags & ~UTF8_DISALLOW_ILLEGAL_INTERCHANGE));

if (len == 0) {
len = strlen((const char *)s);
Expand All @@ -2086,13 +2085,13 @@ Perl_is_utf8_string_flags(const U8 *s, STRLEN len, const U32 flags)
return is_utf8_string(s, len);
}

if ((flags & ~UTF8_DISALLOW_PERL_EXTENDED)
if ((flags & UTF8_DISALLOW_ILLEGAL_INTERCHANGE)
== UTF8_DISALLOW_ILLEGAL_INTERCHANGE)
{
return is_strict_utf8_string(s, len);
}

if ((flags & ~UTF8_DISALLOW_PERL_EXTENDED)
if ((flags & UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE)
== UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE)
{
return is_c9strict_utf8_string(s, len);
Expand Down Expand Up @@ -2516,20 +2515,19 @@ Perl_is_utf8_string_loclen_flags(const U8 *s, STRLEN len, const U8 **ep, STRLEN
const U8 * first_variant;

PERL_ARGS_ASSERT_IS_UTF8_STRING_LOCLEN_FLAGS;
assert(0 == (flags & ~(UTF8_DISALLOW_ILLEGAL_INTERCHANGE
|UTF8_DISALLOW_PERL_EXTENDED)));
assert(0 == (flags & ~UTF8_DISALLOW_ILLEGAL_INTERCHANGE));

if (flags == 0) {
return is_utf8_string_loclen(s, len, ep, el);
}

if ((flags & ~UTF8_DISALLOW_PERL_EXTENDED)
if ((flags & UTF8_DISALLOW_ILLEGAL_INTERCHANGE)
== UTF8_DISALLOW_ILLEGAL_INTERCHANGE)
{
return is_strict_utf8_string_loclen(s, len, ep, el);
}

if ((flags & ~UTF8_DISALLOW_PERL_EXTENDED)
if ((flags & UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE)
== UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE)
{
return is_c9strict_utf8_string_loclen(s, len, ep, el);
Expand Down Expand Up @@ -2793,8 +2791,7 @@ PERL_STATIC_INLINE STRLEN
Perl_isUTF8_CHAR_flags(const U8 * const s0, const U8 * const e, const U32 flags)
{
PERL_ARGS_ASSERT_ISUTF8_CHAR_FLAGS;
assert(0 == (flags & ~(UTF8_DISALLOW_ILLEGAL_INTERCHANGE
|UTF8_DISALLOW_PERL_EXTENDED)));
assert(0 == (flags & ~UTF8_DISALLOW_ILLEGAL_INTERCHANGE));

PERL_IS_UTF8_CHAR_DFA(s0, e, PL_extended_utf8_dfa_tab,
goto check_success,
Expand Down Expand Up @@ -2874,8 +2871,7 @@ PERL_STATIC_INLINE bool
Perl_is_utf8_valid_partial_char_flags(const U8 * const s0, const U8 * const e, const U32 flags)
{
PERL_ARGS_ASSERT_IS_UTF8_VALID_PARTIAL_CHAR_FLAGS;
assert(0 == (flags & ~(UTF8_DISALLOW_ILLEGAL_INTERCHANGE
|UTF8_DISALLOW_PERL_EXTENDED)));
assert(0 == (flags & ~UTF8_DISALLOW_ILLEGAL_INTERCHANGE));

PERL_IS_UTF8_CHAR_DFA(s0, e, PL_extended_utf8_dfa_tab,
DFA_RETURN_FAILURE_,
Expand Down
3 changes: 1 addition & 2 deletions utf8.c
Original file line number Diff line number Diff line change
Expand Up @@ -769,8 +769,7 @@ Perl_is_utf8_char_helper_(const U8 * const s, const U8 * e, const U32 flags)
PERL_ARGS_ASSERT_IS_UTF8_CHAR_HELPER_;

assert(e > s);
assert(0 == (flags & ~(UTF8_DISALLOW_ILLEGAL_INTERCHANGE
|UTF8_DISALLOW_PERL_EXTENDED)));
assert(0 == (flags & ~UTF8_DISALLOW_ILLEGAL_INTERCHANGE));

full_len = UTF8SKIP(s);

Expand Down

0 comments on commit 713aa00

Please sign in to comment.