Skip to content

Commit 3af891d

Browse files
khwilliamsonkhwilliamson
committed
Move Perl_gv_* mathoms function to macros in gv.h
1 parent a8530b8 commit 3af891d

File tree

5 files changed

+40
-82
lines changed

5 files changed

+40
-82
lines changed

‎embed.fnc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,12 +1327,12 @@ ARdp |GV * |gv_autoload_pvn|NULLOK NOCHECK HV *stash \
13271327
ARdp |GV * |gv_autoload_sv |NULLOK NOCHECK HV *stash \
13281328
|NN SV *namesv \
13291329
|U32 flags
1330-
AMbdp |GV * |gv_AVadd |NULLOK GV *gv
1330+
Admp |GV * |gv_AVadd |NULLOK GV *gv
13311331
Cp |void |gv_check |NN HV *stash
13321332
: Used in pp.c and pp_sys.c
13331333
ARdp |SV * |gv_const_sv |NN GV *gv
13341334
Adp |void |gv_dump |NULLOK GV *gv
1335-
AMbdp |void |gv_efullname3 |NN SV *sv \
1335+
Admp |void |gv_efullname3 |NN SV *sv \
13361336
|NN const GV *gv \
13371337
|NULLOK const char *prefix
13381338
Adp |void |gv_efullname4 |NN SV *sv \
@@ -1353,7 +1353,7 @@ Adm |GV * |gv_fetchmeth_autoload \
13531353
|NN const char *name \
13541354
|STRLEN len \
13551355
|I32 level
1356-
AMbdp |GV * |gv_fetchmethod |NN NOCHECK HV *stash \
1356+
Admp |GV * |gv_fetchmethod |NN NOCHECK HV *stash \
13571357
|NN const char *name
13581358
Adp |GV * |gv_fetchmethod_autoload \
13591359
|NN NOCHECK HV *stash \
@@ -1414,7 +1414,7 @@ Adp |GV * |gv_fetchpvn_flags \
14141414
Adp |GV * |gv_fetchsv |NN SV *name \
14151415
|I32 flags \
14161416
|const svtype sv_type
1417-
AMbdp |void |gv_fullname3 |NN SV *sv \
1417+
Admp |void |gv_fullname3 |NN SV *sv \
14181418
|NN const GV *gv \
14191419
|NULLOK const char *prefix
14201420
Adp |void |gv_fullname4 |NN SV *sv \
@@ -1423,7 +1423,7 @@ Adp |void |gv_fullname4 |NN SV *sv \
14231423
|bool keepmain
14241424
CRdp |CV * |gv_handler |NULLOK HV *stash \
14251425
|I32 id
1426-
AMbdp |GV * |gv_HVadd |NULLOK GV *gv
1426+
Admp |GV * |gv_HVadd |NULLOK GV *gv
14271427
Adm |void |gv_init |NN GV *gv \
14281428
|NULLOK HV *stash \
14291429
|NN const char *name \
@@ -1442,7 +1442,7 @@ Adp |void |gv_init_sv |NN GV *gv \
14421442
|NULLOK HV *stash \
14431443
|NN SV *namesv \
14441444
|U32 flags
1445-
AMbdp |GV * |gv_IOadd |NULLOK GV *gv
1445+
Admp |GV * |gv_IOadd |NULLOK GV *gv
14461446
Adp |void |gv_name_set |NN GV *gv \
14471447
|NN const char *name \
14481448
|U32 len \

‎embed.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,17 @@
253253
# define grok_number(a,b,c) Perl_grok_number(aTHX_ a,b,c)
254254
# define grok_number_flags(a,b,c,d) Perl_grok_number_flags(aTHX_ a,b,c,d)
255255
# define grok_numeric_radix(a,b) Perl_grok_numeric_radix(aTHX_ a,b)
256+
# define gv_AVadd(a) Perl_gv_AVadd(aTHX,a)
257+
# define gv_HVadd(a) Perl_gv_HVadd(aTHX,a)
258+
# define gv_IOadd(a) Perl_gv_IOadd(aTHX,a)
256259
# define gv_add_by_type(a,b) Perl_gv_add_by_type(aTHX_ a,b)
257260
# define gv_autoload_pv(a,b,c) Perl_gv_autoload_pv(aTHX_ a,b,c)
258261
# define gv_autoload_pvn(a,b,c,d) Perl_gv_autoload_pvn(aTHX_ a,b,c,d)
259262
# define gv_autoload_sv(a,b,c) Perl_gv_autoload_sv(aTHX_ a,b,c)
260263
# define gv_check(a) Perl_gv_check(aTHX_ a)
261264
# define gv_const_sv(a) Perl_gv_const_sv(aTHX_ a)
262265
# define gv_dump(a) Perl_gv_dump(aTHX_ a)
266+
# define gv_efullname3(a,b,c) Perl_gv_efullname3(aTHX,a,b,c)
263267
# define gv_efullname4(a,b,c,d) Perl_gv_efullname4(aTHX_ a,b,c,d)
264268
# define gv_fetchfile(a) Perl_gv_fetchfile(aTHX_ a)
265269
# define gv_fetchfile_flags(a,b,c) Perl_gv_fetchfile_flags(aTHX_ a,b,c)
@@ -269,13 +273,15 @@
269273
# define gv_fetchmeth_pvn_autoload(a,b,c,d,e) Perl_gv_fetchmeth_pvn_autoload(aTHX_ a,b,c,d,e)
270274
# define gv_fetchmeth_sv(a,b,c,d) Perl_gv_fetchmeth_sv(aTHX_ a,b,c,d)
271275
# define gv_fetchmeth_sv_autoload(a,b,c,d) Perl_gv_fetchmeth_sv_autoload(aTHX_ a,b,c,d)
276+
# define gv_fetchmethod(a,b) Perl_gv_fetchmethod(aTHX,a,b)
272277
# define gv_fetchmethod_autoload(a,b,c) Perl_gv_fetchmethod_autoload(aTHX_ a,b,c)
273278
# define gv_fetchmethod_pv_flags(a,b,c) Perl_gv_fetchmethod_pv_flags(aTHX_ a,b,c)
274279
# define gv_fetchmethod_pvn_flags(a,b,c,d) Perl_gv_fetchmethod_pvn_flags(aTHX_ a,b,c,d)
275280
# define gv_fetchmethod_sv_flags(a,b,c) Perl_gv_fetchmethod_sv_flags(aTHX_ a,b,c)
276281
# define gv_fetchpv(a,b,c) Perl_gv_fetchpv(aTHX_ a,b,c)
277282
# define gv_fetchpvn_flags(a,b,c,d) Perl_gv_fetchpvn_flags(aTHX_ a,b,c,d)
278283
# define gv_fetchsv(a,b,c) Perl_gv_fetchsv(aTHX_ a,b,c)
284+
# define gv_fullname3(a,b,c) Perl_gv_fullname3(aTHX,a,b,c)
279285
# define gv_fullname4(a,b,c,d) Perl_gv_fullname4(aTHX_ a,b,c,d)
280286
# define gv_handler(a,b) Perl_gv_handler(aTHX_ a,b)
281287
# define gv_init_pv(a,b,c,d) Perl_gv_init_pv(aTHX_ a,b,c,d)

‎gv.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,12 @@ Return the CV from the GV.
297297
/* gv_fetchfile_flags() */
298298
#define GVF_NOADD 0x01 /* don't add the glob if it doesn't exist */
299299

300-
#define gv_fullname3(sv,gv,prefix) gv_fullname4(sv,gv,prefix,TRUE)
301-
#define gv_efullname3(sv,gv,prefix) gv_efullname4(sv,gv,prefix,TRUE)
302-
#define gv_fetchmethod(stash, name) gv_fetchmethod_autoload(stash, name, TRUE)
300+
#define Perl_gv_fullname3(mTHX, sv,gv,prefix) \
301+
Perl_gv_fullname4(aTHX_ sv,gv,prefix,TRUE)
302+
#define Perl_gv_efullname3(mTHX, sv, gv, prefix) \
303+
Perl_gv_efullname4(aTHX_ sv,gv,prefix,TRUE)
304+
#define Perl_gv_fetchmethod(mTHX, stash, name) \
305+
Perl_gv_fetchmethod_autoload(aTHX_ stash, name, TRUE)
303306

304307
/*
305308
=for apidoc_defn Am|GV *|gv_fetchsv_nomg|SV *name|I32 flags|const svtype sv_type
@@ -343,10 +346,10 @@ Make sure there is a slot of the given type (AV, HV, IO, SV) in the GV C<gv>.
343346
=cut
344347
*/
345348

346-
#define gv_AVadd(gv) gv_add_by_type((gv), SVt_PVAV)
347-
#define gv_HVadd(gv) gv_add_by_type((gv), SVt_PVHV)
348-
#define gv_IOadd(gv) gv_add_by_type((gv), SVt_PVIO)
349-
#define Perl_gv_SVadd(mTHX, gv) Perl_gv_add_by_type(aTHX_ (gv), SVt_NULL)
349+
#define Perl_gv_AVadd(mTHX, gv) Perl_gv_add_by_type(aTHX_ (gv), SVt_PVAV)
350+
#define Perl_gv_HVadd(mTHX, gv) Perl_gv_add_by_type(aTHX_ (gv), SVt_PVHV)
351+
#define Perl_gv_IOadd(mTHX, gv) Perl_gv_add_by_type(aTHX_ (gv), SVt_PVIO)
352+
#define Perl_gv_SVadd(mTHX, gv) Perl_gv_add_by_type(aTHX_ (gv), SVt_NULL)
350353

351354
/*
352355
* ex: set ts=8 sts=4 sw=4 et:

‎mathoms.c

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -377,30 +377,6 @@ Perl_huge(void)
377377
}
378378
#endif
379379

380-
void
381-
Perl_gv_fullname3(pTHX_ SV *sv, const GV *gv, const char *prefix)
382-
{
383-
PERL_ARGS_ASSERT_GV_FULLNAME3;
384-
385-
gv_fullname4(sv, gv, prefix, TRUE);
386-
}
387-
388-
void
389-
Perl_gv_efullname3(pTHX_ SV *sv, const GV *gv, const char *prefix)
390-
{
391-
PERL_ARGS_ASSERT_GV_EFULLNAME3;
392-
393-
gv_efullname4(sv, gv, prefix, TRUE);
394-
}
395-
396-
GV *
397-
Perl_gv_fetchmethod(pTHX_ HV *stash, const char *name)
398-
{
399-
PERL_ARGS_ASSERT_GV_FETCHMETHOD;
400-
401-
return gv_fetchmethod_autoload(stash, name, TRUE);
402-
}
403-
404380
bool
405381
Perl_do_open(pTHX_ GV *gv, const char *name, I32 len, int as_raw,
406382
int rawmode, int rawperm, PerlIO *supplied_fp)
@@ -527,24 +503,6 @@ Perl_save_op(pTHX)
527503
save_op();
528504
}
529505

530-
GV *
531-
Perl_gv_AVadd(pTHX_ GV *gv)
532-
{
533-
return gv_AVadd(gv);
534-
}
535-
536-
GV *
537-
Perl_gv_HVadd(pTHX_ GV *gv)
538-
{
539-
return gv_HVadd(gv);
540-
}
541-
542-
GV *
543-
Perl_gv_IOadd(pTHX_ GV *gv)
544-
{
545-
return gv_IOadd(gv);
546-
}
547-
548506
IO *
549507
Perl_newIO(pTHX)
550508
{

‎proto.h

Lines changed: 18 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)