Skip to content

Commit db5e0da

Browse files
committed
Move Perl_newSUB() from mathoms to macro in op.h
1 parent f841c17 commit db5e0da

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

embed.fnc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,7 +2148,7 @@ ARdp |OP * |newASSIGNOP |I32 flags \
21482148
|NULLOK OP *left \
21492149
|I32 optype \
21502150
|NULLOK OP *right
2151-
Adm |CV * |newATTRSUB |I32 floor \
2151+
Admp |CV * |newATTRSUB |I32 floor \
21522152
|NULLOK OP *o \
21532153
|NULLOK OP *proto \
21542154
|NULLOK OP *attrs \
@@ -2275,7 +2275,7 @@ ARdp |OP * |newSTATEOP |I32 flags \
22752275
|NULLOK OP *o
22762276
p |CV * |newSTUB |NN GV *gv \
22772277
|bool fake
2278-
AMbdp |CV * |newSUB |I32 floor \
2278+
Admp |CV * |newSUB |I32 floor \
22792279
|NULLOK OP *o \
22802280
|NULLOK OP *proto \
22812281
|NULLOK OP *block

embed.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@
405405
# define newANONSUB(a,b,c) Perl_newANONSUB(aTHX_ a,b,c)
406406
# define newARGDEFELEMOP(a,b,c) Perl_newARGDEFELEMOP(aTHX_ a,b,c)
407407
# define newASSIGNOP(a,b,c,d) Perl_newASSIGNOP(aTHX_ a,b,c,d)
408+
# define newATTRSUB(a,b,c,d,e) Perl_newATTRSUB(aTHX,a,b,c,d,e)
408409
# define newAV() Perl_newAV(aTHX)
409410
# define newAVREF(a) Perl_newAVREF(aTHX_ a)
410411
# define newAVav(a) Perl_newAVav(aTHX_ a)
@@ -447,6 +448,7 @@
447448
# define newRV_noinc(a) Perl_newRV_noinc(aTHX_ a)
448449
# define newSLICEOP(a,b,c) Perl_newSLICEOP(aTHX_ a,b,c)
449450
# define newSTATEOP(a,b,c) Perl_newSTATEOP(aTHX_ a,b,c)
451+
# define newSUB(a,b,c,d) Perl_newSUB(aTHX,a,b,c,d)
450452
# define newSV(a) Perl_newSV(aTHX_ a)
451453
# define newSVOP(a,b,c) Perl_newSVOP(aTHX_ a,b,c)
452454
# define newSVREF(a) Perl_newSVREF(aTHX_ a)

mathoms.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,6 @@ Perl_my_lstat(pTHX)
147147
return my_lstat_flags(SV_GMAGIC);
148148
}
149149

150-
CV *
151-
Perl_newSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *block)
152-
{
153-
return newATTRSUB(floor, o, proto, NULL, block);
154-
}
155-
156-
157150
STRLEN
158151
Perl_is_utf8_char_buf(const U8 *buf, const U8* buf_end)
159152
{

op.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,8 +1096,10 @@ C<sib> is non-null. For a higher-level interface, see C<L</op_sibling_splice>>.
10961096
# define OP_SIBLING(o) OpSIBLING(o)
10971097
#endif
10981098

1099-
#define newATTRSUB(f, o, p, a, b) Perl_newATTRSUB_x(aTHX_ f, o, p, a, b, FALSE)
1100-
#define newSUB(f, o, p, b) newATTRSUB((f), (o), (p), NULL, (b))
1099+
#define Perl_newATTRSUB(mTHX, f, o, p, a, b) \
1100+
Perl_newATTRSUB_x(aTHX_ f, o, p, a, b, FALSE)
1101+
#define Perl_newSUB(mTHX, f, o, p, b) \
1102+
Perl_newATTRSUB(aTHX, (f), (o), (p), NULL, (b))
11011103

11021104
#ifdef USE_ITHREADS
11031105
# define OP_CHECK_MUTEX_INIT MUTEX_INIT(&PL_check_mutex)

proto.h

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

0 commit comments

Comments
 (0)