toke.c: Use utf8_to-uv_or_die not utf8_to_uvchr_buf

khwilliamson · khwilliamson · commit 3f29e379937f · 2025-03-05T16:53:15.000-07:00
diff --git a/toke.c b/toke.c
@@ -2963,8 +2963,8 @@ Perl_get_and_check_backslash_N_name(pTHX_ const char* s,
         }
         else {
             if (! _invlist_contains_cp(PL_utf8_charname_begin,
-                                       utf8_to_uvchr_buf((U8 *) s,
-                                                         (U8 *) e,
+                                       utf8_to_uv_or_die((const U8 *) s,
+                                                         (const U8 *) e,
                                                          NULL)))
             {
                 goto bad_charname;
@@ -2991,8 +2991,8 @@ Perl_get_and_check_backslash_N_name(pTHX_ const char* s,
             }
             else {
                 if (! _invlist_contains_cp(PL_utf8_charname_continue,
-                                           utf8_to_uvchr_buf((U8 *) s,
-                                                             (U8 *) e,
+                                           utf8_to_uv_or_die((const U8 *) s,
+                                                             (const U8 *) e,
                                                              NULL)))
                 {
                     goto bad_charname;
@@ -11634,7 +11634,7 @@ Perl_scan_str(pTHX_ char *start, int keep_bracketed_quoted, int keep_delims, int
         delim_byte_len = 1;
     }
     else {
-        open_delim_code = utf8_to_uvchr_buf((U8*)s, (U8*)PL_bufend,
+        open_delim_code = utf8_to_uv_or_die((U8*)s, (U8*)PL_bufend,
                                             &delim_byte_len);
         if (UNLIKELY(! is_grapheme((U8 *) start,
                                    (U8 *) s,

Original file line number	Diff line number	Diff line change
`@@ -2963,8 +2963,8 @@ Perl_get_and_check_backslash_N_name(pTHX_ const char* s,`
`2963`	`2963`	`}`
`2964`	`2964`	`else {`
`2965`	`2965`	`if (! _invlist_contains_cp(PL_utf8_charname_begin,`
`2966`		`- utf8_to_uvchr_buf((U8 *) s,`
`2967`		`- (U8 *) e,`
	`2966`	`+ utf8_to_uv_or_die((const U8 *) s,`
	`2967`	`+ (const U8 *) e,`
`2968`	`2968`	`NULL)))`
`2969`	`2969`	`{`
`2970`	`2970`	`goto bad_charname;`
`@@ -2991,8 +2991,8 @@ Perl_get_and_check_backslash_N_name(pTHX_ const char* s,`
`2991`	`2991`	`}`
`2992`	`2992`	`else {`
`2993`	`2993`	`if (! _invlist_contains_cp(PL_utf8_charname_continue,`
`2994`		`- utf8_to_uvchr_buf((U8 *) s,`
`2995`		`- (U8 *) e,`
	`2994`	`+ utf8_to_uv_or_die((const U8 *) s,`
	`2995`	`+ (const U8 *) e,`
`2996`	`2996`	`NULL)))`
`2997`	`2997`	`{`
`2998`	`2998`	`goto bad_charname;`
`@@ -11634,7 +11634,7 @@ Perl_scan_str(pTHX_ char *start, int keep_bracketed_quoted, int keep_delims, int`
`11634`	`11634`	`delim_byte_len = 1;`
`11635`	`11635`	`}`
`11636`	`11636`	`else {`
`11637`		`- open_delim_code = utf8_to_uvchr_buf((U8)s, (U8)PL_bufend,`
	`11637`	`+ open_delim_code = utf8_to_uv_or_die((U8)s, (U8)PL_bufend,`
`11638`	`11638`	`&delim_byte_len);`
`11639`	`11639`	`if (UNLIKELY(! is_grapheme((U8 *) start,`
`11640`	`11640`	`(U8 *) s,`