Skip to content
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

_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG: Use utf8_to_uv #22828

Open
wants to merge 2 commits into
base: blead
Choose a base branch
from
Open

_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG: Use utf8_to_uv #22828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c362135
_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG: Use utf8_to_uv
khwilliamson Dec 5, 2024
0ddc1bd
Convert leading underscore to trailing in internal global macro
khwilliamson Dec 5, 2024
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
16 changes: 7 additions & 9 deletions perl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7545,7 +7545,7 @@ the plain locale pragma without a parameter (S<C<use locale>>) is in effect.
* and will do so if enabled. The first takes a single code point
* argument; the 2nd, is a pointer to the first byte of the UTF-8 encoded
* string, and an end position which it won't try to read past */
# define _CHECK_AND_OUTPUT_WIDE_LOCALE_CP_MSG(cp) \
# define CHECK_AND_OUTPUT_WIDE_LOCALE_CP_MSG_(cp) \
STMT_START { \
if (! IN_UTF8_CTYPE_LOCALE && ckWARN(WARN_LOCALE)) { \
Perl_warner(aTHX_ packWARN(WARN_LOCALE), \
Expand All @@ -7554,16 +7554,14 @@ the plain locale pragma without a parameter (S<C<use locale>>) is in effect.
} \
} STMT_END

# define _CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(s, send) \
# define CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG_(s, send) \
STMT_START { /* Check if to warn before doing the conversion work */\
if (! IN_UTF8_CTYPE_LOCALE && ckWARN(WARN_LOCALE)) { \
UV cp = utf8_to_uvchr_buf((U8 *) (s), (U8 *) (send), NULL); \
UV cp; \
utf8_to_uv((U8 *) (s), (U8 *) (send), &cp, NULL); \
Perl_warner(aTHX_ packWARN(WARN_LOCALE), \
"Wide character (U+%" UVXf ") in %s", \
(cp == 0) \
? UNICODE_REPLACEMENT \
: (UV) cp, \
OP_DESC(PL_op)); \
cp, OP_DESC(PL_op)); \
} \
} STMT_END

Expand All @@ -7583,8 +7581,8 @@ the plain locale pragma without a parameter (S<C<use locale>>) is in effect.
# define IN_LC_RUNTIME(category) 0
# define IN_LC(category) 0
# define CHECK_AND_WARN_PROBLEMATIC_LOCALE_
# define _CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(s, send)
# define _CHECK_AND_OUTPUT_WIDE_LOCALE_CP_MSG(c)
# define CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG_(s, send)
# define CHECK_AND_OUTPUT_WIDE_LOCALE_CP_MSG_(c)
#endif

#define locale_panic_via_(m, f, l) Perl_locale_panic((m), __LINE__, f, l)
Expand Down
16 changes: 8 additions & 8 deletions regexec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ S_isFOO_utf8_lc(pTHX_ const U8 classnum, const U8* character, const U8* e)
EIGHT_BIT_UTF8_TO_NATIVE(*character, *(character + 1)));
}

_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(character, e);
CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG_(character, e);

switch ((char_class_number_) classnum) {
case CC_ENUM_SPACE_: return is_XPERLSPACE_high(character);
Expand Down Expand Up @@ -1807,7 +1807,7 @@ STMT_START {
case trie_flu8: \
CHECK_AND_WARN_PROBLEMATIC_LOCALE_; \
if (UTF8_IS_ABOVE_LATIN1(*uc)) { \
_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(uc, uc_end); \
CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG_(uc, uc_end); \
} \
goto do_trie_utf8_fold; \
case trie_utf8_exactfa_fold: \
Expand Down Expand Up @@ -1853,7 +1853,7 @@ STMT_START {
case trie_utf8l: \
CHECK_AND_WARN_PROBLEMATIC_LOCALE_; \
if (utf8_target && UTF8_IS_ABOVE_LATIN1(*uc)) { \
_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(uc, uc_end); \
CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG_(uc, uc_end); \
} \
/* FALLTHROUGH */ \
case trie_utf8: \
Expand Down Expand Up @@ -6730,7 +6730,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
/* We only output for EXACTL, as we let the folder
* output this message for EXACTFLU8 to avoid
* duplication */
_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(locinput,
CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG_(locinput,
reginfo->strend);
}
}
Expand Down Expand Up @@ -7054,7 +7054,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
* just to check for this warning is worth it. So this just checks
* the first character */
if (utf8_target && UTF8_IS_ABOVE_LATIN1(*locinput)) {
_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(locinput, reginfo->strend);
CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG_(locinput, reginfo->strend);
}
goto do_exact;
case EXACT_REQ8:
Expand Down Expand Up @@ -7740,7 +7740,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)

if (! UTF8_IS_NEXT_CHAR_DOWNGRADEABLE(locinput, reginfo->strend)) {
/* An above Latin-1 code point, or malformed */
_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(locinput,
CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG_(locinput,
reginfo->strend);
goto utf8_posix_above_latin1;
}
Expand Down Expand Up @@ -10305,7 +10305,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p,

case EXACTL_t8:
if (UTF8_IS_ABOVE_LATIN1(*scan)) {
_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(scan, loceol);
CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG_(scan, loceol);
}
/* FALLTHROUGH */

Expand Down Expand Up @@ -10926,7 +10926,7 @@ S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8* const
&& (OP(n) == ANYOFL || OP(n) == ANYOFPOSIXL)
&& ! (flags & ANYOFL_UTF8_LOCALE_REQD))
{
_CHECK_AND_OUTPUT_WIDE_LOCALE_CP_MSG(c);
CHECK_AND_OUTPUT_WIDE_LOCALE_CP_MSG_(c);
}
}

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 @@ -4152,7 +4152,7 @@ S_check_locale_boundary_crossing(pTHX_ const U8* const p, const UV result,
}

/* Here, no characters crossed, result is ok as-is, but we warn. */
_CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(p, p + UTF8SKIP(p));
CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG_(p, p + UTF8SKIP(p));
return result;
}

Expand Down
Loading