use svtype

From: "Robin Barker" <Robin.Barker@npl.co.uk>
Message-ID: <46A0F33545E63740BC7563DE59CA9C6D093A35@exchsvr2.npl.ad.local>

p4raw-id: //depot/perl@33304

diff --git a/embed.fnc b/embed.fnc
index 4e54636..8edfea5 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -298,7 +298,7 @@ Apd |GV*    |gv_fetchmeth   |NULLOK HV* stash|NN const char* name|STRLEN len|I32 leve
 Apd    |GV*    |gv_fetchmeth_autoload  |NULLOK HV* stash|NN const char* name|STRLEN len|I32 level
 Apdmb  |GV*    |gv_fetchmethod |NULLOK HV* stash|NN const char* name
 Apd    |GV*    |gv_fetchmethod_autoload|NULLOK HV* stash|NN const char* name|I32 autoload
-Ap     |GV*    |gv_fetchpv     |NN const char *nambeg|I32 add|I32 sv_type
+Ap     |GV*    |gv_fetchpv     |NN const char *nambeg|I32 add|const svtype sv_type
 Ap     |void   |gv_fullname    |NN SV* sv|NN const GV* gv
 Apmb   |void   |gv_fullname3   |NN SV* sv|NN const GV* gv|NULLOK const char* prefix
 Ap     |void   |gv_fullname4   |NN SV* sv|NN const GV* gv|NULLOK const char* prefix|bool keepmain
@@ -611,7 +611,7 @@ Afpda       |SV*    |newSVpvf       |NN const char* pat|...
 Apa    |SV*    |vnewSVpvf      |NN const char* pat|NULLOK va_list* args
 Apd    |SV*    |newSVrv        |NN SV* rv|NULLOK const char* classname
 Apda   |SV*    |newSVsv        |NULLOK SV* old
-Apda   |SV*    |newSV_type     |svtype type
+Apda   |SV*    |newSV_type     |const svtype type
 Apa    |OP*    |newUNOP        |I32 type|I32 flags|NULLOK OP* first
 Apa    |OP*    |newWHENOP      |NULLOK OP* cond|NN OP* block
 Apa    |OP*    |newWHILEOP     |I32 flags|I32 debuggable|NULLOK LOOP* loop \
@@ -1154,7 +1154,7 @@ sR        |I32    |do_trans_complex_utf8  |NN SV * const sv
 #endif
 
 #if defined(PERL_IN_GV_C) || defined(PERL_DECL_PROT)
-s      |void   |gv_init_sv     |NN GV *gv|I32 sv_type
+s      |void   |gv_init_sv     |NN GV *gv|const svtype sv_type
 s      |HV*    |gv_get_super_pkg|NN const char* name|I32 namelen
 s      |HV*    |require_tie_mod|NN GV *gv|NN const char *varpv|NN SV* namesv \
                                |NN const char *methpv|const U32 flags
@@ -1326,7 +1326,7 @@ sR        |SV*    |refto          |NN SV* sv
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
 pRxo   |GV*    |softref2xv     |NN SV *const sv|NN const char *const what \
-                               |const U32 type|NN SV ***spp
+                               |const svtype type|NN SV ***spp
 #endif
 
 #if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT)
@@ -1850,8 +1850,8 @@ np        |long   |my_betohl      |long n
 
 np     |void   |my_swabn       |NN void* ptr|int n
 
-Ap     |GV*    |gv_fetchpvn_flags|NN const char* name|STRLEN len|I32 flags|I32 sv_type
-Ap     |GV*    |gv_fetchsv|NN SV *name|I32 flags|I32 sv_type
+Ap     |GV*    |gv_fetchpvn_flags|NN const char* name|STRLEN len|I32 flags|const svtype sv_type
+Ap     |GV*    |gv_fetchsv|NN SV *name|I32 flags|const svtype sv_type
 dpR    |bool   |is_gv_magical_sv|NN SV *name|U32 flags
 
 ApR    |bool   |stashpv_hvname_match|NN const COP *c|NN const HV *hv

diff --git a/gv.c b/gv.c
index 223e318..8b5d660 100644 (file)
--- a/gv.c
+++ b/gv.c
@@ -304,7 +304,7 @@ Perl_gv_init(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, int multi)
 }
 
 STATIC void
-S_gv_init_sv(pTHX_ GV *gv, I32 sv_type)
+S_gv_init_sv(pTHX_ GV *gv, const svtype sv_type)
 {
     PERL_ARGS_ASSERT_GV_INIT_SV;
 
@@ -895,13 +895,13 @@ Perl_gv_stashsv(pTHX_ SV *sv, I32 flags)
 
 
 GV *
-Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, I32 sv_type) {
+Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, const svtype sv_type) {
     PERL_ARGS_ASSERT_GV_FETCHPV;
     return gv_fetchpvn_flags(nambeg, strlen(nambeg), add, sv_type);
 }
 
 GV *
-Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, I32 sv_type) {
+Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, const svtype sv_type) {
     STRLEN len;
     const char * const nambeg = SvPV_const(name, len);
     PERL_ARGS_ASSERT_GV_FETCHSV;
@@ -910,7 +910,7 @@ Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, I32 sv_type) {
 
 GV *
 Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
-                      I32 sv_type)
+                      const svtype sv_type)
 {
     dVAR;
     register const char *name = nambeg;

diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index a7d1202..18619e5 100644 (file)
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -5311,7 +5311,7 @@ X<newSV_type>
 Creates a new SV, of the type specified.  The reference count for the new SV
 is set to 1.
 
-       SV*     newSV_type(svtype type)
+       SV*     newSV_type(const svtype type)
 
 =for hackers
 Found in file sv.c

diff --git a/pp.c b/pp.c
index 6d97b9e..5b09c08 100644 (file)
--- a/pp.c
+++ b/pp.c
@@ -218,8 +218,8 @@ PP(pp_rv2gv)
 
 /* Helper function for pp_rv2sv and pp_rv2av  */
 GV *
-Perl_softref2xv(pTHX_ SV *const sv, const char *const what, const U32 type,
-               SV ***spp)
+Perl_softref2xv(pTHX_ SV *const sv, const char *const what,
+               const svtype type, SV ***spp)
 {
     dVAR;
     GV *gv;

diff --git a/proto.h b/proto.h
index 7b2d14b..62fbfd9 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -903,7 +903,7 @@ PERL_CALLCONV GV*   Perl_gv_fetchmethod_autoload(pTHX_ HV* stash, const char* name
 #define PERL_ARGS_ASSERT_GV_FETCHMETHOD_AUTOLOAD       \
        assert(name)
 
-PERL_CALLCONV GV*      Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, I32 sv_type)
+PERL_CALLCONV GV*      Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, const svtype sv_type)
                        __attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_GV_FETCHPV    \
        assert(nambeg)
@@ -2230,7 +2230,7 @@ PERL_CALLCONV SV* Perl_newSVsv(pTHX_ SV* old)
                        __attribute__malloc__
                        __attribute__warn_unused_result__;
 
-PERL_CALLCONV SV*      Perl_newSV_type(pTHX_ svtype type)
+PERL_CALLCONV SV*      Perl_newSV_type(pTHX_ const svtype type)
                        __attribute__malloc__
                        __attribute__warn_unused_result__;
 
@@ -4183,7 +4183,7 @@ STATIC I32        S_do_trans_complex_utf8(pTHX_ SV * const sv)
 #endif
 
 #if defined(PERL_IN_GV_C) || defined(PERL_DECL_PROT)
-STATIC void    S_gv_init_sv(pTHX_ GV *gv, I32 sv_type)
+STATIC void    S_gv_init_sv(pTHX_ GV *gv, const svtype sv_type)
                        __attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_GV_INIT_SV    \
        assert(gv)
@@ -4804,7 +4804,7 @@ STATIC SV*        S_refto(pTHX_ SV* sv)
 
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
-PERL_CALLCONV GV*      Perl_softref2xv(pTHX_ SV *const sv, const char *const what, const U32 type, SV ***spp)
+PERL_CALLCONV GV*      Perl_softref2xv(pTHX_ SV *const sv, const char *const what, const svtype type, SV ***spp)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2)
@@ -6262,12 +6262,12 @@ PERL_CALLCONV void      Perl_my_swabn(void* ptr, int n)
        assert(ptr)
 
 
-PERL_CALLCONV GV*      Perl_gv_fetchpvn_flags(pTHX_ const char* name, STRLEN len, I32 flags, I32 sv_type)
+PERL_CALLCONV GV*      Perl_gv_fetchpvn_flags(pTHX_ const char* name, STRLEN len, I32 flags, const svtype sv_type)
                        __attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_GV_FETCHPVN_FLAGS     \
        assert(name)
 
-PERL_CALLCONV GV*      Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, I32 sv_type)
+PERL_CALLCONV GV*      Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, const svtype sv_type)
                        __attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_GV_FETCHSV    \
        assert(name)

diff --git a/sv.c b/sv.c
index d0f9edb..2aefe3e 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -7581,7 +7581,7 @@ is set to 1.
 */
 
 SV *
-Perl_newSV_type(pTHX_ svtype type)
+Perl_newSV_type(pTHX_ const svtype type)
 {
     register SV *sv;