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

regcomp_study: Convert to preferred utf8_to_uv() #22837

Draft
wants to merge 1 commit into
base: blead
Choose a base branch
from
Draft

regcomp_study: Convert to preferred utf8_to_uv() #22837

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
5 changes: 3 additions & 2 deletions regcomp_study.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ S_make_exactf_invlist(pTHX_ RExC_state_t *pRExC_state, regnode *node)
const U8* e = s + bytelen;
IV fc;

fc = uc = utf8_to_uvchr_buf(s, s + bytelen, NULL);
utf8_to_uv(s, e, &uc, NULL);
fc = uc;

/* The only code points that aren't folded in a UTF EXACTFish
* node are the problematic ones in EXACTFL nodes */
Expand Down Expand Up @@ -2248,7 +2249,7 @@ Perl_study_chunk(pTHX_
assert(bytelen);
if (UTF) {
const U8 * const s = (U8*)STRING(scan);
uc = utf8_to_uvchr_buf(s, s + bytelen, NULL);
utf8_to_uv(s, s + bytelen, &uc, NULL);
charlen = utf8_length(s, s + bytelen);
} else {
uc = *((U8*)STRING(scan));
Expand Down
Loading