Skip to content

regcomp(_internal)?.c: Avoid some casts in prints #23728

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 2 commits into from
Oct 6, 2025
Merged

regcomp(_internal)?.c: Avoid some casts in prints #23728

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
bc7848f
regcomp(_internal).c: Avoid some casts in prints
khwilliamson Jul 1, 2022
92f0b7a
regcomp.c: Code points can be UV; not just IV
khwilliamson Oct 5, 2025
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
48 changes: 22 additions & 26 deletions regcomp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,7 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,

DEBUG_PARSE_r({
Perl_re_printf( aTHX_
"Required size %" IVdf " nodes\n", (IV)RExC_size);
"Required size %zd nodes\n", RExC_size);
RExC_lastnum = 0;
RExC_lastparse = NULL;
});
Expand Down Expand Up @@ -2095,13 +2095,11 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
/* search for "restudy" in this file for a detailed explanation */
DEBUG_PARSE_r(
if (!restudied)
Perl_re_printf( aTHX_ "first at %" IVdf "\n",
(IV)(first - scan + 1))
Perl_re_printf( aTHX_ "first at %td\n", first - scan + 1)
);
#else
DEBUG_PARSE_r(
Perl_re_printf( aTHX_ "first at %" IVdf "\n",
(IV)(first - scan + 1))
Perl_re_printf( aTHX_ "first at %td\n", first - scan + 1)
);
#endif

Expand Down Expand Up @@ -2325,8 +2323,8 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
/* Guard against an embedded (?=) or (?<=) with a longer minlen than
the "real" pattern. */
DEBUG_OPTIMISE_r({
Perl_re_printf( aTHX_ "minlen: %" IVdf " RExC_rx->minlen:%" IVdf " maxlen:%" IVdf "\n",
(IV)minlen, (IV)RExC_rx->minlen, (IV)RExC_maxlen);
Perl_re_printf( aTHX_ "minlen: %zd RExC_rx->minlen:%zd maxlen:%zd\n",
minlen, RExC_rx->minlen, RExC_maxlen);
});
RExC_rx->minlenret = minlen;
if (RExC_rx->minlen < minlen)
Expand Down Expand Up @@ -4386,12 +4384,12 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth)
DEBUG_PARSE_MSG("lsbr");
regprop(RExC_rx, RExC_mysv1, REGNODE_p(lastbr), NULL, pRExC_state);
regprop(RExC_rx, RExC_mysv2, REGNODE_p(ender), NULL, pRExC_state);
Perl_re_printf( aTHX_ "~ tying lastbr %s (%" IVdf ") to ender %s (%" IVdf ") offset %" IVdf "\n",
Perl_re_printf( aTHX_ "~ tying lastbr %s (%zd) to ender %s (%zd) offset %zd\n",
SvPV_nolen_const(RExC_mysv1),
(IV)lastbr,
lastbr,
SvPV_nolen_const(RExC_mysv2),
(IV)ender,
(IV)(ender - lastbr)
ender,
(ender - lastbr)
);
});
if (OP(REGNODE_p(lastbr)) == BRANCH) {
Expand Down Expand Up @@ -4450,12 +4448,12 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth)
NULL, pRExC_state);
regprop(RExC_rx, RExC_mysv2, REGNODE_p(ender),
NULL, pRExC_state);
Perl_re_printf( aTHX_ "~ converting ret %s (%" IVdf ") to ender %s (%" IVdf ") offset %" IVdf "\n",
Perl_re_printf( aTHX_ "~ converting ret %s (%" IVdf ") to ender %s (%zd) offset %zd\n",
SvPV_nolen_const(RExC_mysv1),
(IV)REG_NODE_NUM(ret_as_regnode),
SvPV_nolen_const(RExC_mysv2),
(IV)ender,
(IV)(ender - ret)
ender,
(ender - ret)
);
});
OP(br)= NOTHING;
Expand Down Expand Up @@ -7437,8 +7435,8 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
if (need_to_fold_loc) {
upper_fill = loc_correspondence[s - s_start];
if (upper_fill == 0) {
FAIL2("panic: loc_correspondence[%d] is 0",
(int) (s - s_start));
FAIL2("panic: loc_correspondence[%td] is 0",
(s - s_start));
}
Safefree(locfold_buf);
Safefree(loc_correspondence);
Expand Down Expand Up @@ -13149,10 +13147,10 @@ S_regtail_study(pTHX_ RExC_state_t *pRExC_state, regnode_offset p,
DEBUG_PARSE_MSG("");
regprop(RExC_rx, RExC_mysv, REGNODE_p(val), NULL, pRExC_state);
Perl_re_printf( aTHX_
"~ attach to %s (%" IVdf ") offset to %" IVdf "\n",
"~ attach to %s (%zd) offset to %zd\n",
SvPV_nolen_const(RExC_mysv),
(IV)val,
(IV)(val - scan)
val,
(val - scan)
);
});
if (REGNODE_OFF_BY_ARG(OP(REGNODE_p(scan)))) {
Expand Down Expand Up @@ -13915,7 +13913,7 @@ Perl_save_re_context(pTHX)
for (i = 1; i <= nparens; i++) {
char digits[TYPE_CHARS(long)];
const STRLEN len = my_snprintf(digits, sizeof(digits),
"%lu", (long)i);
"%" I32df, i);
GV *const *const gvp
= (GV**)hv_fetch(PL_defstash, digits, len, 0);

Expand All @@ -13927,7 +13925,6 @@ Perl_save_re_context(pTHX)
}
}
#endif

#ifndef PERL_IN_XSUB_RE

# include "uni_keywords.h"
Expand Down Expand Up @@ -16331,7 +16328,7 @@ S_handle_names_wildcard(pTHX_ const char * wname, /* wildcard name to match */
* were returned to us in the array 'algorithmic_names' from data in
* lib/unicore/Name.pm. 'code_point' in the name is expressed in hex. */
for (i = 0; i <= av_top_index((AV *) algorithmic_names); i++) {
IV j;
UV j;

/* Each element of the array is a hash, giving the details for the
* series of names it covers. There is the base name of the characters
Expand All @@ -16340,8 +16337,8 @@ S_handle_names_wildcard(pTHX_ const char * wname, /* wildcard name to match */
* characters that could possibly be in a name in this series. */
HV * this_series = (HV *) SvRV(* av_fetch((AV *) algorithmic_names, i, 0));
SV * prefix = * hv_fetchs(this_series, "name", 0);
IV low = SvIV(* hv_fetchs(this_series, "low", 0));
IV high = SvIV(* hv_fetchs(this_series, "high", 0));
UV low = SvUV(* hv_fetchs(this_series, "low", 0));
UV high = SvUV(* hv_fetchs(this_series, "high", 0));
char * legal = SvPVX(* hv_fetchs(this_series, "legal", 0));

/* Pre-allocate an SV with enough space */
Expand All @@ -16362,8 +16359,7 @@ S_handle_names_wildcard(pTHX_ const char * wname, /* wildcard name to match */
for (j = low; j <= high; j++) { /* For each code point in the series */

/* Get its name, and see if it matches the subpattern */
sv_setpvf(algo_name, "%s-%X", SvPVX(prefix),
(unsigned) j);
sv_setpvf(algo_name, "%s-%" UVXf, SvPVX(prefix), j);

if (execute_wildcard(subpattern_re,
SvPVX(algo_name),
Expand Down
6 changes: 3 additions & 3 deletions regcomp_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,10 +864,10 @@ static const scan_data_t zero_scan_data = {
? eI - sI /* Length before the <--HERE */ \
: ((xI_offset(xC) >= 0) \
? xI_offset(xC) \
: (croak("panic: %s: %d: negative offset: %" \
IVdf " trying to output message for " \
: (croak("panic: %s: %d: negative offset: " \
" %td trying to output message for " \
" pattern %.*s", \
__FILE__, __LINE__, (IV) xI_offset(xC), \
__FILE__, __LINE__, xI_offset(xC), \
((int) (eC - sC)), sC), 0)), \
sI), /* The input pattern printed up to the <--HERE */ \
UTF8fARG(UTF, \
Expand Down
Loading