Skip to content

Commit b2de5b4

Browse files
demerphqdemerphq
committed
WS Cleanup Stage #7 - join short continuations
1 parent 05a56f4 commit b2de5b4

File tree

10 files changed

+57
-94
lines changed

10 files changed

+57
-94
lines changed

Diff for: ‎av.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@ If all you need is to look up an array element, then prefer C<av_fetch>.
9393

9494
#define AvREALISH(av) (SvFLAGS(av) & (SVpav_REAL|SVpav_REIFY))
9595

96-
#define AvFILL(av) \
97-
((SvRMAGICAL((const SV *) (av))) \
98-
? mg_size(MUTABLE_SV(av)) : AvFILLp(av))
96+
#define AvFILL(av) \
97+
((SvRMAGICAL((const SV *) (av))) ? mg_size(MUTABLE_SV(av)) : AvFILLp(av))
9998
#define av_top_index(av) AvFILL(av)
10099
#define av_tindex(av) av_top_index(av)
101100

Diff for: ‎cop.h

+13-21
Original file line numberDiff line numberDiff line change
@@ -510,18 +510,15 @@ string C<p>, creating the package if necessary.
510510

511511
# define CopFILE(c) ((c)->cop_file)
512512
# define CopFILEGV(c) \
513-
(CopFILE(c) \
514-
? gv_fetchfile(CopFILE(c)) : NULL)
513+
(CopFILE(c) ? gv_fetchfile(CopFILE(c)) : NULL)
515514

516515
# define CopFILE_set(c,pv) ((c)->cop_file = savesharedpv(pv))
517516
# define CopFILE_setn(c,pv,l) ((c)->cop_file = savesharedpvn((pv),(l)))
518517

519518
# define CopFILESV(c) \
520-
(CopFILE(c) \
521-
? GvSV(gv_fetchfile(CopFILE(c))) : NULL)
519+
(CopFILE(c) ? GvSV(gv_fetchfile(CopFILE(c))) : NULL)
522520
# define CopFILEAV(c) \
523-
(CopFILE(c) \
524-
? GvAV(gv_fetchfile(CopFILE(c))) : NULL)
521+
(CopFILE(c) ? GvAV(gv_fetchfile(CopFILE(c))) : NULL)
525522
# define CopFILEAVx(c) \
526523
(assert_(CopFILE(c)) \
527524
GvAV(gv_fetchfile(CopFILE(c))))
@@ -1053,22 +1050,17 @@ struct context {
10531050
#define CXp_ONCE 0x10 /* What was sbu_once in struct subst */
10541051

10551052
#define CxTYPE(c) ((c)->cx_type & CXTYPEMASK)
1056-
#define CxTYPE_is_LOOP(c) \
1057-
( CxTYPE(cx) >= CXt_LOOP_ARY \
1058-
&& CxTYPE(cx) <= CXt_LOOP_PLAIN)
1053+
#define CxTYPE_is_LOOP(c) \
1054+
( CxTYPE(cx) >= CXt_LOOP_ARY && CxTYPE(cx) <= CXt_LOOP_PLAIN)
10591055
#define CxMULTICALL(c) ((c)->cx_type & CXp_MULTICALL)
1060-
#define CxREALEVAL(c) \
1061-
(((c)->cx_type & (CXTYPEMASK|CXp_REAL)) \
1062-
== (CXt_EVAL|CXp_REAL))
1063-
#define CxEVALBLOCK(c) \
1064-
(((c)->cx_type & (CXTYPEMASK|CXp_EVALBLOCK)) \
1065-
== (CXt_EVAL|CXp_EVALBLOCK))
1066-
#define CxTRY(c) \
1067-
(((c)->cx_type & (CXTYPEMASK|CXp_TRY)) \
1068-
== (CXt_EVAL|CXp_TRY))
1069-
#define CxFOREACH(c) \
1070-
( CxTYPE(cx) >= CXt_LOOP_ARY \
1071-
&& CxTYPE(cx) <= CXt_LOOP_LIST)
1056+
#define CxREALEVAL(c) \
1057+
(((c)->cx_type & (CXTYPEMASK|CXp_REAL)) == (CXt_EVAL|CXp_REAL))
1058+
#define CxEVALBLOCK(c) \
1059+
(((c)->cx_type & (CXTYPEMASK|CXp_EVALBLOCK)) == (CXt_EVAL|CXp_EVALBLOCK))
1060+
#define CxTRY(c) \
1061+
(((c)->cx_type & (CXTYPEMASK|CXp_TRY)) == (CXt_EVAL|CXp_TRY))
1062+
#define CxFOREACH(c) \
1063+
( CxTYPE(cx) >= CXt_LOOP_ARY && CxTYPE(cx) <= CXt_LOOP_LIST)
10721064

10731065
/* private flags for CXt_DEFER */
10741066
#define CXp_FINALLY 0x20 /* `finally` block; semantically identical

Diff for: ‎handy.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -1433,8 +1433,7 @@ or casts
14331433
/* The '| 0' part in ASSERT_NOT_PTR ensures a compiler error if c is not
14341434
* integer (like e.g., a pointer) */
14351435
# define FITS_IN_8_BITS(c) \
1436-
( (sizeof(c) == 1) \
1437-
|| (((WIDEST_UTYPE) ASSERT_NOT_PTR(c)) >> 8) == 0)
1436+
( (sizeof(c) == 1) || (((WIDEST_UTYPE) ASSERT_NOT_PTR(c)) >> 8) == 0)
14381437
#else
14391438
# define FITS_IN_8_BITS(c) (1)
14401439
#endif
@@ -2761,9 +2760,8 @@ PoisonWith(0xEF) for catching access to freed memory.
27612760
((_MEM_WRAP_NEEDS_RUNTIME_CHECK(n,t) ? (MEM_SIZE)(n) : \
27622761
MEM_SIZE_MAX/sizeof(t)) > MEM_SIZE_MAX/sizeof(t))
27632762

2764-
# define MEM_WRAP_CHECK(n,t) \
2765-
(void)(UNLIKELY(_MEM_WRAP_WILL_WRAP(n,t)) \
2766-
&& (croak_memory_wrap(),0))
2763+
# define MEM_WRAP_CHECK(n,t) \
2764+
(void)(UNLIKELY(_MEM_WRAP_WILL_WRAP(n,t)) && (croak_memory_wrap(),0))
27672765

27682766
# define MEM_WRAP_CHECK_1(n,t,a) \
27692767
(void)(UNLIKELY(_MEM_WRAP_WILL_WRAP(n,t)) \

Diff for: ‎hv_macro.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@
3737
#define U8TO32_LE(ptr) (*((const U32*)(ptr)))
3838
#define U8TO64_LE(ptr) (*((const U64*)(ptr)))
3939
#else
40-
#define U8TO16_LE(ptr) \
41-
(_shifted_octet(U16,(ptr),0, 0)| \
42-
_shifted_octet(U16,(ptr),1, 8))
40+
#define U8TO16_LE(ptr) \
41+
(_shifted_octet(U16,(ptr),0, 0)| _shifted_octet(U16,(ptr),1, 8))
4342

4443
#define U8TO32_LE(ptr) \
4544
(_shifted_octet(U32,(ptr),0, 0)| \

Diff for: ‎op.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -535,12 +535,10 @@ typedef enum {
535535
# define IS_PADCONST(v) \
536536
(v && (SvREADONLY(v) || (SvIsCOW(v) && !SvLEN(v))))
537537
# endif
538-
# define cSVOPx_sv(v) \
539-
(cSVOPx(v)->op_sv \
540-
? cSVOPx(v)->op_sv : PAD_SVl((v)->op_targ))
541-
# define cSVOPx_svp(v) \
542-
(cSVOPx(v)->op_sv \
543-
? &cSVOPx(v)->op_sv : &PAD_SVl((v)->op_targ))
538+
# define cSVOPx_sv(v) \
539+
(cSVOPx(v)->op_sv ? cSVOPx(v)->op_sv : PAD_SVl((v)->op_targ))
540+
# define cSVOPx_svp(v) \
541+
(cSVOPx(v)->op_sv ? &cSVOPx(v)->op_sv : &PAD_SVl((v)->op_targ))
544542
# define cMETHOPx_meth(v) \
545543
(cMETHOPx(v)->op_u.op_meth_sv \
546544
? cMETHOPx(v)->op_u.op_meth_sv : PAD_SVl((v)->op_targ))

Diff for: ‎perl.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,8 @@ Now a no-op.
291291
# define CALLREGDUPE(prog,param) \
292292
Perl_re_dup(aTHX_ (prog),(param))
293293

294-
# define CALLREGDUPE_PVT(prog,param) \
295-
(prog ? RX_ENGINE(prog)->dupe(aTHX_ (prog),(param)) \
296-
: (REGEXP *)NULL)
294+
# define CALLREGDUPE_PVT(prog,param) \
295+
(prog ? RX_ENGINE(prog)->dupe(aTHX_ (prog),(param)) : (REGEXP *)NULL)
297296
#endif
298297

299298
/* some compilers impersonate gcc */
@@ -6979,8 +6978,7 @@ typedef struct am_table_short AMTS;
69796978
/* Returns TRUE if the plain locale pragma without a parameter is in effect.
69806979
* */
69816980
# define IN_LOCALE_RUNTIME \
6982-
(PL_curcop \
6983-
&& CopHINTS_get(PL_curcop) & HINT_LOCALE)
6981+
(PL_curcop && CopHINTS_get(PL_curcop) & HINT_LOCALE)
69846982

69856983
/* Returns TRUE if either form of the locale pragma is in effect */
69866984
# define IN_SOME_LOCALE_FORM_RUNTIME \
@@ -8093,8 +8091,7 @@ extern void moncontrol(int);
80938091
PERL_UNICODE_STDERR_FLAG)
80948092

80958093
#define PERL_UNICODE_INOUT_FLAG \
8096-
(PERL_UNICODE_IN_FLAG | \
8097-
PERL_UNICODE_OUT_FLAG)
8094+
(PERL_UNICODE_IN_FLAG | PERL_UNICODE_OUT_FLAG)
80988095

80998096
#define PERL_UNICODE_DEFAULT_FLAGS \
81008097
(PERL_UNICODE_STD_FLAG | \

Diff for: ‎regcomp.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -410,12 +410,10 @@ struct regnode_ssc {
410410
(((struct regnode_lstring *)p)->string))
411411
#define OPERANDl(p) STRINGl(p)
412412

413-
#define STR_LEN(p) \
414-
((OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \
415-
? STR_LENl(p) : STR_LENs(p))
416-
#define STRING(p) \
417-
((OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \
418-
? STRINGl(p) : STRINGs(p))
413+
#define STR_LEN(p) \
414+
((OP(p) == LEXACT || OP(p) == LEXACT_REQ8) ? STR_LENl(p) : STR_LENs(p))
415+
#define STRING(p) \
416+
((OP(p) == LEXACT || OP(p) == LEXACT_REQ8) ? STRINGl(p) : STRINGs(p))
419417
#define OPERAND(p) STRING(p)
420418

421419
/* The number of (smallest) regnode equivalents that a string of length l bytes

Diff for: ‎regexp.h

+3-6
Original file line numberDiff line numberDiff line change
@@ -531,17 +531,14 @@ and check for NULL.
531531

532532
/* For source compatibility. We used to store these explicitly. */
533533
# define RX_PRECOMP(rx_sv) \
534-
(RX_WRAPPED(rx_sv) \
535-
+ ReANY(rx_sv)->pre_prefix)
534+
(RX_WRAPPED(rx_sv) + ReANY(rx_sv)->pre_prefix)
536535
# define RX_PRECOMP_const(rx_sv) \
537-
(RX_WRAPPED_const(rx_sv) \
538-
+ ReANY(rx_sv)->pre_prefix)
536+
(RX_WRAPPED_const(rx_sv) + ReANY(rx_sv)->pre_prefix)
539537
/* FIXME? Are we hardcoding too much here and constraining plugin extension
540538
writers? Specifically, the value 1 assumes that the wrapped version always
541539
has exactly one character at the end, a ')'. Will that always be true? */
542540
# define RX_PRELEN(rx_sv) \
543-
(RX_WRAPLEN(rx_sv) \
544-
- ReANY(rx_sv)->pre_prefix - 1)
541+
(RX_WRAPLEN(rx_sv) - ReANY(rx_sv)->pre_prefix - 1)
545542

546543
# define RX_WRAPPED(rx_sv) SvPVX(rx_sv)
547544
# define RX_WRAPPED_const(rx_sv) SvPVX_const(rx_sv)

Diff for: ‎sv.h

+21-35
Original file line numberDiff line numberDiff line change
@@ -436,13 +436,11 @@ perform the upgrade if necessary. See C<L</svtype>>.
436436

437437

438438

439-
#define SVf_THINKFIRST \
440-
(SVf_READONLY|SVf_PROTECT|SVf_ROK|SVf_FAKE \
441-
|SVs_RMG|SVf_IsCOW)
439+
#define SVf_THINKFIRST \
440+
(SVf_READONLY|SVf_PROTECT|SVf_ROK|SVf_FAKE |SVs_RMG|SVf_IsCOW)
442441

443-
#define SVf_OK \
444-
(SVf_IOK|SVf_NOK|SVf_POK|SVf_ROK| \
445-
SVp_IOK|SVp_NOK|SVp_POK|SVpgv_GP)
442+
#define SVf_OK \
443+
(SVf_IOK|SVf_NOK|SVf_POK|SVf_ROK| SVp_IOK|SVp_NOK|SVp_POK|SVpgv_GP)
446444

447445
#define PRIVSHIFT 4 /* (SVp_?OK >> PRIVSHIFT) == SVf_?OK */
448446

@@ -931,9 +929,8 @@ Set the size of the string buffer for the SV. See C<L</SvLEN>>.
931929

932930
#define SvNIOK(sv) (SvFLAGS(sv) & (SVf_IOK|SVf_NOK))
933931
#define SvNIOKp(sv) (SvFLAGS(sv) & (SVp_IOK|SVp_NOK))
934-
#define SvNIOK_off(sv) \
935-
(SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK| \
936-
SVp_IOK|SVp_NOK|SVf_IVisUV))
932+
#define SvNIOK_off(sv) \
933+
(SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK| SVp_IOK|SVp_NOK|SVf_IVisUV))
937934

938935
#define assert_not_ROK(sv) assert_(!SvROK(sv) || !SvRV(sv))
939936
#define assert_not_glob(sv) assert_(!isGV_with_GP(sv))
@@ -968,19 +965,16 @@ Set the size of the string buffer for the SV. See C<L</SvLEN>>.
968965
SvFLAGS(sv) |= (SVf_IOK|SVp_IOK))
969966
#define SvIOK_off(sv) (SvFLAGS(sv) &= ~(SVf_IOK|SVp_IOK|SVf_IVisUV))
970967
#define SvIOK_only(sv) \
971-
(SvOK_off(sv), \
972-
SvFLAGS(sv) |= (SVf_IOK|SVp_IOK))
968+
(SvOK_off(sv), SvFLAGS(sv) |= (SVf_IOK|SVp_IOK))
973969
#define SvIOK_only_UV(sv) \
974970
(assert_not_glob(sv) SvOK_off_exc_UV(sv), \
975971
SvFLAGS(sv) |= (SVf_IOK|SVp_IOK))
976972

977-
#define SvIOK_UV(sv) \
978-
((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV)) \
979-
== (SVf_IOK|SVf_IVisUV))
973+
#define SvIOK_UV(sv) \
974+
((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV)) == (SVf_IOK|SVf_IVisUV))
980975
#define SvUOK(sv) SvIOK_UV(sv)
981-
#define SvIOK_notUV(sv) \
982-
((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV)) \
983-
== SVf_IOK)
976+
#define SvIOK_notUV(sv) \
977+
((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV)) == SVf_IOK)
984978

985979
#define SvIandPOK(sv) \
986980
((SvFLAGS(sv) & (SVf_IOK|SVf_POK)) == (SVf_IOK|SVf_POK))
@@ -996,11 +990,9 @@ Set the size of the string buffer for the SV. See C<L</SvLEN>>.
996990
(SvIsCOW_static(sv) && \
997991
(SvPVX_const(sv) == PL_Yes || SvPVX_const(sv) == PL_No))
998992
#define BOOL_INTERNALS_sv_isbool_true(sv) \
999-
(SvIsCOW_static(sv) && \
1000-
(SvPVX_const(sv) == PL_Yes))
993+
(SvIsCOW_static(sv) && (SvPVX_const(sv) == PL_Yes))
1001994
#define BOOL_INTERNALS_sv_isbool_false(sv) \
1002-
(SvIsCOW_static(sv) && \
1003-
(SvPVX_const(sv) == PL_No))
995+
(SvIsCOW_static(sv) && (SvPVX_const(sv) == PL_No))
1004996

1005997
#define SvIsUV(sv) (SvFLAGS(sv) & SVf_IVisUV)
1006998
#define SvIsUV_on(sv) (SvFLAGS(sv) |= SVf_IVisUV)
@@ -1012,8 +1004,7 @@ Set the size of the string buffer for the SV. See C<L</SvLEN>>.
10121004
SvFLAGS(sv) |= (SVf_NOK|SVp_NOK))
10131005
#define SvNOK_off(sv) (SvFLAGS(sv) &= ~(SVf_NOK|SVp_NOK))
10141006
#define SvNOK_only(sv) \
1015-
(SvOK_off(sv), \
1016-
SvFLAGS(sv) |= (SVf_NOK|SVp_NOK))
1007+
(SvOK_off(sv), SvFLAGS(sv) |= (SVf_NOK|SVp_NOK))
10171008

10181009
/*
10191010
=for apidoc Am|U32|SvUTF8|SV* sv
@@ -1063,8 +1054,7 @@ in gv.h: */
10631054
SvFLAGS(sv) |= (SVf_POK|SVp_POK))
10641055

10651056
#define SvVOK(sv) \
1066-
(SvMAGICAL(sv) \
1067-
&& mg_find(sv,PERL_MAGIC_vstring))
1057+
(SvMAGICAL(sv) && mg_find(sv,PERL_MAGIC_vstring))
10681058
/*
10691059
=for apidoc Am|MAGIC*|SvVSTRING_mg|SV * sv
10701060
@@ -1073,8 +1063,7 @@ Returns the vstring magic, or NULL if none
10731063
=cut
10741064
*/
10751065
#define SvVSTRING_mg(sv) \
1076-
(SvMAGICAL(sv) \
1077-
? mg_find(sv,PERL_MAGIC_vstring) : NULL)
1066+
(SvMAGICAL(sv) ? mg_find(sv,PERL_MAGIC_vstring) : NULL)
10781067

10791068
#define SvOOK(sv) (SvFLAGS(sv) & SVf_OOK)
10801069
#define SvOOK_on(sv) (SvFLAGS(sv) |= SVf_OOK)
@@ -1123,9 +1112,8 @@ not.
11231112
=cut
11241113
*/
11251114

1126-
#define SvAMAGIC(sv) \
1127-
(SvROK(sv) && SvOBJECT(SvRV(sv)) && \
1128-
HvAMAGIC(SvSTASH(SvRV(sv))))
1115+
#define SvAMAGIC(sv) \
1116+
(SvROK(sv) && SvOBJECT(SvRV(sv)) && HvAMAGIC(SvSTASH(SvRV(sv))))
11291117

11301118
/* To be used on the stashes themselves: */
11311119
#define HvAMAGIC(hv) (SvFLAGS(hv) & SVf_AMAGIC)
@@ -1201,9 +1189,8 @@ the scalar's value cannot change unless written to.
12011189
? 1 \
12021190
: (HvAMAGIC_off(stash), 0))
12031191

1204-
#define SvWEAKREF(sv) \
1205-
((SvFLAGS(sv) & (SVf_ROK|SVprv_WEAKREF)) \
1206-
== (SVf_ROK|SVprv_WEAKREF))
1192+
#define SvWEAKREF(sv) \
1193+
((SvFLAGS(sv) & (SVf_ROK|SVprv_WEAKREF)) == (SVf_ROK|SVprv_WEAKREF))
12071194
#define SvWEAKREF_on(sv) (SvFLAGS(sv) |= (SVf_ROK|SVprv_WEAKREF))
12081195
#define SvWEAKREF_off(sv) (SvFLAGS(sv) &= ~(SVf_ROK|SVprv_WEAKREF))
12091196

@@ -2413,8 +2400,7 @@ properly null terminated. Equivalent to sv_setpvs(""), but more efficient.
24132400

24142401
/* the SvREADONLY() test is to quickly reject most SVs */
24152402
#define SvIMMORTAL(sv) \
2416-
( SvREADONLY(sv) \
2417-
&& (SvIMMORTAL_INTERP(sv) || (sv) == &PL_sv_placeholder))
2403+
( SvREADONLY(sv) && (SvIMMORTAL_INTERP(sv) || (sv) == &PL_sv_placeholder))
24182404

24192405
#ifdef DEBUGGING
24202406
/* exercise the immortal resurrection code in sv_free2() */

Diff for: ‎util.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
|| ((f)[0] && (f)[1] == ':')) /* drive name */
2626
#elif defined(DOSISH)
2727
# define PERL_FILE_IS_ABSOLUTE(f) \
28-
(*(f) == '/' \
29-
|| ((f)[0] && (f)[1] == ':')) /* drive name */
28+
(*(f) == '/' || ((f)[0] && (f)[1] == ':')) /* drive name */
3029
#else /* NOT DOSISH */
3130
# define PERL_FILE_IS_ABSOLUTE(f) (*(f) == '/')
3231
#endif

0 commit comments

Comments
 (0)