Change #define Perl_foo Perl_bar" to plain "foo bar"

khwilliamson · khwilliamson · commit 6277a14c3a20 · 2025-07-19T08:00:27.000-06:00
This reverts to the naming that prevailed until 5.41: #define foo bar The Perl_ prefixes were introduced in expectation that a scheme would be used to allow a bunch of functions to be converted to macros. This actually didn't work, so was reverted by GH #23209. However those #define changes didn't need to be reverted, so weren't A revised scheme is now being introduced in the next commit, which needs the original #define forms. So this commit reverts back to those.
diff --git a/embed.h b/embed.h
@@ -160,7 +160,7 @@
 # define bytes_to_utf8(a,b)                     Perl_bytes_to_utf8(aTHX_ a,b)
 # define bytes_to_utf8_free_me(a,b,c)           Perl_bytes_to_utf8_free_me(aTHX_ a,b,c)
 # define bytes_to_utf8_temp_pv(a,b)             Perl_bytes_to_utf8_temp_pv(aTHX_ a,b)
-# define c9strict_utf8_to_uv                    Perl_c9strict_utf8_to_uv
+# define Perl_c9strict_utf8_to_uv               c9strict_utf8_to_uv
 # define call_argv(a,b,c)                       Perl_call_argv(aTHX_ a,b,c)
 # define call_atexit(a,b)                       Perl_call_atexit(aTHX_ a,b)
 # define call_list(a,b)                         Perl_call_list(aTHX_ a,b)
@@ -225,7 +225,7 @@
 # define dump_vindent(a,b,c,d)                  Perl_dump_vindent(aTHX_ a,b,c,d)
 # define eval_pv(a,b)                           Perl_eval_pv(aTHX_ a,b)
 # define eval_sv(a,b)                           Perl_eval_sv(aTHX_ a,b)
-# define extended_utf8_to_uv                    Perl_extended_utf8_to_uv
+# define Perl_extended_utf8_to_uv               extended_utf8_to_uv
 # define fbm_compile(a,b)                       Perl_fbm_compile(aTHX_ a,b)
 # define fbm_instr(a,b,c,d)                     Perl_fbm_instr(aTHX_ a,b,c,d)
 # define filter_add(a,b)                        Perl_filter_add(aTHX_ a,b)
@@ -312,7 +312,7 @@
 # define init_i18nl10n(a)                       Perl_init_i18nl10n(aTHX_ a)
 # define init_stacks()                          Perl_init_stacks(aTHX)
 # define init_tm(a)                             Perl_init_tm(aTHX_ a)
-# define instr                                  Perl_instr
+# define Perl_instr                             instr
 # define intro_my()                             Perl_intro_my(aTHX)
 # define isC9_STRICT_UTF8_CHAR                  Perl_isC9_STRICT_UTF8_CHAR
 # define isSTRICT_UTF8_CHAR                     Perl_isSTRICT_UTF8_CHAR
@@ -328,7 +328,7 @@
 # define is_utf8_fixed_width_buf_loclen_flags   Perl_is_utf8_fixed_width_buf_loclen_flags
 # define is_utf8_invariant_string_loc           Perl_is_utf8_invariant_string_loc
 # define is_utf8_string_flags                   Perl_is_utf8_string_flags
-# define is_utf8_string_loc                     Perl_is_utf8_string_loc
+# define Perl_is_utf8_string_loc                is_utf8_string_loc
 # define is_utf8_string_loclen                  Perl_is_utf8_string_loclen
 # define is_utf8_string_loclen_flags            Perl_is_utf8_string_loclen_flags
 # define is_utf8_valid_partial_char_flags       Perl_is_utf8_valid_partial_char_flags
@@ -651,7 +651,7 @@
 # define stack_grow(a,b,c)                      Perl_stack_grow(aTHX_ a,b,c)
 # define start_subparse(a,b)                    Perl_start_subparse(aTHX_ a,b)
 # define str_to_version(a)                      Perl_str_to_version(aTHX_ a)
-# define strict_utf8_to_uv                      Perl_strict_utf8_to_uv
+# define Perl_strict_utf8_to_uv                 strict_utf8_to_uv
 # define suspend_compcv(a)                      Perl_suspend_compcv(aTHX_ a)
 # define sv_2bool_flags(a,b)                    Perl_sv_2bool_flags(aTHX_ a,b)
 # define sv_2cv(a,b,c,d)                        Perl_sv_2cv(aTHX_ a,b,c,d)
@@ -802,26 +802,26 @@
 # define upg_version(a,b)                       Perl_upg_version(aTHX_ a,b)
 # define utf8_distance(a,b)                     Perl_utf8_distance(aTHX_ a,b)
 # define utf8_hop                               Perl_utf8_hop
-# define utf8_hop_back                          Perl_utf8_hop_back
+# define Perl_utf8_hop_back                     utf8_hop_back
 # define utf8_hop_back_overshoot                Perl_utf8_hop_back_overshoot
-# define utf8_hop_forward                       Perl_utf8_hop_forward
+# define Perl_utf8_hop_forward                  utf8_hop_forward
 # define utf8_hop_forward_overshoot             Perl_utf8_hop_forward_overshoot
 # define utf8_hop_overshoot                     Perl_utf8_hop_overshoot
-# define utf8_hop_safe                          Perl_utf8_hop_safe
+# define Perl_utf8_hop_safe                     utf8_hop_safe
 # define utf8_length(a,b)                       Perl_utf8_length(aTHX_ a,b)
 # define utf8_to_bytes(a,b)                     Perl_utf8_to_bytes(aTHX_ a,b)
 # define utf8_to_bytes_(a,b,c,d)                Perl_utf8_to_bytes_(aTHX_ a,b,c,d)
 # define utf8_to_bytes_new_pv(a,b,c)            Perl_utf8_to_bytes_new_pv(aTHX_ a,b,c)
 # define utf8_to_bytes_overwrite(a,b)           Perl_utf8_to_bytes_overwrite(aTHX_ a,b)
 # define utf8_to_bytes_temp_pv(a,b)             Perl_utf8_to_bytes_temp_pv(aTHX_ a,b)
-# define utf8_to_uv                             Perl_utf8_to_uv
-# define utf8_to_uv_errors                      Perl_utf8_to_uv_errors
-# define utf8_to_uv_flags                       Perl_utf8_to_uv_flags
+# define Perl_utf8_to_uv                        utf8_to_uv
+# define Perl_utf8_to_uv_errors                 utf8_to_uv_errors
+# define Perl_utf8_to_uv_flags                  utf8_to_uv_flags
 # define utf8_to_uv_msgs                        Perl_utf8_to_uv_msgs
 # define utf8_to_uv_msgs_helper_                Perl_utf8_to_uv_msgs_helper_
 # define utf8_to_uv_or_die                      Perl_utf8_to_uv_or_die
-# define utf8n_to_uvchr                         Perl_utf8n_to_uvchr
-# define utf8n_to_uvchr_error                   Perl_utf8n_to_uvchr_error
+# define Perl_utf8n_to_uvchr                    utf8n_to_uvchr
+# define Perl_utf8n_to_uvchr_error              utf8n_to_uvchr_error
 # define utf8n_to_uvchr_msgs                    Perl_utf8n_to_uvchr_msgs
 # define uv_to_utf8(a,b)                        Perl_uv_to_utf8(aTHX_ a,b)
 # define uv_to_utf8_flags(a,b,c)                Perl_uv_to_utf8_flags(aTHX_ a,b,c)
diff --git a/inline.h b/inline.h
@@ -2180,8 +2180,8 @@ Perl_is_utf8_string_flags(const U8 *s, STRLEN len, const U32 flags)
     return TRUE;
 }
 
-#define Perl_is_utf8_string_loc(s, len, ep)          \
-        Perl_is_utf8_string_loclen(s, len, ep, 0)
+#define is_utf8_string_loc(s, len, ep)          \
+        is_utf8_string_loclen(s, len, ep, 0)
 
 PERL_STATIC_INLINE bool
 Perl_is_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el)
@@ -2759,8 +2759,8 @@ unchanged.
 
 =cut
 */
-# define Perl_utf8_hop_forward(          s, off, end)           \
-         Perl_utf8_hop_forward_overshoot(s, off, end, NULL)
+# define utf8_hop_forward(          s, off, end)           \
+         utf8_hop_forward_overshoot(s, off, end, NULL)
 
 PERL_STATIC_INLINE U8 *
 Perl_utf8_hop_forward_overshoot(const U8 * s, SSize_t off,
@@ -2845,8 +2845,8 @@ displaced.
 =cut
 */
 
-# define Perl_utf8_hop_back(          s, off, start)            \
-         Perl_utf8_hop_back_overshoot(s, off, start, NULL)
+# define utf8_hop_back(          s, off, start)            \
+         utf8_hop_back_overshoot(s, off, start, NULL)
 
 PERL_STATIC_INLINE U8 *
 Perl_utf8_hop_back_overshoot(const U8 *s, SSize_t off,
@@ -2912,7 +2912,7 @@ the excess count is the absolute value of C<remaining>.
 =cut
 */
 
-#define Perl_utf8_hop_safe(s, o, b, e)  Perl_utf8_hop_overshoot(s, o, b, e, 0)
+#define utf8_hop_safe(s, o, b, e)  utf8_hop_overshoot(s, o, b, e, 0)
 
 PERL_STATIC_INLINE U8 *
 Perl_utf8_hop_overshoot(const U8 *s, SSize_t off,
diff --git a/regen/embed.pl b/regen/embed.pl
@@ -514,7 +514,7 @@ sub embed_h {
         if ($flags =~ /m/ && $flags =~ /p/) {
             my $full_name = full_name($func, $flags);
             next if $full_name eq $func;    # Don't output a no-op.
-            $ret = indent_define($func, $full_name, $ind);
+            $ret = indent_define($full_name, $func, $ind);
         }
         elsif ($flags !~ /[omM]/) {
             my $argc = scalar @$args;
diff --git a/utf8.h b/utf8.h
@@ -145,34 +145,34 @@ typedef enum {
 #define uvchr_to_utf8                   uv_to_utf8
 #define uvchr_to_utf8_flags             uv_to_utf8_flags
 #define uvchr_to_utf8_flags_msgs        uv_to_utf8_msgs
-#define Perl_uvchr_to_utf8              Perl_uv_to_utf8
-#define Perl_uvchr_to_utf8_flags        Perl_uv_to_utf8_flags
-#define Perl_uvchr_to_utf8_flags_msgs   Perl_uv_to_utf8_msgs
+#define uvchr_to_utf8              uv_to_utf8
+#define uvchr_to_utf8_flags        uv_to_utf8_flags
+#define uvchr_to_utf8_flags_msgs   uv_to_utf8_msgs
 
 /* This is needed to cast the parameters for all those calls that had them
  * improperly as chars */
-#define utf8_to_uvchr_buf(s, e, lenp)                                          \
+#define utf8_to_uvchr_buf(s, e, lenp)                                   \
     Perl_utf8_to_uvchr_buf(aTHX_ (const U8 *) (s), (const U8 *) e, lenp)
 
-#define Perl_utf8n_to_uvchr(s, len, lenp, flags)                               \
-                          Perl_utf8n_to_uvchr_error(s, len, lenp, flags, 0)
-#define Perl_utf8n_to_uvchr_error(s, len, lenp, flags, errors)                 \
-                    Perl_utf8n_to_uvchr_msgs(s, len, lenp, flags, errors, 0)
-
-#define Perl_utf8_to_uv(         s, e, cp_p, advance_p)                     \
-        Perl_utf8_to_uv_flags(   s, e, cp_p, advance_p, 0)
-#define Perl_utf8_to_uv_flags(   s, e, cp_p, advance_p, flags)              \
-        Perl_utf8_to_uv_errors(  s, e, cp_p, advance_p, flags, 0)
-#define Perl_utf8_to_uv_errors(  s, e, cp_p, advance_p, flags, errors)      \
-          Perl_utf8_to_uv_msgs(  s, e, cp_p, advance_p, flags, errors, 0)
-#define Perl_extended_utf8_to_uv(s, e, cp_p, advance_p)                     \
-                 Perl_utf8_to_uv(s, e, cp_p, advance_p)
-#define Perl_strict_utf8_to_uv(  s, e, cp_p, advance_p)                     \
-        Perl_utf8_to_uv_flags(   s, e, cp_p, advance_p,                     \
-                                        UTF8_DISALLOW_ILLEGAL_INTERCHANGE)
-#define Perl_c9strict_utf8_to_uv(s, e, cp_p, advance_p)                     \
-        Perl_utf8_to_uv_flags(   s, e, cp_p, advance_p,                     \
-                                     UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE)
+#define utf8n_to_uvchr(s, len, lenp, flags)                             \
+                          utf8n_to_uvchr_error(s, len, lenp, flags, 0)
+#define utf8n_to_uvchr_error(s, len, lenp, flags, errors)               \
+                    utf8n_to_uvchr_msgs(s, len, lenp, flags, errors, 0)
+
+#define utf8_to_uv(         s, e, cp_p, advance_p)                      \
+        utf8_to_uv_flags(   s, e, cp_p, advance_p, 0)
+#define utf8_to_uv_flags(   s, e, cp_p, advance_p, flags)               \
+        utf8_to_uv_errors(  s, e, cp_p, advance_p, flags, 0)
+#define utf8_to_uv_errors(  s, e, cp_p, advance_p, flags, errors)       \
+          utf8_to_uv_msgs(  s, e, cp_p, advance_p, flags, errors, 0)
+#define extended_utf8_to_uv(s, e, cp_p, advance_p)                      \
+                 utf8_to_uv(s, e, cp_p, advance_p)
+#define strict_utf8_to_uv(  s, e, cp_p, advance_p)                      \
+        utf8_to_uv_flags(   s, e, cp_p, advance_p,                      \
+                                    UTF8_DISALLOW_ILLEGAL_INTERCHANGE)
+#define c9strict_utf8_to_uv(s, e, cp_p, advance_p)                      \
+        utf8_to_uv_flags(   s, e, cp_p, advance_p,                      \
+                                 UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE)
 
 #define utf16_to_utf8(p, d, bytelen, newlen)                                \
                             utf16_to_utf8_base(p, d, bytelen, newlen, 0, 1)
diff --git a/util.h b/util.h
@@ -241,7 +241,7 @@ returning NULL if not found.  The terminating NUL bytes are not compared.
 */
 
 
-#define Perl_instr(haystack, needle) strstr(haystack, needle)
+#define instr(haystack, needle) strstr(haystack, needle)
 
 #ifdef HAS_MEMMEM
 #   define ninstr(big, bigend, little, lend)                                \

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,7 @@ sub embed_h {`
`514`	`514`	`if ($flags =~ /m/ && $flags =~ /p/) {`
`515`	`515`	`my $full_name = full_name($func, $flags);`
`516`	`516`	`next if $full_name eq $func; # Don't output a no-op.`
`517`		`- $ret = indent_define($func, $full_name, $ind);`
	`517`	`+ $ret = indent_define($full_name, $func, $ind);`
`518`	`518`	`}`
`519`	`519`	`elsif ($flags !~ /[omM]/) {`
`520`	`520`	`my $argc = scalar @$args;`