Skip to content

Commit 1b8d682

Browse files
demerphqdemerphq
committed
WS Cleanup Stage #8 - join short continuations
1 parent 90a5ae9 commit 1b8d682

File tree

12 files changed

+69
-113
lines changed

12 files changed

+69
-113
lines changed

‎av.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@ 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

‎cop.h‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,7 @@ typedef struct rcpv RCPV;
559559
# define CopFILE(c) ((c)->cop_file)
560560
# define CopFILE_LEN(c) (CopFILE(c) ? RCPV_LEN(CopFILE(c)) : 0)
561561
# define CopFILEGV(c) \
562-
(CopFILE(c) \
563-
? gv_fetchfile(CopFILE(c)) : NULL)
562+
(CopFILE(c) ? gv_fetchfile(CopFILE(c)) : NULL)
564563

565564
# define CopFILE_set_x(c,pv) \
566565
((c)->cop_file = rcpv_new((pv),0,RCPVf_USE_STRLEN))
@@ -607,11 +606,9 @@ typedef struct rcpv RCPV;
607606

608607

609608
# define CopFILESV(c) \
610-
(CopFILE(c) \
611-
? GvSV(gv_fetchfile(CopFILE(c))) : NULL)
609+
(CopFILE(c) ? GvSV(gv_fetchfile(CopFILE(c))) : NULL)
612610
# define CopFILEAV(c) \
613-
(CopFILE(c) \
614-
? GvAV(gv_fetchfile(CopFILE(c))) : NULL)
611+
(CopFILE(c) ? GvAV(gv_fetchfile(CopFILE(c))) : NULL)
615612
# define CopFILEAVx(c) \
616613
(assert_(CopFILE(c)) \
617614
GvAV(gv_fetchfile(CopFILE(c))))
@@ -1144,22 +1141,17 @@ struct context {
11441141
#define CXp_ONCE 0x10 /* What was sbu_once in struct subst */
11451142

11461143
#define CxTYPE(c) ((c)->cx_type & CXTYPEMASK)
1147-
#define CxTYPE_is_LOOP(c) \
1148-
( CxTYPE(cx) >= CXt_LOOP_ARY \
1149-
&& CxTYPE(cx) <= CXt_LOOP_PLAIN)
1144+
#define CxTYPE_is_LOOP(c) \
1145+
( CxTYPE(cx) >= CXt_LOOP_ARY && CxTYPE(cx) <= CXt_LOOP_PLAIN)
11501146
#define CxMULTICALL(c) ((c)->cx_type & CXp_MULTICALL)
1151-
#define CxREALEVAL(c) \
1152-
(((c)->cx_type & (CXTYPEMASK|CXp_REAL)) \
1153-
== (CXt_EVAL|CXp_REAL))
1154-
#define CxEVALBLOCK(c) \
1155-
(((c)->cx_type & (CXTYPEMASK|CXp_EVALBLOCK)) \
1156-
== (CXt_EVAL|CXp_EVALBLOCK))
1157-
#define CxTRY(c) \
1158-
(((c)->cx_type & (CXTYPEMASK|CXp_TRY)) \
1159-
== (CXt_EVAL|CXp_TRY))
1160-
#define CxFOREACH(c) \
1161-
( CxTYPE(cx) >= CXt_LOOP_ARY \
1162-
&& CxTYPE(cx) <= CXt_LOOP_LIST)
1147+
#define CxREALEVAL(c) \
1148+
(((c)->cx_type & (CXTYPEMASK|CXp_REAL)) == (CXt_EVAL|CXp_REAL))
1149+
#define CxEVALBLOCK(c) \
1150+
(((c)->cx_type & (CXTYPEMASK|CXp_EVALBLOCK)) == (CXt_EVAL|CXp_EVALBLOCK))
1151+
#define CxTRY(c) \
1152+
(((c)->cx_type & (CXTYPEMASK|CXp_TRY)) == (CXt_EVAL|CXp_TRY))
1153+
#define CxFOREACH(c) \
1154+
( CxTYPE(cx) >= CXt_LOOP_ARY && CxTYPE(cx) <= CXt_LOOP_LIST)
11631155

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

‎handy.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,8 +1442,7 @@ or casts
14421442
/* The '| 0' part in ASSERT_NOT_PTR ensures a compiler error
14431443
* if c is not integer (like e.g., a pointer) */
14441444
# define FITS_IN_8_BITS(c) \
1445-
( (sizeof(c) == 1) \
1446-
|| (((WIDEST_UTYPE) ASSERT_NOT_PTR(c)) >> 8) == 0)
1445+
( (sizeof(c) == 1) || (((WIDEST_UTYPE) ASSERT_NOT_PTR(c)) >> 8) == 0)
14471446
#else
14481447
# define FITS_IN_8_BITS(c) (1)
14491448
#endif
@@ -2769,9 +2768,8 @@ PoisonWith(0xEF) for catching access to freed memory.
27692768
((_MEM_WRAP_NEEDS_RUNTIME_CHECK(n,t) ? (MEM_SIZE)(n) : \
27702769
MEM_SIZE_MAX/sizeof(t)) > MEM_SIZE_MAX/sizeof(t))
27712770

2772-
# define MEM_WRAP_CHECK(n,t) \
2773-
(void)(UNLIKELY(_MEM_WRAP_WILL_WRAP(n,t)) \
2774-
&& (croak_memory_wrap(),0))
2771+
# define MEM_WRAP_CHECK(n,t) \
2772+
(void)(UNLIKELY(_MEM_WRAP_WILL_WRAP(n,t)) && (croak_memory_wrap(),0))
27752773

27762774
# define MEM_WRAP_CHECK_1(n,t,a) \
27772775
(void)(UNLIKELY(_MEM_WRAP_WILL_WRAP(n,t)) \

‎hv_macro.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@
3535
#define U8TO32_LE(ptr) (*((const U32*)(ptr)))
3636
#define U8TO64_LE(ptr) (*((const U64*)(ptr)))
3737
#else
38-
#define U8TO16_LE(ptr) \
39-
(_shifted_octet(U16,(ptr),0, 0)| \
40-
_shifted_octet(U16,(ptr),1, 8))
38+
#define U8TO16_LE(ptr) \
39+
(_shifted_octet(U16,(ptr),0, 0)| _shifted_octet(U16,(ptr),1, 8))
4140

4241
#define U8TO32_LE(ptr) \
4342
(_shifted_octet(U32,(ptr),0, 0)| \

‎op.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -528,12 +528,10 @@ typedef enum {
528528
# define IS_PADCONST(v) \
529529
(v && (SvREADONLY(v) || (SvIsCOW(v) && !SvLEN(v))))
530530
# endif
531-
# define cSVOPx_sv(v) \
532-
(cSVOPx(v)->op_sv \
533-
? cSVOPx(v)->op_sv : PAD_SVl((v)->op_targ))
534-
# define cSVOPx_svp(v) \
535-
(cSVOPx(v)->op_sv \
536-
? &cSVOPx(v)->op_sv : &PAD_SVl((v)->op_targ))
531+
# define cSVOPx_sv(v) \
532+
(cSVOPx(v)->op_sv ? cSVOPx(v)->op_sv : PAD_SVl((v)->op_targ))
533+
# define cSVOPx_svp(v) \
534+
(cSVOPx(v)->op_sv ? &cSVOPx(v)->op_sv : &PAD_SVl((v)->op_targ))
537535
# define cMETHOPx_meth(v) \
538536
(cMETHOPx(v)->op_u.op_meth_sv \
539537
? cMETHOPx(v)->op_u.op_meth_sv : PAD_SVl((v)->op_targ))

‎op_reg_common.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ get_regex_charset(const U32 flags)
113113
| RXf_PMf_STRICT )
114114

115115
#define RXf_PMf_FLAGCOPYMASK \
116-
( RXf_PMf_COMPILETIME \
117-
| RXf_PMf_SPLIT )
116+
( RXf_PMf_COMPILETIME | RXf_PMf_SPLIT )
118117

119118
/* Temporary to get Jenkins happy again See thread starting at
120119
* http://nntp.perl.org/group/perl.perl5.porters/220710

‎perl.h‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,8 @@ Now a synonym for C<L</dTHXa>>.
288288
# define CALLREGDUPE(prog,param) \
289289
Perl_re_dup(aTHX_ (prog),(param))
290290

291-
# define CALLREGDUPE_PVT(prog,param) \
292-
(prog ? RX_ENGINE(prog)->dupe(aTHX_ (prog),(param)) \
293-
: (REGEXP *)NULL)
291+
# define CALLREGDUPE_PVT(prog,param) \
292+
(prog ? RX_ENGINE(prog)->dupe(aTHX_ (prog),(param)) : (REGEXP *)NULL)
294293
#endif
295294

296295
/* some compilers impersonate gcc */
@@ -6879,8 +6878,7 @@ typedef struct am_table_short AMTS;
68796878
/* Returns TRUE if the plain locale pragma
68806879
* without a parameter is in effect. */
68816880
# define IN_LOCALE_RUNTIME \
6882-
(PL_curcop \
6883-
&& CopHINTS_get(PL_curcop) & HINT_LOCALE)
6881+
(PL_curcop && CopHINTS_get(PL_curcop) & HINT_LOCALE)
68846882

68856883
/* Returns TRUE if either form of the locale pragma is in effect */
68866884
# define IN_SOME_LOCALE_FORM_RUNTIME \
@@ -8155,8 +8153,7 @@ extern void moncontrol(int);
81558153
PERL_UNICODE_STDERR_FLAG)
81568154

81578155
#define PERL_UNICODE_INOUT_FLAG \
8158-
(PERL_UNICODE_IN_FLAG | \
8159-
PERL_UNICODE_OUT_FLAG)
8156+
(PERL_UNICODE_IN_FLAG | PERL_UNICODE_OUT_FLAG)
81608157

81618158
#define PERL_UNICODE_DEFAULT_FLAGS \
81628159
(PERL_UNICODE_STD_FLAG | \

‎regcomp.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,12 +407,10 @@ struct regnode_ssc {
407407
(((struct regnode_lstring *)p)->string))
408408
#define OPERANDl(p) STRINGl(p)
409409

410-
#define STR_LEN(p) \
411-
((OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \
412-
? STR_LENl(p) : STR_LENs(p))
413-
#define STRING(p) \
414-
((OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \
415-
? STRINGl(p) : STRINGs(p))
410+
#define STR_LEN(p) \
411+
((OP(p) == LEXACT || OP(p) == LEXACT_REQ8) ? STR_LENl(p) : STR_LENs(p))
412+
#define STRING(p) \
413+
((OP(p) == LEXACT || OP(p) == LEXACT_REQ8) ? STRINGl(p) : STRINGs(p))
416414
#define OPERAND(p) STRING(p)
417415

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

‎regcomp_internal.h‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,8 @@ struct RExC_state_t {
367367
RExC_naughty += RExC_naughty / (exp) + (add)
368368

369369
#define isNON_BRACE_QUANTIFIER(c) ((c) == '*' || (c) == '+' || (c) == '?')
370-
#define isQUANTIFIER(s,e) \
371-
( isNON_BRACE_QUANTIFIER(*s) \
372-
|| ((*s) == '{' && regcurly(s, e, NULL)))
370+
#define isQUANTIFIER(s,e) \
371+
( isNON_BRACE_QUANTIFIER(*s) || ((*s) == '{' && regcurly(s, e, NULL)))
373372

374373
/*
375374
* Flags to be passed up.
@@ -691,22 +690,17 @@ static const scan_data_t zero_scan_data = {
691690

692691
/* The enums for all these are ordered so things work out correctly */
693692
#define LOC (get_regex_charset(RExC_flags) == REGEX_LOCALE_CHARSET)
694-
#define DEPENDS_SEMANTICS \
695-
(get_regex_charset(RExC_flags) \
696-
== REGEX_DEPENDS_CHARSET)
693+
#define DEPENDS_SEMANTICS \
694+
(get_regex_charset(RExC_flags) == REGEX_DEPENDS_CHARSET)
697695
#define UNI_SEMANTICS (get_regex_charset(RExC_flags) == REGEX_UNICODE_CHARSET)
698-
#define AT_LEAST_UNI_SEMANTICS \
699-
(get_regex_charset(RExC_flags) \
700-
>= REGEX_UNICODE_CHARSET)
701-
#define ASCII_RESTRICTED \
702-
(get_regex_charset(RExC_flags) \
703-
== REGEX_ASCII_RESTRICTED_CHARSET)
696+
#define AT_LEAST_UNI_SEMANTICS \
697+
(get_regex_charset(RExC_flags) >= REGEX_UNICODE_CHARSET)
698+
#define ASCII_RESTRICTED \
699+
(get_regex_charset(RExC_flags) == REGEX_ASCII_RESTRICTED_CHARSET)
704700
#define AT_LEAST_ASCII_RESTRICTED \
705-
(get_regex_charset(RExC_flags) \
706-
>= REGEX_ASCII_RESTRICTED_CHARSET)
707-
#define ASCII_FOLD_RESTRICTED \
708-
(get_regex_charset(RExC_flags) \
709-
== REGEX_ASCII_MORE_RESTRICTED_CHARSET)
701+
(get_regex_charset(RExC_flags) >= REGEX_ASCII_RESTRICTED_CHARSET)
702+
#define ASCII_FOLD_RESTRICTED \
703+
(get_regex_charset(RExC_flags) == REGEX_ASCII_MORE_RESTRICTED_CHARSET)
710704

711705
#define FOLD cBOOL(RExC_flags & RXf_PMf_FOLD)
712706

‎regexp.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -533,17 +533,14 @@ SvRX instead and check for NULL.
533533

534534
/* For source compatibility. We used to store these explicitly. */
535535
# define RX_PRECOMP(rx_sv) \
536-
(RX_WRAPPED(rx_sv) \
537-
+ ReANY(rx_sv)->pre_prefix)
536+
(RX_WRAPPED(rx_sv) + ReANY(rx_sv)->pre_prefix)
538537
# define RX_PRECOMP_const(rx_sv) \
539-
(RX_WRAPPED_const(rx_sv) \
540-
+ ReANY(rx_sv)->pre_prefix)
538+
(RX_WRAPPED_const(rx_sv) + ReANY(rx_sv)->pre_prefix)
541539
/* FIXME? Are we hardcoding too much here and constraining plugin extension
542540
writers? Specifically, the value 1 assumes that the wrapped version always
543541
has exactly one character at the end, a ')'. Will that always be true? */
544542
# define RX_PRELEN(rx_sv) \
545-
(RX_WRAPLEN(rx_sv) \
546-
- ReANY(rx_sv)->pre_prefix - 1)
543+
(RX_WRAPLEN(rx_sv) - ReANY(rx_sv)->pre_prefix - 1)
547544

548545
# define RX_WRAPPED(rx_sv) SvPVX(rx_sv)
549546
# define RX_WRAPPED_const(rx_sv) SvPVX_const(rx_sv)

0 commit comments

Comments
 (0)