Revert "Move Perl_gv_* mathoms function to macros in gv.h"

This reverts commit 3af891d.

Author: khwilliamson

embed.fnc

@@ -1344,12 +1344,12 @@ ARdp	|GV *	|gv_autoload_pvn|NULLOK NOCHECK HV *stash		\
 ARdp	|GV *	|gv_autoload_sv |NULLOK NOCHECK HV *stash		\
 				|NN SV *namesv				\
 				|U32 flags
-Admp	|GV *	|gv_AVadd	|NULLOK GV *gv
+AMbdp	|GV *	|gv_AVadd	|NULLOK GV *gv
 Cp	|void	|gv_check	|NN HV *stash
 : Used in pp.c and pp_sys.c
 ARdp	|SV *	|gv_const_sv	|NN GV *gv
 Adp	|void	|gv_dump	|NULLOK GV *gv
-Admp	|void	|gv_efullname3	|NN SV *sv				\
+AMbdp	|void	|gv_efullname3	|NN SV *sv				\
 				|NN const GV *gv			\
 				|NULLOK const char *prefix
 Adp	|void	|gv_efullname4	|NN SV *sv				\
@@ -1370,7 +1370,7 @@ Adm	|GV *	|gv_fetchmeth_autoload					\
 				|NN const char *name			\
 				|STRLEN len				\
 				|I32 level
-Admp	|GV *	|gv_fetchmethod |NN NOCHECK HV *stash			\
+AMbdp	|GV *	|gv_fetchmethod |NN NOCHECK HV *stash			\
 				|NN const char *name
 Adp	|GV *	|gv_fetchmethod_autoload				\
 				|NN NOCHECK HV *stash			\
@@ -1431,7 +1431,7 @@ Adp	|GV *	|gv_fetchpvn_flags					\
 Adp	|GV *	|gv_fetchsv	|NN SV *name				\
 				|I32 flags				\
 				|const svtype sv_type
-Admp	|void	|gv_fullname3	|NN SV *sv				\
+AMbdp	|void	|gv_fullname3	|NN SV *sv				\
 				|NN const GV *gv			\
 				|NULLOK const char *prefix
 Adp	|void	|gv_fullname4	|NN SV *sv				\
@@ -1440,7 +1440,7 @@ Adp	|void	|gv_fullname4	|NN SV *sv				\
 				|bool keepmain
 CRdp	|CV *	|gv_handler	|NULLOK HV *stash			\
 				|I32 id
-Admp	|GV *	|gv_HVadd	|NULLOK GV *gv
+AMbdp	|GV *	|gv_HVadd	|NULLOK GV *gv
 Adm	|void	|gv_init	|NN GV *gv				\
 				|NULLOK HV *stash			\
 				|NN const char *name			\
@@ -1459,7 +1459,7 @@ Adp	|void	|gv_init_sv	|NN GV *gv				\
 				|NULLOK HV *stash			\
 				|NN SV *namesv				\
 				|U32 flags
-Admp	|GV *	|gv_IOadd	|NULLOK GV *gv
+AMbdp	|GV *	|gv_IOadd	|NULLOK GV *gv
 Adp	|void	|gv_name_set	|NN GV *gv				\
 				|NN const char *name			\
 				|U32 len				\

embed.h

@@ -258,17 +258,13 @@
 # define grok_number(a,b,c)                     Perl_grok_number(aTHX_ a,b,c)
 # define grok_number_flags(a,b,c,d)             Perl_grok_number_flags(aTHX_ a,b,c,d)
 # define grok_numeric_radix(a,b)                Perl_grok_numeric_radix(aTHX_ a,b)
-# define gv_AVadd(a)                            Perl_gv_AVadd(aTHX,a)
-# define gv_HVadd(a)                            Perl_gv_HVadd(aTHX,a)
-# define gv_IOadd(a)                            Perl_gv_IOadd(aTHX,a)
 # define gv_add_by_type(a,b)                    Perl_gv_add_by_type(aTHX_ a,b)
 # define gv_autoload_pv(a,b,c)                  Perl_gv_autoload_pv(aTHX_ a,b,c)
 # define gv_autoload_pvn(a,b,c,d)               Perl_gv_autoload_pvn(aTHX_ a,b,c,d)
 # define gv_autoload_sv(a,b,c)                  Perl_gv_autoload_sv(aTHX_ a,b,c)
 # define gv_check(a)                            Perl_gv_check(aTHX_ a)
 # define gv_const_sv(a)                         Perl_gv_const_sv(aTHX_ a)
 # define gv_dump(a)                             Perl_gv_dump(aTHX_ a)
-# define gv_efullname3(a,b,c)                   Perl_gv_efullname3(aTHX,a,b,c)
 # define gv_efullname4(a,b,c,d)                 Perl_gv_efullname4(aTHX_ a,b,c,d)
 # define gv_fetchfile(a)                        Perl_gv_fetchfile(aTHX_ a)
 # define gv_fetchfile_flags(a,b,c)              Perl_gv_fetchfile_flags(aTHX_ a,b,c)
@@ -278,15 +274,13 @@
 # define gv_fetchmeth_pvn_autoload(a,b,c,d,e)   Perl_gv_fetchmeth_pvn_autoload(aTHX_ a,b,c,d,e)
 # define gv_fetchmeth_sv(a,b,c,d)               Perl_gv_fetchmeth_sv(aTHX_ a,b,c,d)
 # define gv_fetchmeth_sv_autoload(a,b,c,d)      Perl_gv_fetchmeth_sv_autoload(aTHX_ a,b,c,d)
-# define gv_fetchmethod(a,b)                    Perl_gv_fetchmethod(aTHX,a,b)
 # define gv_fetchmethod_autoload(a,b,c)         Perl_gv_fetchmethod_autoload(aTHX_ a,b,c)
 # define gv_fetchmethod_pv_flags(a,b,c)         Perl_gv_fetchmethod_pv_flags(aTHX_ a,b,c)
 # define gv_fetchmethod_pvn_flags(a,b,c,d)      Perl_gv_fetchmethod_pvn_flags(aTHX_ a,b,c,d)
 # define gv_fetchmethod_sv_flags(a,b,c)         Perl_gv_fetchmethod_sv_flags(aTHX_ a,b,c)
 # define gv_fetchpv(a,b,c)                      Perl_gv_fetchpv(aTHX_ a,b,c)
 # define gv_fetchpvn_flags(a,b,c,d)             Perl_gv_fetchpvn_flags(aTHX_ a,b,c,d)
 # define gv_fetchsv(a,b,c)                      Perl_gv_fetchsv(aTHX_ a,b,c)
-# define gv_fullname3(a,b,c)                    Perl_gv_fullname3(aTHX,a,b,c)
 # define gv_fullname4(a,b,c,d)                  Perl_gv_fullname4(aTHX_ a,b,c,d)
 # define gv_handler(a,b)                        Perl_gv_handler(aTHX_ a,b)
 # define gv_init_pv(a,b,c,d)                    Perl_gv_init_pv(aTHX_ a,b,c,d)

gv.h

@@ -297,12 +297,9 @@ Return the CV from the GV.
 /* gv_fetchfile_flags() */
 #define GVF_NOADD       0x01    /* don't add the glob if it doesn't exist */
 
-#define Perl_gv_fullname3(mTHX, sv,gv,prefix)                           \
-        Perl_gv_fullname4(aTHX_ sv,gv,prefix,TRUE)
-#define Perl_gv_efullname3(mTHX, sv, gv, prefix)                        \
-        Perl_gv_efullname4(aTHX_ sv,gv,prefix,TRUE)
-#define Perl_gv_fetchmethod(mTHX, stash, name)                          \
-        Perl_gv_fetchmethod_autoload(aTHX_ stash, name, TRUE)
+#define gv_fullname3(sv,gv,prefix) gv_fullname4(sv,gv,prefix,TRUE)
+#define gv_efullname3(sv,gv,prefix) gv_efullname4(sv,gv,prefix,TRUE)
+#define gv_fetchmethod(stash, name) gv_fetchmethod_autoload(stash, name, TRUE)
 
 /*
 =for apidoc_defn Am|GV *|gv_fetchsv_nomg|SV *name|I32 flags|const svtype sv_type
@@ -346,10 +343,10 @@ Make sure there is a slot of the given type (AV, HV, IO, SV) in the GV C<gv>.
 =cut
 */
 
-#define Perl_gv_AVadd(mTHX, gv) Perl_gv_add_by_type(aTHX_ (gv), SVt_PVAV)
-#define Perl_gv_HVadd(mTHX, gv) Perl_gv_add_by_type(aTHX_ (gv), SVt_PVHV)
-#define Perl_gv_IOadd(mTHX, gv) Perl_gv_add_by_type(aTHX_ (gv), SVt_PVIO)
-#define Perl_gv_SVadd(mTHX, gv) Perl_gv_add_by_type(aTHX_ (gv), SVt_NULL)
+#define gv_AVadd(gv) gv_add_by_type((gv), SVt_PVAV)
+#define gv_HVadd(gv) gv_add_by_type((gv), SVt_PVHV)
+#define gv_IOadd(gv) gv_add_by_type((gv), SVt_PVIO)
+#define Perl_gv_SVadd(mTHX, gv)  Perl_gv_add_by_type(aTHX_ (gv), SVt_NULL)
 
 /*
  * ex: set ts=8 sts=4 sw=4 et:

mathoms.c

@@ -377,6 +377,30 @@ Perl_huge(void)
 }
 #endif
 
+void
+Perl_gv_fullname3(pTHX_ SV *sv, const GV *gv, const char *prefix)
+{
+    PERL_ARGS_ASSERT_GV_FULLNAME3;
+
+    gv_fullname4(sv, gv, prefix, TRUE);
+}
+
+void
+Perl_gv_efullname3(pTHX_ SV *sv, const GV *gv, const char *prefix)
+{
+    PERL_ARGS_ASSERT_GV_EFULLNAME3;
+
+    gv_efullname4(sv, gv, prefix, TRUE);
+}
+
+GV *
+Perl_gv_fetchmethod(pTHX_ HV *stash, const char *name)
+{
+    PERL_ARGS_ASSERT_GV_FETCHMETHOD;
+
+    return gv_fetchmethod_autoload(stash, name, TRUE);
+}
+
 bool
 Perl_do_open(pTHX_ GV *gv, const char *name, I32 len, int as_raw,
              int rawmode, int rawperm, PerlIO *supplied_fp)
@@ -503,6 +527,24 @@ Perl_save_op(pTHX)
     save_op();
 }
 
+GV *
+Perl_gv_AVadd(pTHX_ GV *gv)
+{
+    return gv_AVadd(gv);
+}
+
+GV *
+Perl_gv_HVadd(pTHX_ GV *gv)
+{
+    return gv_HVadd(gv);
+}
+
+GV *
+Perl_gv_IOadd(pTHX_ GV *gv)
+{
+    return gv_IOadd(gv);
+}
+
 IO *
 Perl_newIO(pTHX)
 {