Skip to content

Commit a5fc9ab

Browse files
khwilliamsonkhwilliamson
committed
mathoms.c Remove functions that just call their macro
The functions that merely call their implementing macro can themselves just be #defined as that macro. Two commits ago, this was done on the functions in mathoms.c that have this form. Then one commit ago, a bunch of functions in mathoms were converted to have this form. This commit just removes these newly converted functions. There could have been fewer commits if I had reversed the order of the previous two, but doing it this way may help in bisecting, should problems arise. After this commit mathoms.c has been reduced to fewer than 20 functions.
1 parent 5b36fc6 commit a5fc9ab

File tree

4 files changed

+249
-572
lines changed

4 files changed

+249
-572
lines changed

‎embed.fnc

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ Adpr |OP * |die_sv |NN SV *baseex
997997
: Used in util.c
998998
pr |void |die_unwind |NN SV *msv
999999
: FIXME
1000-
Mbp |bool |do_aexec |NULLOK SV *really \
1000+
mp |bool |do_aexec |NULLOK SV *really \
10011001
|NN SV **mark \
10021002
|NN SV **sp
10031003
: Used in pp_sys.c
@@ -1053,7 +1053,7 @@ Rp |I32 |do_ncmp |NN SV * const left \
10531053
Cp |void |do_op_dump |I32 level \
10541054
|NN PerlIO *file \
10551055
|NULLOK const OP *o
1056-
AMbp |bool |do_open |NN GV *gv \
1056+
Amp |bool |do_open |NN GV *gv \
10571057
|NN const char *name \
10581058
|I32 len \
10591059
|int as_raw \
@@ -1330,7 +1330,7 @@ Cp |void |gv_check |NN HV *stash
13301330
: Used in pp.c and pp_sys.c
13311331
ARdp |SV * |gv_const_sv |NN GV *gv
13321332
Adp |void |gv_dump |NULLOK GV *gv
1333-
AMbdp |void |gv_efullname3 |NN SV *sv \
1333+
Admp |void |gv_efullname3 |NN SV *sv \
13341334
|NN const GV *gv \
13351335
|NULLOK const char *prefix
13361336
Adp |void |gv_efullname4 |NN SV *sv \
@@ -1351,7 +1351,7 @@ Adm |GV * |gv_fetchmeth_autoload \
13511351
|NN const char *name \
13521352
|STRLEN len \
13531353
|I32 level
1354-
AMbdp |GV * |gv_fetchmethod |NN NOCHECK HV *stash \
1354+
Admp |GV * |gv_fetchmethod |NN NOCHECK HV *stash \
13551355
|NN const char *name
13561356
Adp |GV * |gv_fetchmethod_autoload \
13571357
|NN NOCHECK HV *stash \
@@ -1412,7 +1412,7 @@ Adp |GV * |gv_fetchpvn_flags \
14121412
Adp |GV * |gv_fetchsv |NN SV *name \
14131413
|I32 flags \
14141414
|const svtype sv_type
1415-
AMbdp |void |gv_fullname3 |NN SV *sv \
1415+
Admp |void |gv_fullname3 |NN SV *sv \
14161416
|NN const GV *gv \
14171417
|NULLOK const char *prefix
14181418
Adp |void |gv_fullname4 |NN SV *sv \
@@ -1440,7 +1440,7 @@ Adp |void |gv_init_sv |NN GV *gv \
14401440
|NULLOK HV *stash \
14411441
|NN SV *namesv \
14421442
|U32 flags
1443-
AMbdp |GV * |gv_IOadd |NULLOK GV *gv
1443+
Admp |GV * |gv_IOadd |NULLOK GV *gv
14441444
Adp |void |gv_name_set |NN GV *gv \
14451445
|NN const char *name \
14461446
|U32 len \
@@ -1492,7 +1492,7 @@ AMbdp |SV * |hv_delete |NULLOK HV *hv \
14921492
|NN const char *key \
14931493
|I32 klen \
14941494
|I32 flags
1495-
AMbdp |SV * |hv_delete_ent |NULLOK HV *hv \
1495+
Admp |SV * |hv_delete_ent |NULLOK HV *hv \
14961496
|NN SV *keysv \
14971497
|I32 flags \
14981498
|U32 hash
@@ -1511,14 +1511,14 @@ dp |void |hv_ename_delete|NN HV *hv \
15111511
AMRbdp |bool |hv_exists |NULLOK HV *hv \
15121512
|NN const char *key \
15131513
|I32 klen
1514-
AMRbdp |bool |hv_exists_ent |NULLOK HV *hv \
1514+
ARdmp |bool |hv_exists_ent |NULLOK HV *hv \
15151515
|NN SV *keysv \
15161516
|U32 hash
15171517
AMbdp |SV ** |hv_fetch |NULLOK HV *hv \
15181518
|NN const char *key \
15191519
|I32 klen \
15201520
|I32 lval
1521-
AMbdp |HE * |hv_fetch_ent |NULLOK HV *hv \
1521+
Admp |HE * |hv_fetch_ent |NULLOK HV *hv \
15221522
|NN SV *keysv \
15231523
|I32 lval \
15241524
|U32 hash
@@ -1529,7 +1529,7 @@ Adp |I32 |hv_iterinit |NN HV *hv
15291529
ARdp |char * |hv_iterkey |NN HE *entry \
15301530
|NN I32 *retlen
15311531
ARdp |SV * |hv_iterkeysv |NN HE *entry
1532-
AMRbdp |HE * |hv_iternext |NN HV *hv
1532+
ARdmp |HE * |hv_iternext |NN HV *hv
15331533
ARdpx |HE * |hv_iternext_flags \
15341534
|NN HV *hv \
15351535
|I32 flags
@@ -1540,7 +1540,7 @@ ARdp |SV * |hv_iterval |NN HV *hv \
15401540
|NN HE *entry
15411541
Adp |void |hv_ksplit |NN HV *hv \
15421542
|IV newmax
1543-
AMbdp |void |hv_magic |NN HV *hv \
1543+
Admp |void |hv_magic |NN HV *hv \
15441544
|NULLOK GV *gv \
15451545
|int how
15461546
Adp |void |hv_name_set |NN HV *hv \
@@ -1568,11 +1568,11 @@ AMbdp |SV ** |hv_store |NULLOK HV *hv \
15681568
|I32 klen \
15691569
|NULLOK SV *val \
15701570
|U32 hash
1571-
AMbdp |HE * |hv_store_ent |NULLOK HV *hv \
1571+
Admp |HE * |hv_store_ent |NULLOK HV *hv \
15721572
|NULLOK SV *key \
15731573
|NULLOK SV *val \
15741574
|U32 hash
1575-
AMbpx |SV ** |hv_store_flags |NULLOK HV *hv \
1575+
Ampx |SV ** |hv_store_flags |NULLOK HV *hv \
15761576
|NULLOK const char *key \
15771577
|I32 klen \
15781578
|NULLOK SV *val \
@@ -1684,7 +1684,7 @@ CRp |bool |_is_uni_perl_idstart \
16841684
|UV c
16851685
ARTdip |Size_t |isUTF8_CHAR |NN const U8 * const s0 \
16861686
|NN const U8 * const e
1687-
AMTbdp |STRLEN |is_utf8_char_buf \
1687+
ATdmp |STRLEN |is_utf8_char_buf \
16881688
|NN const U8 *buf \
16891689
|NN const U8 *buf_end
16901690
ARTdip |Size_t |isUTF8_CHAR_flags \
@@ -2084,7 +2084,7 @@ Adpr |void |my_exit |U32 status
20842084
Adpr |void |my_failure_exit
20852085
Cdp |I32 |my_fflush_all
20862086
CTdp |Pid_t |my_fork
2087-
m |I32 |my_lstat
2087+
mp |I32 |my_lstat
20882088
Xp |I32 |my_lstat_flags |NULLOK const U32 flags
20892089
RTop |int |my_mkostemp_cloexec \
20902090
|NN char *templte \
@@ -2105,7 +2105,7 @@ CTdp |int |my_socketpair |int family \
21052105
|int type \
21062106
|int protocol \
21072107
|int fd[2]
2108-
m |I32 |my_stat
2108+
mp |I32 |my_stat
21092109
Xp |I32 |my_stat_flags |NULLOK const U32 flags
21102110
p |const char *|my_strerror \
21112111
|const int errnum \
@@ -2155,7 +2155,7 @@ Xdp |CV * |newATTRSUB_x |I32 floor \
21552155
|NULLOK OP *attrs \
21562156
|NULLOK OP *block \
21572157
|bool o_is_gv
2158-
AMRbdp |AV * |newAV
2158+
ARdmp |AV * |newAV
21592159
ARdm |AV * |newAV_alloc_x |SSize_t size
21602160
ARdm |AV * |newAV_alloc_xz |SSize_t size
21612161
ARdp |AV * |newAVav |NULLOK AV *oav
@@ -2208,7 +2208,7 @@ ARdp |OP * |newGVREF |I32 type \
22082208
AMRbdp |HV * |newHV
22092209
ARdp |HV * |newHVhv |NULLOK HV *hv
22102210
ARdp |OP * |newHVREF |NN OP *o
2211-
AMRbdp |IO * |newIO
2211+
ARdmp |IO * |newIO
22122212
ARdp |OP * |newLISTOP |I32 type \
22132213
|I32 flags \
22142214
|NULLOK OP *first \
@@ -2274,7 +2274,7 @@ ARdp |OP * |newSTATEOP |I32 flags \
22742274
|NULLOK OP *o
22752275
p |CV * |newSTUB |NN GV *gv \
22762276
|bool fake
2277-
AMbdp |CV * |newSUB |I32 floor \
2277+
Admp |CV * |newSUB |I32 floor \
22782278
|NULLOK OP *o \
22792279
|NULLOK OP *proto \
22802280
|NULLOK OP *block
@@ -3092,7 +3092,7 @@ ATdip |void |SvAMAGIC_on |NN SV *sv
30923092
ATdp |void |sv_backoff |NN SV * const sv
30933093
Adp |SV * |sv_bless |NN SV * const sv \
30943094
|NN NOCHECK HV * const stash
3095-
CMbdp |bool |sv_2bool |NN SV * const sv
3095+
Cdmp |bool |sv_2bool |NN SV * const sv
30963096
Cdp |bool |sv_2bool_flags |NN SV *sv \
30973097
|I32 flags
30983098
Cp |bool |sv_can_swipe_pv_buf \
@@ -3116,22 +3116,22 @@ Adfpv |void |sv_catpvf_mg |NN SV * const sv \
31163116
|...
31173117
Adp |void |sv_catpv_mg |NN SV * const dsv \
31183118
|NULLOK const char * const sstr
3119-
AMbdp |void |sv_catpvn |NN SV * const dsv \
3119+
Admp |void |sv_catpvn |NN SV * const dsv \
31203120
|NN const char *sstr \
31213121
|STRLEN len
31223122
Adp |void |sv_catpvn_flags|NN SV * const dsv \
31233123
|NN const char *sstr \
31243124
|const STRLEN len \
31253125
|const I32 flags
3126-
AMbdp |void |sv_catpvn_mg |NN SV * const dsv \
3126+
Admp |void |sv_catpvn_mg |NN SV * const dsv \
31273127
|NN const char *sstr \
31283128
|STRLEN len
3129-
AMbdp |void |sv_catsv |NN SV * const dsv \
3129+
Admp |void |sv_catsv |NN SV * const dsv \
31303130
|NULLOK SV * const sstr
31313131
Adp |void |sv_catsv_flags |NN SV * const dsv \
31323132
|NULLOK SV * const sstr \
31333133
|const I32 flags
3134-
AMbdp |void |sv_catsv_mg |NN SV * const dsv \
3134+
Admp |void |sv_catsv_mg |NN SV * const dsv \
31353135
|NULLOK SV * const sstr
31363136
Adp |void |sv_chop |NN SV * const sv \
31373137
|NULLOK const char * const ptr
@@ -3151,7 +3151,7 @@ Adp |I32 |sv_cmp_locale_flags \
31513151
|NULLOK SV * const sv1 \
31523152
|NULLOK SV * const sv2 \
31533153
|const U32 flags
3154-
AMbdp |void |sv_copypv |NN SV * const dsv \
3154+
Admp |void |sv_copypv |NN SV * const dsv \
31553155
|NN SV * const ssv
31563156
Adp |void |sv_copypv_flags|NN SV * const dsv \
31573157
|NN SV * const ssv \
@@ -3201,12 +3201,12 @@ ARdp |bool |sv_does_sv |NN SV *sv \
32013201
Adp |void |sv_dump |NULLOK SV *sv
32023202
Adp |void |sv_dump_depth |NULLOK SV *sv \
32033203
|I32 depth
3204-
AMbdp |I32 |sv_eq |NULLOK SV *sv1 \
3204+
Admp |I32 |sv_eq |NULLOK SV *sv1 \
32053205
|NULLOK SV *sv2
32063206
Adp |I32 |sv_eq_flags |NULLOK SV *sv1 \
32073207
|NULLOK SV *sv2 \
32083208
|const U32 flags
3209-
AMbdp |void |sv_force_normal|NN SV *sv
3209+
Admp |void |sv_force_normal|NN SV *sv
32103210
Adp |void |sv_force_normal_flags \
32113211
|NN SV * const sv \
32123212
|const U32 flags
@@ -3226,7 +3226,7 @@ Cdp |char * |sv_grow_fresh |NN SV * const sv \
32263226
|STRLEN newlen
32273227
Adp |void |sv_inc |NULLOK SV * const sv
32283228
Adp |void |sv_inc_nomg |NULLOK SV * const sv
3229-
AMbdp |void |sv_insert |NN SV * const bigstr \
3229+
Admp |void |sv_insert |NN SV * const bigstr \
32303230
|const STRLEN offset \
32313231
|const STRLEN len \
32323232
|NN const char * const little \
@@ -3244,7 +3244,7 @@ ARdp |bool |sv_isa_sv |NN SV *sv \
32443244
|NN SV *namesv
32453245
Adp |int |sv_isobject |NULLOK SV *sv
32463246
Adip |IV |SvIV |NN SV *sv
3247-
CMbp |IV |sv_2iv |NN SV *sv
3247+
Cmp |IV |sv_2iv |NN SV *sv
32483248
Adp |IV |sv_2iv_flags |NN SV * const sv \
32493249
|const I32 flags
32503250
Adip |IV |SvIV_nomg |NN SV *sv
@@ -3306,7 +3306,7 @@ Adp |STRLEN |sv_pos_u2b_flags \
33063306
|STRLEN uoffset \
33073307
|NULLOK STRLEN * const lenp \
33083308
|U32 flags
3309-
AMbdp |char * |sv_2pv |NN SV *sv \
3309+
Admp |char * |sv_2pv |NN SV *sv \
33103310
|NULLOK STRLEN *lp
33113311
CMRbdp |char * |sv_pv |NN SV *sv
33123312
Admp |char * |sv_2pvbyte |NN SV *sv \
@@ -3323,18 +3323,18 @@ ip |char * |sv_pvbyten_force_wrapper \
33233323
|NN SV * const sv \
33243324
|NULLOK STRLEN * const lp \
33253325
|const U32 dummy
3326-
CMRbdp |char * |sv_2pvbyte_nolen \
3326+
CRdmp |char * |sv_2pvbyte_nolen \
33273327
|NN SV *sv
33283328
Adp |char * |sv_2pv_flags |NN SV * const sv \
33293329
|NULLOK STRLEN * const lp \
33303330
|const U32 flags
3331-
CMbdp |char * |sv_pvn_force |NN SV *sv \
3331+
Cdmp |char * |sv_pvn_force |NN SV *sv \
33323332
|NULLOK STRLEN *lp
33333333
Adp |char * |sv_pvn_force_flags \
33343334
|NN SV * const sv \
33353335
|NULLOK STRLEN * const lp \
33363336
|const U32 flags
3337-
CMRbdp |char * |sv_2pv_nolen |NN SV *sv
3337+
CRdmp |char * |sv_2pv_nolen |NN SV *sv
33383338
Admp |char * |sv_2pvutf8 |NN SV *sv \
33393339
|NULLOK STRLEN * const lp
33403340
CMRbdp |char * |sv_pvutf8 |NN SV *sv
@@ -3349,7 +3349,7 @@ ip |char * |sv_pvutf8n_force_wrapper \
33493349
|NN SV * const sv \
33503350
|NULLOK STRLEN * const lp \
33513351
|const U32 dummy
3352-
CMRbdp |char * |sv_2pvutf8_nolen \
3352+
CRdmp |char * |sv_2pvutf8_nolen \
33533353
|NN SV *sv
33543354
AIdp |bool |SvPVXtrue |NN SV *sv
33553355
Adp |char * |sv_recode_to_utf8 \
@@ -3487,7 +3487,7 @@ Adp |SV * |sv_strftime_tm |NN SV *fmt \
34873487
Adp |SV * |sv_string_from_errnum \
34883488
|int errnum \
34893489
|NULLOK SV *tgtsv
3490-
CMbdp |void |sv_taint |NN SV *sv
3490+
Cdmp |void |sv_taint |NN SV *sv
34913491
CRdp |bool |sv_tainted |NN SV * const sv
34923492
Adip |bool |SvTRUE |NULLOK SV *sv
34933493
Cdp |I32 |sv_true |NULLOK SV * const sv
@@ -3504,20 +3504,20 @@ Adp |int |sv_unmagic |NN SV * const sv \
35043504
Adp |int |sv_unmagicext |NN SV * const sv \
35053505
|const int type \
35063506
|NULLOK const MGVTBL *vtbl
3507-
AMbdp |void |sv_unref |NN SV *sv
3507+
Admp |void |sv_unref |NN SV *sv
35083508
Adp |void |sv_unref_flags |NN SV * const ref \
35093509
|const U32 flags
35103510
Cdp |void |sv_untaint |NN SV * const sv
35113511
Adp |void |sv_upgrade |NN SV * const sv \
35123512
|svtype new_type
3513-
AMbdp |void |sv_usepvn |NN SV *sv \
3513+
Admp |void |sv_usepvn |NN SV *sv \
35143514
|NULLOK char *ptr \
35153515
|STRLEN len
35163516
Adp |void |sv_usepvn_flags|NN SV * const sv \
35173517
|NULLOK char *ptr \
35183518
|const STRLEN len \
35193519
|const U32 flags
3520-
AMbdp |void |sv_usepvn_mg |NN SV *sv \
3520+
Admp |void |sv_usepvn_mg |NN SV *sv \
35213521
|NULLOK char *ptr \
35223522
|STRLEN len
35233523
Adp |bool |sv_utf8_decode |NN SV * const sv
@@ -3543,7 +3543,7 @@ Adp |STRLEN |sv_utf8_upgrade_flags_grow \
35433543
Adm |STRLEN |sv_utf8_upgrade_nomg \
35443544
|NN SV *sv
35453545
Adip |UV |SvUV |NN SV *sv
3546-
CMbp |UV |sv_2uv |NN SV *sv
3546+
Cmp |UV |sv_2uv |NN SV *sv
35473547
Adp |UV |sv_2uv_flags |NN SV * const sv \
35483548
|const I32 flags
35493549
Adip |UV |SvUV_nomg |NN SV *sv
@@ -6387,7 +6387,7 @@ p |int |magic_setcollxfrm \
63876387
|NN MAGIC *mg
63886388
EXop |SV * |strxfrm |NN SV *src
63896389
: Defined in locale.c, used only in sv.c
6390-
AMbdp |char * |sv_collxfrm |NN SV * const sv \
6390+
Admp |char * |sv_collxfrm |NN SV * const sv \
63916391
|NN STRLEN * const nxp
63926392
Adp |char * |sv_collxfrm_flags \
63936393
|NN SV * const sv \

0 commit comments

Comments
 (0)