From d288038658cf782fe31637764f749845de37a0dd Mon Sep 17 00:00:00 2001 From: Yves Orton Date: Mon, 12 Sep 2022 19:02:25 +0200 Subject: [PATCH] WS Cleanup Stage #5 - break long define For long define statements put the replacement part on their own line. Also wrap comments on long lines. --- XSUB.h | 3 +- cop.h | 15 ++++-- cv.h | 6 ++- dosish.h | 3 +- gv.h | 24 ++++++--- handy.h | 65 +++++++++++++++--------- hv.h | 15 ++++-- hv_func.h | 36 +++++++++----- hv_macro.h | 3 +- inline.h | 6 ++- iperlsys.h | 12 +++-- op.h | 9 ++-- op_reg_common.h | 3 +- perl.h | 126 +++++++++++++++++++++++++++++++---------------- perl_inc_macro.h | 15 ++++-- pp.h | 18 ++++--- regcomp.h | 42 ++++++++++------ regexp.h | 45 +++++++++++------ sbox32_hash.h | 3 +- scope.h | 9 ++-- sv.h | 82 +++++++++++++++++++----------- thread.h | 9 ++-- utf8.h | 3 +- utfebcdic.h | 12 +++-- util.h | 12 +++-- vutil.h | 9 ++-- zaphod32_hash.h | 3 +- 27 files changed, 391 insertions(+), 197 deletions(-) diff --git a/XSUB.h b/XSUB.h index 2249185be71e..a77c34e5303d 100644 --- a/XSUB.h +++ b/XSUB.h @@ -386,7 +386,8 @@ Rethrows a previously caught exception. See L. HS_CXT, __FILE__, "v" PERL_API_VERSION_STRING, XS_VERSION) #else /* should this be a #error? if you want both checked, you better supply XS_VERSION right? */ -# define XS_BOTHVERSION_SETXSUBFN_POPMARK_BOOTCHECK XS_APIVERSION_SETXSUBFN_POPMARK_BOOTCHECK +# define XS_BOTHVERSION_SETXSUBFN_POPMARK_BOOTCHECK \ + XS_APIVERSION_SETXSUBFN_POPMARK_BOOTCHECK #endif /* For a normal bootstrap without API or XS version checking. diff --git a/cop.h b/cop.h index 6962d74db562..5c89dd6b5d24 100644 --- a/cop.h +++ b/cop.h @@ -531,14 +531,16 @@ string C

, creating the package if necessary. ((c)->cop_stashoff = (hv) \ ? alloccopstash(hv) \ : 0) -# define CopFILE_free(c) (PerlMemShared_free(CopFILE(c)),(CopFILE(c) = NULL)) +# define CopFILE_free(c) \ + (PerlMemShared_free(CopFILE(c)),(CopFILE(c) = NULL)) #else /* Above: yes threads; Below no threads */ # define CopFILEGV(c) ((c)->cop_filegv) # define CopFILEGV_set(c,gv) ((c)->cop_filegv = (GV*)SvREFCNT_inc(gv)) # define CopFILE_set(c,pv) CopFILEGV_set((c), gv_fetchfile(pv)) -# define CopFILE_setn(c,pv,l) CopFILEGV_set((c), gv_fetchfile_flags((pv),(l),0)) +# define CopFILE_setn(c,pv,l) \ + CopFILEGV_set((c), gv_fetchfile_flags((pv),(l),0)) # define CopFILESV(c) (CopFILEGV(c) ? GvSV(CopFILEGV(c)) : NULL) # define CopFILEAV(c) (CopFILEGV(c) ? GvAV(CopFILEGV(c)) : NULL) # ifdef DEBUGGING @@ -552,7 +554,8 @@ string C

, creating the package if necessary. ? GvNAME(CopFILEGV(c))+2 : NULL) # define CopSTASH(c) ((c)->cop_stash) # define CopSTASH_set(c,hv) ((c)->cop_stash = (hv)) -# define CopFILE_free(c) (SvREFCNT_dec(CopFILEGV(c)),(CopFILEGV(c) = NULL)) +# define CopFILE_free(c) \ + (SvREFCNT_dec(CopFILEGV(c)),(CopFILEGV(c) = NULL)) #endif /* USE_ITHREADS */ @@ -683,7 +686,8 @@ by setting C<*flags> to 0 or C. #define CopLABEL(c) Perl_cop_fetch_label(aTHX_ (c), NULL, NULL) #define CopLABEL_len(c,len) Perl_cop_fetch_label(aTHX_ (c), len, NULL) -#define CopLABEL_len_flags(c,len,flags) Perl_cop_fetch_label(aTHX_ (c), len, flags) +#define CopLABEL_len_flags(c,len,flags) \ + Perl_cop_fetch_label(aTHX_ (c), len, flags) #define CopLABEL_alloc(pv) ((pv)?savepv(pv):NULL) #define CopSTASH_ne(c,hv) (!CopSTASH_eq(c,hv)) @@ -841,7 +845,8 @@ struct block_loop { #define CxLABEL(c) (CopLABEL((c)->blk_oldcop)) #define CxLABEL_len(c,len) (CopLABEL_len((c)->blk_oldcop, len)) -#define CxLABEL_len_flags(c,len,flags) ((const char *)CopLABEL_len_flags((c)->blk_oldcop, len, flags)) +#define CxLABEL_len_flags(c,len,flags) \ + ((const char *)CopLABEL_len_flags((c)->blk_oldcop, len, flags)) #define CxHASARGS(c) (((c)->cx_type & CXp_HASARGS) == CXp_HASARGS) /* CxLVAL(): the lval flags of the call site: the relevant flag bits from diff --git a/cv.h b/cv.h index d92f4ae28c34..e4058817d71c 100644 --- a/cv.h +++ b/cv.h @@ -38,12 +38,14 @@ See L. # define Nullcv Null(CV*) #endif -#define CvSTASH(sv) (MUTABLE_HV(((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_stash)) +#define CvSTASH(sv) \ + (MUTABLE_HV(((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_stash)) #define CvSTASH_set(cv,st) Perl_cvstash_set(aTHX_ cv, st) #define CvSTART(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_start_u.xcv_start #define CvROOT(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_root_u.xcv_root #define CvXSUB(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_root_u.xcv_xsub -#define CvXSUBANY(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_start_u.xcv_xsubany +#define CvXSUBANY(sv) \ + ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_start_u.xcv_xsubany #define CvGV(sv) Perl_CvGV(aTHX_ (CV *)(sv)) #define CvGV_set(cv,gv) Perl_cvgv_set(aTHX_ cv, gv) #define CvHASGV(cv) cBOOL(SvANY(cv)->xcv_gv_u.xcv_gv) diff --git a/dosish.h b/dosish.h index 4c4bec1800ba..5a521b16ff33 100644 --- a/dosish.h +++ b/dosish.h @@ -21,7 +21,8 @@ #else # define PERL_SYS_INIT_BODY(c,v) \ MALLOC_CHECK_TAINT2(*c,*v); PERLIO_INIT -# define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined, or somethin?" */ +# define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined, + or somethin?" */ #endif /* Generally add things last-in first-terminated. IO and memory terminations diff --git a/gv.h b/gv.h index 1b6326531191..cfa114ec21dd 100644 --- a/gv.h +++ b/gv.h @@ -54,9 +54,12 @@ struct gp { assert(SvTYPE(_gvname_hek) == SVt_PVGV || SvTYPE(_gvname_hek) >= SVt_PVLV); \ &(GvXPVGV(_gvname_hek)->xiv_u.xivu_namehek); \ })) -# define GvNAME_get(gv) ({ assert(GvNAME_HEK(gv)); (char *)HEK_KEY(GvNAME_HEK(gv)); }) -# define GvNAMELEN_get(gv) ({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); }) -# define GvNAMEUTF8(gv) ({ assert(GvNAME_HEK(gv)); HEK_UTF8(GvNAME_HEK(gv)); }) +# define GvNAME_get(gv) \ + ({ assert(GvNAME_HEK(gv)); (char *)HEK_KEY(GvNAME_HEK(gv)); }) +# define GvNAMELEN_get(gv) \ + ({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); }) +# define GvNAMEUTF8(gv) \ + ({ assert(GvNAME_HEK(gv)); HEK_UTF8(GvNAME_HEK(gv)); }) #else # define GvGP(gv) (0+(gv)->sv_u.svu_gp) # define GvGP_set(gv,gp) ((gv)->sv_u.svu_gp = (gp)) @@ -228,9 +231,11 @@ Return the CV from the GV. time, so don't try to free what's there. */ #define GV_ADDMULTI 0x02 /* add, pretending it has been added already; used also by gv_init_* */ -#define GV_ADDWARN 0x04 /* add, but warn if symbol wasn't already there */ +#define GV_ADDWARN 0x04 /* add, but warn if symbol wasn't + already there */ /* 0x08 UNUSED */ -#define GV_NOINIT 0x10 /* add, but don't init symbol, if type != PVGV */ +#define GV_NOINIT 0x10 /* add, but don't init symbol, + if type != PVGV */ /* This is used by toke.c to avoid turing placeholder constants in the symbol table into full PVGVs with attached constant subroutines. */ #define GV_NOADD_NOINIT 0x20 /* Don't add the symbol if it's not there. @@ -273,9 +278,12 @@ Return the CV from the GV. #define gv_fetchsv_nomg(n,f,t) gv_fetchsv(n,(f)|GV_NO_SVGMAGIC,t) #define gv_init(gv,stash,name,len,multi) \ gv_init_pvn(gv,stash,name,len,GV_ADDMULTI*cBOOL(multi)) -#define gv_fetchmeth(stash,name,len,level) gv_fetchmeth_pvn(stash, name, len, level, 0) -#define gv_fetchmeth_autoload(stash,name,len,level) gv_fetchmeth_pvn_autoload(stash, name, len, level, 0) -#define gv_fetchmethod_flags(stash,name,flags) gv_fetchmethod_pv_flags(stash, name, flags) +#define gv_fetchmeth(stash,name,len,level) \ + gv_fetchmeth_pvn(stash, name, len, level, 0) +#define gv_fetchmeth_autoload(stash,name,len,level) \ + gv_fetchmeth_pvn_autoload(stash, name, len, level, 0) +#define gv_fetchmethod_flags(stash,name,flags) \ + gv_fetchmethod_pv_flags(stash, name, flags) /* =for apidoc gv_autoload4 diff --git a/handy.h b/handy.h index d9228b0015e6..a8b5183dabc5 100644 --- a/handy.h +++ b/handy.h @@ -457,7 +457,8 @@ Perl_xxx(aTHX_ ...) form for any API calls where it's used. Perl_sv_catxmlpvn(aTHX_ dsv, STR_WITH_LEN(str), utf8) -#define lex_stuff_pvs(pv,flags) Perl_lex_stuff_pvn(aTHX_ STR_WITH_LEN(pv), flags) +#define lex_stuff_pvs(pv,flags) \ + Perl_lex_stuff_pvn(aTHX_ STR_WITH_LEN(pv), flags) #define get_cvs(str, flags) \ Perl_get_cvn_flags(aTHX_ STR_WITH_LEN(str), (flags)) @@ -684,7 +685,8 @@ based on the underlying C library functions): #define strnNE(s1,s2,l) (strncmp(s1,s2,l) != 0) #define strnEQ(s1,s2,l) (strncmp(s1,s2,l) == 0) -#define memEQ(s1,s2,l) (memcmp(((const void *) (s1)), ((const void *) (s2)), l) == 0) +#define memEQ(s1,s2,l) \ + (memcmp(((const void *) (s1)), ((const void *) (s2)), l) == 0) #define memNE(s1,s2,l) (! memEQ(s1,s2,l)) /* memEQ and memNE where second comparand is a string constant */ @@ -716,7 +718,8 @@ based on the underlying C library functions): #define memGT(s1,s2,l) (memcmp(s1,s2,l) > 0) #define memGE(s1,s2,l) (memcmp(s1,s2,l) >= 0) -#define memCHRs(s1,c) ((const char *) memchr(ASSERT_IS_LITERAL(s1) , c, sizeof(s1)-1)) +#define memCHRs(s1,c) \ + ((const char *) memchr(ASSERT_IS_LITERAL(s1) , c, sizeof(s1)-1)) /* * Character classes. @@ -1638,7 +1641,8 @@ END_EXTERN_C # define isPUNCT_A(c) generic_isCC_A_(c, CC_PUNCT_) # define isSPACE_A(c) generic_isCC_A_(c, CC_SPACE_) # define isWORDCHAR_A(c) generic_isCC_A_(c, CC_WORDCHAR_) -# define isXDIGIT_A(c) generic_isCC_(c, CC_XDIGIT_) /* No non-ASCII xdigits */ +# define isXDIGIT_A(c) generic_isCC_(c, CC_XDIGIT_) /* No non-ASCII + xdigits */ # define isIDFIRST_A(c) generic_isCC_A_(c, CC_IDFIRST_) # define isALPHA_L1(c) generic_isCC_(c, CC_ALPHA_) # define isALPHANUMERIC_L1(c) generic_isCC_(c, CC_ALPHANUMERIC_) @@ -2170,11 +2174,13 @@ END_EXTERN_C #define isPRINT_uvchr(c) generic_invlist_uvchr_(CC_PRINT_, c) #define isPUNCT_uvchr(c) generic_invlist_uvchr_(CC_PUNCT_, c) -#define isSPACE_uvchr(c) generic_uvchr_(CC_SPACE_, is_XPERLSPACE_cp_high, c) +#define isSPACE_uvchr(c) \ + generic_uvchr_(CC_SPACE_, is_XPERLSPACE_cp_high, c) #define isPSXSPC_uvchr(c) isSPACE_uvchr(c) #define isUPPER_uvchr(c) generic_invlist_uvchr_(CC_UPPER_, c) -#define isVERTWS_uvchr(c) generic_uvchr_(CC_VERTSPACE_, is_VERTWS_cp_high, c) +#define isVERTWS_uvchr(c) \ + generic_uvchr_(CC_VERTSPACE_, is_VERTWS_cp_high, c) #define isWORDCHAR_uvchr(c) generic_invlist_uvchr_(CC_WORDCHAR_, c) #define isXDIGIT_uvchr(c) generic_uvchr_(CC_XDIGIT_, is_XDIGIT_cp_high, c) @@ -2715,7 +2721,8 @@ PoisonWith(0xEF) for catching access to freed memory. #define MEM_SIZE_MAX ((MEM_SIZE)-1) -#define _PERL_STRLEN_ROUNDUP_UNCHECKED(n) (((n) - 1 + PERL_STRLEN_ROUNDUP_QUANTUM) & ~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM - 1)) +#define _PERL_STRLEN_ROUNDUP_UNCHECKED(n) \ + (((n) - 1 + PERL_STRLEN_ROUNDUP_QUANTUM) & ~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM - 1)) #ifdef PERL_MALLOC_WRAP @@ -2769,7 +2776,8 @@ PoisonWith(0xEF) for catching access to freed memory. # define MEM_WRAP_CHECK_(n,t) MEM_WRAP_CHECK(n,t), -# define PERL_STRLEN_ROUNDUP(n) ((void)(((n) > MEM_SIZE_MAX - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (croak_memory_wrap(),0) : 0), _PERL_STRLEN_ROUNDUP_UNCHECKED(n)) +# define PERL_STRLEN_ROUNDUP(n) \ + ((void)(((n) > MEM_SIZE_MAX - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (croak_memory_wrap(),0) : 0), _PERL_STRLEN_ROUNDUP_UNCHECKED(n)) #else # define MEM_WRAP_CHECK(n,t) @@ -2829,9 +2837,12 @@ enum mem_log_type { #endif #ifdef PERL_MEM_LOG -#define MEM_LOG_ALLOC(n,t,a) Perl_mem_log_alloc(n,sizeof(t),STRINGIFY(t),a,__FILE__,__LINE__,FUNCTION__) -#define MEM_LOG_REALLOC(n,t,v,a) Perl_mem_log_realloc(n,sizeof(t),STRINGIFY(t),v,a,__FILE__,__LINE__,FUNCTION__) -#define MEM_LOG_FREE(a) Perl_mem_log_free(a,__FILE__,__LINE__,FUNCTION__) +#define MEM_LOG_ALLOC(n,t,a) \ + Perl_mem_log_alloc(n,sizeof(t),STRINGIFY(t),a,__FILE__,__LINE__,FUNCTION__) +#define MEM_LOG_REALLOC(n,t,v,a) \ + Perl_mem_log_realloc(n,sizeof(t),STRINGIFY(t),v,a,__FILE__,__LINE__,FUNCTION__) +#define MEM_LOG_FREE(a) \ + Perl_mem_log_free(a,__FILE__,__LINE__,FUNCTION__) #endif #ifndef MEM_LOG_ALLOC @@ -2844,9 +2855,12 @@ enum mem_log_type { #define MEM_LOG_FREE(a) (a) #endif -#define Newx(v,n,t) (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t)))))) -#define Newxc(v,n,t,c) (v = (MEM_WRAP_CHECK_(n,t) (c*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t)))))) -#define Newxz(v,n,t) (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safecalloc((n),sizeof(t))))) +#define Newx(v,n,t) \ + (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t)))))) +#define Newxc(v,n,t,c) \ + (v = (MEM_WRAP_CHECK_(n,t) (c*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t)))))) +#define Newxz(v,n,t) \ + (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safecalloc((n),sizeof(t))))) #ifndef PERL_CORE /* pre 5.9.x compatibility */ @@ -2873,16 +2887,23 @@ enum mem_log_type { #define perl_assert_ptr(p) assert( ((void*)(p)) != 0 ) -#define Move(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memmove((char*)(d),(const char*)(s), (n) * sizeof(t))) -#define Copy(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memcpy((char*)(d),(const char*)(s), (n) * sizeof(t))) -#define Zero(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), (void)memzero((char*)(d), (n) * sizeof(t))) +#define Move(s,d,n,t) \ + (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memmove((char*)(d),(const char*)(s), (n) * sizeof(t))) +#define Copy(s,d,n,t) \ + (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memcpy((char*)(d),(const char*)(s), (n) * sizeof(t))) +#define Zero(d,n,t) \ + (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), (void)memzero((char*)(d), (n) * sizeof(t))) /* Like above, but returns a pointer to 'd' */ -#define MoveD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memmove((char*)(d),(const char*)(s), (n) * sizeof(t))) -#define CopyD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memcpy((char*)(d),(const char*)(s), (n) * sizeof(t))) -#define ZeroD(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t))) - -#define PoisonWith(d,n,t,b) (MEM_WRAP_CHECK_(n,t) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t))) +#define MoveD(s,d,n,t) \ + (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memmove((char*)(d),(const char*)(s), (n) * sizeof(t))) +#define CopyD(s,d,n,t) \ + (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memcpy((char*)(d),(const char*)(s), (n) * sizeof(t))) +#define ZeroD(d,n,t) \ + (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t))) + +#define PoisonWith(d,n,t,b) \ + (MEM_WRAP_CHECK_(n,t) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t))) #define PoisonNew(d,n,t) PoisonWith(d,n,t,0xAB) #define PoisonFree(d,n,t) PoisonWith(d,n,t,0xEF) #define Poison(d,n,t) PoisonFree(d,n,t) diff --git a/hv.h b/hv.h index f70a22a5ddcf..0f070f7f06d1 100644 --- a/hv.h +++ b/hv.h @@ -25,11 +25,13 @@ # define USE_PERL_PERTURB_KEYS 1 # define PL_HASH_RAND_BITS_ENABLED PL_hash_rand_bits_enabled # endif -# define PERL_HASH_ITER_BUCKET(iter) (((iter)->xhv_riter) ^ ((iter)->xhv_rand)) +# define PERL_HASH_ITER_BUCKET(iter) \ + (((iter)->xhv_riter) ^ ((iter)->xhv_rand)) #endif #ifdef PERL_USE_UNSHARED_KEYS_IN_LARGE_HASHES -#define LARGE_HASH_HEURISTIC(hv,new_max) S_large_hash_heuristic(aTHX_ (hv), (new_max)) +#define LARGE_HASH_HEURISTIC(hv,new_max) \ + S_large_hash_heuristic(aTHX_ (hv), (new_max)) #else #define LARGE_HASH_HEURISTIC(hv,new_max) 0 #endif @@ -366,8 +368,10 @@ whether it is valid to call C. #define HvUSEDKEYS(hv) (HvTOTALKEYS(hv) - HvPLACEHOLDERS_get(hv)) #define HvTOTALKEYS(hv) (((XPVHV*) SvANY(hv))->xhv_keys) #define HvPLACEHOLDERS(hv) (*Perl_hv_placeholders_p(aTHX_ MUTABLE_HV(hv))) -#define HvPLACEHOLDERS_get(hv) (SvMAGIC(hv) ? Perl_hv_placeholders_get(aTHX_ (const HV *)hv) : 0) -#define HvPLACEHOLDERS_set(hv,p) Perl_hv_placeholders_set(aTHX_ MUTABLE_HV(hv), p) +#define HvPLACEHOLDERS_get(hv) \ + (SvMAGIC(hv) ? Perl_hv_placeholders_get(aTHX_ (const HV *)hv) : 0) +#define HvPLACEHOLDERS_set(hv,p) \ + Perl_hv_placeholders_set(aTHX_ MUTABLE_HV(hv), p) /* This (now) flags whether *new* keys in the hash will be allocated from the * shared string table. We have a heuristic to call HvSHAREKEYS_off() if a hash @@ -481,7 +485,8 @@ whether it is valid to call C. #define HV_ITERNEXT_WANTPLACEHOLDERS 0x01 /* Don't skip placeholders. */ #define hv_iternext(hv) hv_iternext_flags(hv, 0) -#define hv_magic(hv, gv, how) sv_magic(MUTABLE_SV(hv), MUTABLE_SV(gv), how, NULL, 0) +#define hv_magic(hv, gv, how) \ + sv_magic(MUTABLE_SV(hv), MUTABLE_SV(gv), how, NULL, 0) #define hv_undef(hv) Perl_hv_undef_flags(aTHX_ hv, 0) #define Perl_sharepvn(pv, len, hash) HEK_KEY(share_hek(pv, len, hash)) diff --git a/hv_func.h b/hv_func.h index 9ec178d9b335..a710ae96e146 100644 --- a/hv_func.h +++ b/hv_func.h @@ -52,8 +52,10 @@ # define PVT__PERL_HASH_WORD_SIZE sizeof(PVT__PERL_HASH_WORD_TYPE) # define PVT__PERL_HASH_SEED_BYTES (PVT__PERL_HASH_WORD_SIZE * 2) # define PVT__PERL_HASH_STATE_BYTES (PVT__PERL_HASH_WORD_SIZE * 4) -# define PVT__PERL_HASH_SEED_STATE(seed,state) S_perl_siphash_seed_state(seed,state) -# define PVT__PERL_HASH_WITH_STATE(state,str,len) S_perl_hash_siphash_2_4_with_state((state),(U8*)(str),(len)) +# define PVT__PERL_HASH_SEED_STATE(seed,state) \ + S_perl_siphash_seed_state(seed,state) +# define PVT__PERL_HASH_WITH_STATE(state,str,len) \ + S_perl_hash_siphash_2_4_with_state((state),(U8*)(str),(len)) #elif defined(PERL_HASH_FUNC_SIPHASH13) # define PERL_HASH_FUNC_DEFINE "PERL_HASH_FUNC_SIPHASH13" # define PVT__PERL_HASH_FUNC "SIPHASH_1_3" @@ -61,8 +63,10 @@ # define PVT__PERL_HASH_WORD_SIZE sizeof(PVT__PERL_HASH_WORD_TYPE) # define PVT__PERL_HASH_SEED_BYTES (PVT__PERL_HASH_WORD_SIZE * 2) # define PVT__PERL_HASH_STATE_BYTES (PVT__PERL_HASH_WORD_SIZE * 4) -# define PVT__PERL_HASH_SEED_STATE(seed,state) S_perl_siphash_seed_state(seed,state) -# define PVT__PERL_HASH_WITH_STATE(state,str,len) S_perl_hash_siphash_1_3_with_state((state),(U8*)(str),(len)) +# define PVT__PERL_HASH_SEED_STATE(seed,state) \ + S_perl_siphash_seed_state(seed,state) +# define PVT__PERL_HASH_WITH_STATE(state,str,len) \ + S_perl_hash_siphash_1_3_with_state((state),(U8*)(str),(len)) #elif defined(PERL_HASH_FUNC_ZAPHOD32) # define PERL_HASH_FUNC_DEFINE "PERL_HASH_FUNC_ZAPHOD32" # define PVT__PERL_HASH_FUNC "ZAPHOD32" @@ -71,7 +75,8 @@ # define PVT__PERL_HASH_SEED_BYTES (PVT__PERL_HASH_WORD_SIZE * 3) # define PVT__PERL_HASH_STATE_BYTES (PVT__PERL_HASH_WORD_SIZE * 3) # define PVT__PERL_HASH_SEED_STATE(seed,state) zaphod32_seed_state(seed,state) -# define PVT__PERL_HASH_WITH_STATE(state,str,len) (U32)zaphod32_hash_with_state((state),(U8*)(str),(len)) +# define PVT__PERL_HASH_WITH_STATE(state,str,len) \ + (U32)zaphod32_hash_with_state((state),(U8*)(str),(len)) # include "zaphod32_hash.h" #endif @@ -91,8 +96,10 @@ */ #include "perl_siphash.h" -#define PVT__PERL_HASH_SEED_roundup(x, y) ( ( ( (x) + ( (y) - 1 ) ) / (y) ) * (y) ) -#define PVT_PERL_HASH_SEED_roundup(x) PVT__PERL_HASH_SEED_roundup(x,PVT__PERL_HASH_WORD_SIZE) +#define PVT__PERL_HASH_SEED_roundup(x, y) \ + ( ( ( (x) + ( (y) - 1 ) ) / (y) ) * (y) ) +#define PVT_PERL_HASH_SEED_roundup(x) \ + PVT__PERL_HASH_SEED_roundup(x,PVT__PERL_HASH_WORD_SIZE) #define PL_hash_seed ((U8 *)PL_hash_seed_w) #define PL_hash_state ((U8 *)PL_hash_state_w) @@ -101,13 +108,16 @@ # define PVT_PERL_HASH_FUNC PVT__PERL_HASH_FUNC # define PVT_PERL_HASH_SEED_BYTES PVT__PERL_HASH_SEED_BYTES # define PVT_PERL_HASH_STATE_BYTES PVT__PERL_HASH_STATE_BYTES -# define PVT_PERL_HASH_SEED_STATE(seed,state) PVT__PERL_HASH_SEED_STATE(seed,state) -# define PVT_PERL_HASH_WITH_STATE(state,str,len) PVT__PERL_HASH_WITH_STATE(state,str,len) +# define PVT_PERL_HASH_SEED_STATE(seed,state) \ + PVT__PERL_HASH_SEED_STATE(seed,state) +# define PVT_PERL_HASH_WITH_STATE(state,str,len) \ + PVT__PERL_HASH_WITH_STATE(state,str,len) #else #define PVT_PERL_HASH_FUNC "SBOX32_WITH_" PVT__PERL_HASH_FUNC /* note the 4 in the below code comes from the fact the seed to initialize the SBOX is 128 bits */ -#define PVT_PERL_HASH_SEED_BYTES ( PVT__PERL_HASH_SEED_BYTES + (int)( 4 * sizeof(U32)) ) +#define PVT_PERL_HASH_SEED_BYTES \ + ( PVT__PERL_HASH_SEED_BYTES + (int)( 4 * sizeof(U32)) ) #define PVT_PERL_HASH_STATE_BYTES \ ( PVT__PERL_HASH_STATE_BYTES + ( ( 1 + ( 256 * SBOX32_MAX_LEN ) ) * sizeof(U32) ) ) @@ -131,8 +141,10 @@ (hash) = PVT_PERL_HASH_WITH_STATE((state),(U8*)(str),(len)) #define PERL_HASH_SEED_STATE(seed,state) PVT_PERL_HASH_SEED_STATE(seed,state) -#define PERL_HASH_SEED_BYTES PVT_PERL_HASH_SEED_roundup(PVT_PERL_HASH_SEED_BYTES) -#define PERL_HASH_STATE_BYTES PVT_PERL_HASH_SEED_roundup(PVT_PERL_HASH_STATE_BYTES) +#define PERL_HASH_SEED_BYTES \ + PVT_PERL_HASH_SEED_roundup(PVT_PERL_HASH_SEED_BYTES) +#define PERL_HASH_STATE_BYTES \ + PVT_PERL_HASH_SEED_roundup(PVT_PERL_HASH_STATE_BYTES) #define PERL_HASH_FUNC PVT_PERL_HASH_FUNC #define PERL_HASH_SEED_WORDS (PERL_HASH_SEED_BYTES/PVT__PERL_HASH_WORD_SIZE) diff --git a/hv_macro.h b/hv_macro.h index 92e2de2e0174..e6211c38d651 100644 --- a/hv_macro.h +++ b/hv_macro.h @@ -30,7 +30,8 @@ */ #ifndef U8TO16_LE - #define _shifted_octet(type,ptr,idx,shift) (((type)(((U8*)(ptr))[(idx)]))<<(shift)) + #define _shifted_octet(type,ptr,idx,shift) \ + (((type)(((U8*)(ptr))[(idx)]))<<(shift)) #if defined(USE_UNALIGNED_PTR_DEREF) && (BYTEORDER == 0x1234 || BYTEORDER == 0x12345678) #define U8TO16_LE(ptr) (*((const U16*)(ptr))) #define U8TO32_LE(ptr) (*((const U32*)(ptr))) diff --git a/inline.h b/inline.h index a1f226f5c1e9..eb7c6ccfb267 100644 --- a/inline.h +++ b/inline.h @@ -1230,7 +1230,8 @@ C>. =cut */ -#define is_strict_utf8_string(s, len) is_strict_utf8_string_loclen(s, len, NULL, NULL) +#define is_strict_utf8_string(s, len) \ + is_strict_utf8_string_loclen(s, len, NULL, NULL) /* =for apidoc is_c9strict_utf8_string @@ -1270,7 +1271,8 @@ C>. =cut */ -#define is_c9strict_utf8_string(s, len) is_c9strict_utf8_string_loclen(s, len, NULL, 0) +#define is_c9strict_utf8_string(s, len) \ + is_c9strict_utf8_string_loclen(s, len, NULL, 0) /* =for apidoc is_utf8_string_flags diff --git a/iperlsys.h b/iperlsys.h index d1a400693956..2758a54ad98b 100644 --- a/iperlsys.h +++ b/iperlsys.h @@ -287,7 +287,8 @@ struct IPerlStdIOInfo # ifdef __VOS__ /* Work around VOS bug posix-979, wrongly setting errno when at end of file. */ # define PerlSIO_fclose(f) (((errno==1025)?errno=0:0),fclose(f)) -# define PerlSIO_feof(f) (((errno==1025)?errno=0:0),feof(f)) +# define PerlSIO_feof(f) \ + (((errno==1025)?errno=0:0),feof(f)) # define PerlSIO_ferror(f) (((errno==1025)?errno=0:0),ferror(f)) # else # define PerlSIO_fclose(f) fclose(f) @@ -584,7 +585,8 @@ struct IPerlEnvInfo # ifdef WIN32 # define PerlEnv_os_id() win32_os_id() -# define PerlEnv_lib_path(str, lenp) win32_get_privlib(WIN32_NO_REGISTRY_M_(str) lenp) +# define PerlEnv_lib_path(str, lenp) \ + win32_get_privlib(WIN32_NO_REGISTRY_M_(str) lenp) # define PerlEnv_sitelib_path(str, lenp) win32_get_sitelib(str, lenp) # define PerlEnv_vendorlib_path(str, lenp) win32_get_vendorlib(str, lenp) # define PerlEnv_get_child_IO(ptr) win32_get_child_IO(ptr) @@ -771,7 +773,8 @@ struct IPerlLIOInfo # define PerlLIO_isatty(fd) isatty((fd)) # define PerlLIO_link(oldname, newname) link((oldname), (newname)) # define PerlLIO_symlink(oldname, newname) symlink((oldname), (newname)) -# define PerlLIO_readlink(path, buf, bufsiz) readlink((path), (buf), (bufsiz)) +# define PerlLIO_readlink(path, buf, bufsiz) \ + readlink((path), (buf), (bufsiz)) # define PerlLIO_lseek(fd, offset, mode) lseek((fd), (offset), (mode)) # define PerlLIO_stat(name, buf) Stat((name), (buf)) # ifdef HAS_LSTAT @@ -786,7 +789,8 @@ struct IPerlLIOInfo int asciiopen3(const char* path, int oflag, int perm); # define PerlLIO_open(file, flag) asciiopen((file), (flag)) -# define PerlLIO_open3(file, flag, perm) asciiopen3((file), (flag), (perm)) +# define PerlLIO_open3(file, flag, perm) \ + asciiopen3((file), (flag), (perm)) # else # define PerlLIO_open(file, flag) open((file), (flag)) # define PerlLIO_open3(file, flag, perm) open((file), (flag), (perm)) diff --git a/op.h b/op.h index e265bc81cbab..8f7666334888 100644 --- a/op.h +++ b/op.h @@ -184,7 +184,8 @@ Deprecated. Use C instead. * from data in regen/op_private */ -#define OPpTRANS_ALL (OPpTRANS_USE_SVOP|OPpTRANS_CAN_FORCE_UTF8|OPpTRANS_IDENTICAL|OPpTRANS_SQUASH|OPpTRANS_COMPLEMENT|OPpTRANS_GROWS|OPpTRANS_DELETE) +#define OPpTRANS_ALL \ + (OPpTRANS_USE_SVOP|OPpTRANS_CAN_FORCE_UTF8|OPpTRANS_IDENTICAL|OPpTRANS_SQUASH|OPpTRANS_COMPLEMENT|OPpTRANS_GROWS|OPpTRANS_DELETE) #define OPpTRANS_FROM_UTF OPpTRANS_USE_SVOP #define OPpTRANS_TO_UTF OPpTRANS_CAN_FORCE_UTF8 @@ -1081,7 +1082,8 @@ C is non-null. For a higher-level interface, see C>. ( (o) && OP_TYPE_ISNT_AND_WASNT_NN(o, type) ) /* should match anything that uses ck_ftst in regen/opcodes */ -#define OP_IS_STAT(op) (OP_IS_FILETEST(op) || (op) == OP_LSTAT || (op) == OP_STAT) +#define OP_IS_STAT(op) \ + (OP_IS_FILETEST(op) || (op) == OP_LSTAT || (op) == OP_STAT) #define OpHAS_SIBLING(o) (cBOOL((o)->op_moresib)) #define OpSIBLING(o) (0 + (o)->op_moresib ? (o)->op_sibparent : NULL) @@ -1160,7 +1162,8 @@ C is non-null. For a higher-level interface, see C>. # define TR_UNMAPPED (UV)-1 # define TR_DELETE (UV)-2 # define TR_R_EMPTY (UV)-3 /* rhs (replacement) is empty */ -# define TR_OOB (UV)-4 /* Something that isn't one of the others */ +# define TR_OOB (UV)-4 /* Something that isn't one + of the others */ # define TR_SPECIAL_HANDLING TR_DELETE /* Can occupy same value */ # define TR_UNLISTED TR_UNMAPPED /* A synonym whose name is clearer at times */ diff --git a/op_reg_common.h b/op_reg_common.h index c3ab09c1c90b..3acc21d72b12 100644 --- a/op_reg_common.h +++ b/op_reg_common.h @@ -101,7 +101,8 @@ get_regex_charset(const U32 flags) /* Mask of the above bits. These need to be transferred from op_pmflags to * re->extflags during compilation */ -#define RXf_PMf_COMPILETIME (RXf_PMf_MULTILINE|RXf_PMf_SINGLELINE|RXf_PMf_FOLD|RXf_PMf_EXTENDED|RXf_PMf_EXTENDED_MORE|RXf_PMf_KEEPCOPY|RXf_PMf_NOCAPTURE|RXf_PMf_CHARSET|RXf_PMf_STRICT) +#define RXf_PMf_COMPILETIME \ + (RXf_PMf_MULTILINE|RXf_PMf_SINGLELINE|RXf_PMf_FOLD|RXf_PMf_EXTENDED|RXf_PMf_EXTENDED_MORE|RXf_PMf_KEEPCOPY|RXf_PMf_NOCAPTURE|RXf_PMf_CHARSET|RXf_PMf_STRICT) #define RXf_PMf_FLAGCOPYMASK (RXf_PMf_COMPILETIME|RXf_PMf_SPLIT) /* Temporary to get Jenkins happy again diff --git a/perl.h b/perl.h index 6c6043c9d3b7..52275bb24f4d 100644 --- a/perl.h +++ b/perl.h @@ -567,7 +567,8 @@ __typeof__ and nothing else. */ #ifndef PERL_UNUSED_RESULT # if defined(__GNUC__) && defined(HASATTRIBUTE_WARN_UNUSED_RESULT) -# define PERL_UNUSED_RESULT(v) STMT_START { __typeof__(v) z = (v); (void)sizeof(z); } STMT_END +# define PERL_UNUSED_RESULT(v) \ + STMT_START { __typeof__(v) z = (v); (void)sizeof(z); } STMT_END # else # define PERL_UNUSED_RESULT(v) ((void)(v)) # endif @@ -1045,7 +1046,8 @@ violations are fatal. taint_proper(NULL, s); \ } # define TAINT_set(s) (PL_tainted = cBOOL(s)) -# define TAINT_get (cBOOL(UNLIKELY(PL_tainted))) /* Is something tainted? */ +# define TAINT_get (cBOOL(UNLIKELY(PL_tainted))) /* Is something + tainted? */ # define TAINTING_get (cBOOL(UNLIKELY(PL_tainting))) # define TAINTING_set(s) (PL_tainting = cBOOL(s)) # define TAINT_WARN_get (PL_taint_warn) @@ -1638,7 +1640,8 @@ Use L to declare variables of the maximum usable size on this platform. #define PERL_MULTICONCAT_IX_PLAIN_LEN 2 /* non-utf8 constant string length */ #define PERL_MULTICONCAT_IX_UTF8_PV 3 /* utf8 constant string */ #define PERL_MULTICONCAT_IX_UTF8_LEN 4 /* utf8 constant string length */ -#define PERL_MULTICONCAT_IX_LENGTHS 5 /* first of nargs+1 const segment lens */ +#define PERL_MULTICONCAT_IX_LENGTHS 5 /* first of nargs+1 const + segment lens */ #define PERL_MULTICONCAT_HEADER_SIZE 5 /* The number of fields of a multiconcat header */ @@ -1916,7 +1919,8 @@ was saved by C or C. set_vaxc_errno(vmserrcode); \ } STMT_END # define dSAVEDERRNO int saved_errno; unsigned saved_vms_errno -# define dSAVE_ERRNO int saved_errno = errno; unsigned saved_vms_errno = vaxc$errno +# define dSAVE_ERRNO \ + int saved_errno = errno; unsigned saved_vms_errno = vaxc$errno # define SAVE_ERRNO ( saved_errno = errno, saved_vms_errno = vaxc$errno ) # define RESTORE_ERRNO SETERRNO(saved_errno, saved_vms_errno) @@ -1953,14 +1957,18 @@ was saved by C or C. #ifdef WIN32 # define dSAVEDERRNO int saved_errno; DWORD saved_win32_errno -# define dSAVE_ERRNO int saved_errno = errno; DWORD saved_win32_errno = GetLastError() -# define SAVE_ERRNO ( saved_errno = errno, saved_win32_errno = GetLastError() ) -# define RESTORE_ERRNO ( errno = saved_errno, SetLastError(saved_win32_errno) ) +# define dSAVE_ERRNO \ + int saved_errno = errno; DWORD saved_win32_errno = GetLastError() +# define SAVE_ERRNO \ + ( saved_errno = errno, saved_win32_errno = GetLastError() ) +# define RESTORE_ERRNO \ + ( errno = saved_errno, SetLastError(saved_win32_errno) ) #endif #ifdef OS2 # define dSAVEDERRNO int saved_errno; unsigned long saved_os2_errno -# define dSAVE_ERRNO int saved_errno = errno; unsigned long saved_os2_errno = Perl_rc +# define dSAVE_ERRNO \ + int saved_errno = errno; unsigned long saved_os2_errno = Perl_rc # define SAVE_ERRNO ( saved_errno = errno, saved_os2_errno = Perl_rc ) # define RESTORE_ERRNO ( errno = saved_errno, Perl_rc = saved_os2_errno ) #endif @@ -2305,14 +2313,16 @@ my_snprintf() * that should be true only if the snprintf()/vsnprintf() are true * to the standard. */ -#define PERL_SNPRINTF_CHECK(len, max, api) STMT_START { if ((max) > 0 && (Size_t)len > (max)) Perl_croak_nocontext("panic: %s buffer overflow", STRINGIFY(api)); } STMT_END +#define PERL_SNPRINTF_CHECK(len, max, api) \ + STMT_START { if ((max) > 0 && (Size_t)len > (max)) Perl_croak_nocontext("panic: %s buffer overflow", STRINGIFY(api)); } STMT_END #ifdef USE_QUADMATH # define my_snprintf Perl_my_snprintf # define PERL_MY_SNPRINTF_GUARDED #elif defined(HAS_SNPRINTF) && defined(HAS_C99_VARIADIC_MACROS) && !(defined(DEBUGGING) && !defined(PERL_USE_GCC_BRACE_GROUPS)) && !defined(PERL_GCC_PEDANTIC) # ifdef PERL_USE_GCC_BRACE_GROUPS -# define my_snprintf(buffer, max, ...) ({ int len = snprintf(buffer, max, __VA_ARGS__); PERL_SNPRINTF_CHECK(len, max, snprintf); len; }) +# define my_snprintf(buffer, max, ...) \ + ({ int len = snprintf(buffer, max, __VA_ARGS__); PERL_SNPRINTF_CHECK(len, max, snprintf); len; }) # define PERL_MY_SNPRINTF_GUARDED # else # define my_snprintf(buffer, max, ...) snprintf(buffer, max, __VA_ARGS__) @@ -2326,7 +2336,8 @@ my_snprintf() * dies if called under USE_QUADMATH. */ #if defined(HAS_VSNPRINTF) && defined(HAS_C99_VARIADIC_MACROS) && !(defined(DEBUGGING) && !defined(PERL_USE_GCC_BRACE_GROUPS)) && !defined(PERL_GCC_PEDANTIC) # ifdef PERL_USE_GCC_BRACE_GROUPS -# define my_vsnprintf(buffer, max, ...) ({ int len = vsnprintf(buffer, max, __VA_ARGS__); PERL_SNPRINTF_CHECK(len, max, vsnprintf); len; }) +# define my_vsnprintf(buffer, max, ...) \ + ({ int len = vsnprintf(buffer, max, __VA_ARGS__); PERL_SNPRINTF_CHECK(len, max, vsnprintf); len; }) # define PERL_MY_VSNPRINTF_GUARDED # else # define my_vsnprintf(buffer, max, ...) vsnprintf(buffer, max, __VA_ARGS__) @@ -2356,13 +2367,15 @@ my_snprintf() * insert the POST_GUARD() also in that case. */ #ifndef PERL_MY_SNPRINTF_GUARDED -# define PERL_MY_SNPRINTF_POST_GUARD(len, max) PERL_SNPRINTF_CHECK(len, max, snprintf) +# define PERL_MY_SNPRINTF_POST_GUARD(len, max) \ + PERL_SNPRINTF_CHECK(len, max, snprintf) #else # define PERL_MY_SNPRINTF_POST_GUARD(len, max) PERL_UNUSED_VAR(len) #endif #ifndef PERL_MY_VSNPRINTF_GUARDED -# define PERL_MY_VSNPRINTF_POST_GUARD(len, max) PERL_SNPRINTF_CHECK(len, max, vsnprintf) +# define PERL_MY_VSNPRINTF_POST_GUARD(len, max) \ + PERL_SNPRINTF_CHECK(len, max, vsnprintf) #else # define PERL_MY_VSNPRINTF_POST_GUARD(len, max) PERL_UNUSED_VAR(len) #endif @@ -2763,7 +2776,8 @@ extern long double Perl_my_frexpl(long double x, int *e); # define Perl_isinf(x) isinfq(x) # define Perl_isnan(x) isnanq(x) # define Perl_isfinite(x) !(isnanq(x) || isinfq(x)) -# define Perl_fp_class(x) ((x) == 0.0Q ? 0 : isinfq(x) ? 3 : isnanq(x) ? 4 : PERL_ABS(x) < FLT128_MIN ? 2 : 1) +# define Perl_fp_class(x) \ + ((x) == 0.0Q ? 0 : isinfq(x) ? 3 : isnanq(x) ? 4 : PERL_ABS(x) < FLT128_MIN ? 2 : 1) # define Perl_fp_class_inf(x) (Perl_fp_class(x) == 3) # define Perl_fp_class_nan(x) (Perl_fp_class(x) == 4) # define Perl_fp_class_norm(x) (Perl_fp_class(x) == 1) @@ -2849,8 +2863,10 @@ extern long double Perl_my_frexpl(long double x, int *e); # define Perl_fp_class_qnan(x) (Perl_fp_class(x)==FP_QNAN) # define Perl_fp_class_pnorm(x) (Perl_fp_class(x)==FP_PLUS_NORM) # define Perl_fp_class_nnorm(x) (Perl_fp_class(x)==FP_MINUS_NORM) -# define Perl_fp_class_pdenorm(x) (Perl_fp_class(x)==FP_PLUS_DENORM) -# define Perl_fp_class_ndenorm(x) (Perl_fp_class(x)==FP_MINUS_DENORM) +# define Perl_fp_class_pdenorm(x) \ + (Perl_fp_class(x)==FP_PLUS_DENORM) +# define Perl_fp_class_ndenorm(x) \ + (Perl_fp_class(x)==FP_MINUS_DENORM) # define Perl_fp_class_pzero(x) (Perl_fp_class(x)==FP_PLUS_ZERO) # define Perl_fp_class_nzero(x) (Perl_fp_class(x)==FP_MINUS_ZERO) # else @@ -2914,8 +2930,10 @@ extern long double Perl_my_frexpl(long double x, int *e); # define Perl_fp_class_pinf(x) (Perl_fp_class(x)==FP_CLASS_PINF) # define Perl_fp_class_nnorm(x) (Perl_fp_class(x)==FP_CLASS_NNORM) # define Perl_fp_class_pnorm(x) (Perl_fp_class(x)==FP_CLASS_PNORM) -# define Perl_fp_class_ndenorm(x) (Perl_fp_class(x)==FP_CLASS_NDENORM) -# define Perl_fp_class_pdenorm(x) (Perl_fp_class(x)==FP_CLASS_PDENORM) +# define Perl_fp_class_ndenorm(x) \ + (Perl_fp_class(x)==FP_CLASS_NDENORM) +# define Perl_fp_class_pdenorm(x) \ + (Perl_fp_class(x)==FP_CLASS_PDENORM) # define Perl_fp_class_nzero(x) (Perl_fp_class(x)==FP_CLASS_NZERO) # define Perl_fp_class_pzero(x) (Perl_fp_class(x)==FP_CLASS_PZERO) # elif defined(FP_PINF) && defined(FP_QNAN) @@ -2961,8 +2979,10 @@ extern long double Perl_my_frexpl(long double x, int *e); # define Perl_fp_class_pinf(x) (Perl_fp_class(x)==FP_POS_INF) # define Perl_fp_class_nnorm(x) (Perl_fp_class(x)==FP_NEG_NORM) # define Perl_fp_class_pnorm(x) (Perl_fp_class(x)==FP_POS_NORM) -# define Perl_fp_class_ndenorm(x) (Perl_fp_class(x)==FP_NEG_DENORM) -# define Perl_fp_class_pdenorm(x) (Perl_fp_class(x)==FP_POS_DENORM) +# define Perl_fp_class_ndenorm(x) \ + (Perl_fp_class(x)==FP_NEG_DENORM) +# define Perl_fp_class_pdenorm(x) \ + (Perl_fp_class(x)==FP_POS_DENORM) # define Perl_fp_class_nzero(x) (Perl_fp_class(x)==FP_NEG_ZERO) # define Perl_fp_class_pzero(x) (Perl_fp_class(x)==FP_POS_ZERO) # else @@ -2985,11 +3005,15 @@ extern long double Perl_my_frexpl(long double x, int *e); # define Perl_fp_class_qnan(x) (Perl_fp_class(x)==FP_NANQ) # define Perl_fp_class_ninf(x) (Perl_fp_class(x)==FP_MINUS_INF) # define Perl_fp_class_pinf(x) (Perl_fp_class(x)==FP_PLUS_INF) -# define Perl_fp_class_nnorm(x) (Perl_fp_class(x)==FP_MINUS_NORM) +# define Perl_fp_class_nnorm(x) \ + (Perl_fp_class(x)==FP_MINUS_NORM) # define Perl_fp_class_pnorm(x) (Perl_fp_class(x)==FP_PLUS_NORM) -# define Perl_fp_class_ndenorm(x) (Perl_fp_class(x)==FP_MINUS_DENORM) -# define Perl_fp_class_pdenorm(x) (Perl_fp_class(x)==FP_PLUS_DENORM) -# define Perl_fp_class_nzero(x) (Perl_fp_class(x)==FP_MINUS_ZERO) +# define Perl_fp_class_ndenorm(x) \ + (Perl_fp_class(x)==FP_MINUS_DENORM) +# define Perl_fp_class_pdenorm(x) \ + (Perl_fp_class(x)==FP_PLUS_DENORM) +# define Perl_fp_class_nzero(x) \ + (Perl_fp_class(x)==FP_MINUS_ZERO) # define Perl_fp_class_pzero(x) (Perl_fp_class(x)==FP_PLUS_ZERO) # else # undef Perl_fp_class /* Unknown set of defines */ @@ -3565,8 +3589,10 @@ typedef struct padname PADNAME; cast to void. */ # define PERL_FPU_INIT (void)fpsetmask(0) # elif defined(SIGFPE) && defined(SIG_IGN) && !defined(PERL_MICRO) -# define PERL_FPU_INIT PL_sigfpe_saved = (Sighandler_t) signal(SIGFPE, SIG_IGN) -# define PERL_FPU_PRE_EXEC { Sigsave_t xfpe; rsignal_save(SIGFPE, PL_sigfpe_saved, &xfpe); +# define PERL_FPU_INIT \ + PL_sigfpe_saved = (Sighandler_t) signal(SIGFPE, SIG_IGN) +# define PERL_FPU_PRE_EXEC \ + { Sigsave_t xfpe; rsignal_save(SIGFPE, PL_sigfpe_saved, &xfpe); # define PERL_FPU_POST_EXEC rsignal_restore(SIGFPE, &xfpe); } # else # define PERL_FPU_INIT @@ -4085,8 +4111,10 @@ EXTERN_C int perl_tsa_mutex_unlock(perl_mutex* mutex) /* flags in PL_exit_flags for nature of exit() */ #define PERL_EXIT_EXPECTED 0x01 #define PERL_EXIT_DESTRUCT_END 0x02 /* Run END in perl_destruct */ -#define PERL_EXIT_WARN 0x04 /* Warn if Perl_my_exit() or Perl_my_failure_exit() called */ -#define PERL_EXIT_ABORT 0x08 /* Call abort() if Perl_my_exit() or Perl_my_failure_exit() called */ +#define PERL_EXIT_WARN 0x04 /* Warn if Perl_my_exit() or + Perl_my_failure_exit() called */ +#define PERL_EXIT_ABORT 0x08 /* Call abort() if Perl_my_exit() or + Perl_my_failure_exit() called */ #ifndef PERL_CORE /* format to use for version numbers in file/directory names */ @@ -4318,7 +4346,8 @@ hint to the compiler that this condition is likely to be false. /* We need this wrapper even in C11 because 'case X: static_assert(...);' is an error (static_assert is a declaration, and only statements can have labels). */ -#define STATIC_ASSERT_STMT(COND) STMT_START { STATIC_ASSERT_DECL(COND); } STMT_END +#define STATIC_ASSERT_STMT(COND) \ + STMT_START { STATIC_ASSERT_DECL(COND); } STMT_END #ifndef __has_builtin # define __has_builtin(x) 0 /* not a clang style compiler */ @@ -4870,7 +4899,8 @@ Gid_t getegid (void); #define DEBUG_MASK 0x1FFFEFFF /* mask of all the standard flags */ #define DEBUG_DB_RECURSE_FLAG 0x40000000 -#define DEBUG_TOP_FLAG 0x80000000 /* -D was given --> PL_debug |= FLAG */ +#define DEBUG_TOP_FLAG 0x80000000 /* -D was given --> PL_debug + |= FLAG */ /* Both flags have to be set */ # define DEBUG_BOTH_FLAGS_TEST_(flag1, flag2) \ @@ -5977,7 +6007,8 @@ typedef enum { #define HINT_STRICT_REFS 0x00000002 /* strict pragma */ #define HINT_LOCALE 0x00000004 /* locale pragma */ #define HINT_BYTES 0x00000008 /* bytes pragma */ -#define HINT_LOCALE_PARTIAL 0x00000010 /* locale, but a subset of categories */ +#define HINT_LOCALE_PARTIAL 0x00000010 /* locale, but a subset + of categories */ #define HINT_EXPLICIT_STRICT_REFS 0x00000020 /* strict.pm */ #define HINT_EXPLICIT_STRICT_SUBS 0x00000040 /* strict.pm */ @@ -6901,8 +6932,10 @@ typedef struct am_table_short AMTS; #define PERLDBf_GOTO 0x80 /* Report goto: call DB::goto */ #define PERLDBf_NAMEEVAL 0x100 /* Informative names for evals */ #define PERLDBf_NAMEANON 0x200 /* Informative names for anon subs */ -#define PERLDBf_SAVESRC 0x400 /* Save source lines into @{"_<$filename"} */ -#define PERLDBf_SAVESRC_NOSUBS 0x800 /* Including evals that generate no subroutines */ +#define PERLDBf_SAVESRC 0x400 /* Save source lines into + @{"_<$filename"} */ +#define PERLDBf_SAVESRC_NOSUBS 0x800 /* Including evals that generate + no subroutines */ #define PERLDBf_SAVESRC_INVALID 0x1000 /* Save source that did not compile */ #define PERLDB_SUB (PL_perldb & PERLDBf_SUB) @@ -7729,7 +7762,8 @@ C. # define Strtoul strtoul #endif #if !defined(Strtoul) && defined(HAS_STRTOL) /* Last resort. */ -# define Strtoul(s, e, b) strchr((s), '-') ? ULONG_MAX : (unsigned long)strtol((s), (e), (b)) +# define Strtoul(s, e, b) \ + strchr((s), '-') ? ULONG_MAX : (unsigned long)strtol((s), (e), (b)) #endif #ifndef Atoul # define Atoul(s) Strtoul(s, NULL, 10) @@ -7759,7 +7793,8 @@ C. #ifndef PERL_MICRO # ifndef PERL_ASYNC_CHECK -# define PERL_ASYNC_CHECK() if (UNLIKELY(PL_sig_pending)) PL_signalhook(aTHX) +# define PERL_ASYNC_CHECK() \ + if (UNLIKELY(PL_sig_pending)) PL_signalhook(aTHX) # endif #endif @@ -7800,9 +7835,11 @@ C. # define Semctl(id, num, cmd, semun) semctl(id, num, cmd, semun) # elif defined(USE_SEMCTL_SEMID_DS) # ifdef EXTRA_F_IN_SEMUN_BUF -# define Semctl(id, num, cmd, semun) semctl(id, num, cmd, semun.buff) +# define Semctl(id, num, cmd, semun) \ + semctl(id, num, cmd, semun.buff) # else -# define Semctl(id, num, cmd, semun) semctl(id, num, cmd, semun.buf) +# define Semctl(id, num, cmd, semun) \ + semctl(id, num, cmd, semun.buf) # endif # endif #endif @@ -8134,9 +8171,11 @@ Same as L. Allows one ending \0 */ -#define IS_SAFE_SYSCALL(p, len, what, op_name) (Perl_is_safe_syscall(aTHX_ (p), (len), (what), (op_name))) +#define IS_SAFE_SYSCALL(p, len, what, op_name) \ + (Perl_is_safe_syscall(aTHX_ (p), (len), (what), (op_name))) -#define IS_SAFE_PATHNAME(p, len, op_name) IS_SAFE_SYSCALL((p), (len), "pathname", (op_name)) +#define IS_SAFE_PATHNAME(p, len, op_name) \ + IS_SAFE_SYSCALL((p), (len), "pathname", (op_name)) #if defined(OEMVS) || defined(__amigaos4__) #define NO_ENV_ARRAY_IN_MAIN @@ -8189,7 +8228,8 @@ Allows one ending \0 /* used by pv_display in dump.c*/ #define PERL_PV_PRETTY_DUMP PERL_PV_PRETTY_ELLIPSES|PERL_PV_PRETTY_QUOTE -#define PERL_PV_PRETTY_REGPROP PERL_PV_PRETTY_ELLIPSES|PERL_PV_PRETTY_LTGT|PERL_PV_ESCAPE_RE|PERL_PV_ESCAPE_NONASCII +#define PERL_PV_PRETTY_REGPROP \ + PERL_PV_PRETTY_ELLIPSES|PERL_PV_PRETTY_LTGT|PERL_PV_ESCAPE_RE|PERL_PV_ESCAPE_NONASCII #if DOUBLEKIND == DOUBLE_IS_VAX_F_FLOAT || \ DOUBLEKIND == DOUBLE_IS_VAX_D_FLOAT || \ @@ -8374,7 +8414,8 @@ Allows one ending \0 * the C99 isinf() and isnan() are unavailable, and the NV_MIN becomes * from the C89 DBL_MIN or moral equivalent. */ #if !defined(Perl_fp_class_denorm) && defined(Perl_isinf) && defined(Perl_isnan) && defined(NV_MIN) -# define Perl_fp_class_denorm(x) ((x) != 0.0 && !Perl_isinf(x) && !Perl_isnan(x) && PERL_ABS(x) < NV_MIN) +# define Perl_fp_class_denorm(x) \ + ((x) != 0.0 && !Perl_isinf(x) && !Perl_isnan(x) && PERL_ABS(x) < NV_MIN) #endif /* This is not a great fallback: subnormals tests will fail, @@ -8953,7 +8994,8 @@ END_EXTERN_C #define PERL_PARSE_IS_SYNTAX_ERROR_FLAG 128 #define PERL_PARSE_IS_SYNTAX_ERROR(f) ((f) & PERL_PARSE_IS_SYNTAX_ERROR_FLAG) -#define PERL_PARSE_ERROR_COUNT(f) ((f) & (PERL_PARSE_IS_SYNTAX_ERROR_FLAG-1)) +#define PERL_PARSE_ERROR_COUNT(f) \ + ((f) & (PERL_PARSE_IS_SYNTAX_ERROR_FLAG-1)) /* diff --git a/perl_inc_macro.h b/perl_inc_macro.h index 29da9ac68bec..bf2ad00c0bfc 100644 --- a/perl_inc_macro.h +++ b/perl_inc_macro.h @@ -55,7 +55,8 @@ /* vendorarch is always relative to vendorlib on Windows for * DLL-based path intuition to work correctly */ # if !defined(WIN32) -# define INCPUSH_PERL_VENDORARCH_EXP S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORARCH_EXP), INCPUSH_CAN_RELOCATE); +# define INCPUSH_PERL_VENDORARCH_EXP \ + S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORARCH_EXP), INCPUSH_CAN_RELOCATE); # endif #endif @@ -66,12 +67,14 @@ s = PerlEnv_vendorlib_path(PERL_FS_VERSION, &len); \ if (s) incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE); # else -# define INCPUSH_PERL_VENDORLIB_EXP S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_EXP), INCPUSH_CAN_RELOCATE); +# define INCPUSH_PERL_VENDORLIB_EXP \ + S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_EXP), INCPUSH_CAN_RELOCATE); # endif #endif #ifdef ARCHLIB_EXP -# define INCPUSH_ARCHLIB_EXP S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE); +# define INCPUSH_ARCHLIB_EXP \ + S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE); #endif /* used by INCPUSH_PRIVLIB_EXP */ @@ -84,7 +87,8 @@ s = PerlEnv_lib_path(PERL_FS_VERSION, &len); \ if (s) incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE); #else -# define INCPUSH_PRIVLIB_EXP S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE); +# define INCPUSH_PRIVLIB_EXP \ + S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE); #endif #ifdef PERL_OTHERLIBDIRS @@ -99,7 +103,8 @@ #define _INCPUSH_PERL5LIB_IF if (perl5lib && *perl5lib != '\0') #ifndef VMS -# define _INCPUSH_PERL5LIB_ADD _INCPUSH_PERL5LIB_IF incpush_use_sep(perl5lib, 0, INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR); +# define _INCPUSH_PERL5LIB_ADD \ + _INCPUSH_PERL5LIB_IF incpush_use_sep(perl5lib, 0, INCPUSH_ADD_OLD_VERS|INCPUSH_NOT_BASEDIR); #else /* VMS */ /* Treat PERL5?LIB as a possible search list logical name -- the diff --git a/pp.h b/pp.h index 2c4b89d2bc7a..2ea2072049bc 100644 --- a/pp.h +++ b/pp.h @@ -95,9 +95,11 @@ value for the OP, but some use it for other purposes. #define ORIGMARK (PL_stack_base + origmark) #define SPAGAIN sp = PL_stack_sp -#define MSPAGAIN STMT_START { sp = PL_stack_sp; mark = ORIGMARK; } STMT_END +#define MSPAGAIN \ + STMT_START { sp = PL_stack_sp; mark = ORIGMARK; } STMT_END -#define GETTARGETSTACKED targ = (PL_op->op_flags & OPf_STACKED ? POPs : PAD_SV(PL_op->op_targ)) +#define GETTARGETSTACKED \ + targ = (PL_op->op_flags & OPf_STACKED ? POPs : PAD_SV(PL_op->op_targ)) #define dTARGETSTACKED SV * GETTARGETSTACKED #define GETTARGET targ = PAD_SV(PL_op->op_targ) @@ -110,7 +112,8 @@ Declare that this function uses C, and initializes it */ #define dTARGET SV * GETTARGET -#define GETATARGET targ = (PL_op->op_flags & OPf_STACKED ? sp[-1] : PAD_SV(PL_op->op_targ)) +#define GETATARGET \ + targ = (PL_op->op_flags & OPf_STACKED ? sp[-1] : PAD_SV(PL_op->op_targ)) #define dATARGET SV * GETATARGET #define dTARG SV *targ @@ -494,7 +497,8 @@ Does not use C. See also C>, C> and C>. #define PUSHs(s) (*++sp = (s)) #define PUSHTARG STMT_START { SvSETMAGIC(TARG); PUSHs(TARG); } STMT_END -#define PUSHp(p,l) STMT_START { sv_setpvn(TARG, (p), (l)); PUSHTARG; } STMT_END +#define PUSHp(p,l) \ + STMT_START { sv_setpvn(TARG, (p), (l)); PUSHTARG; } STMT_END #define PUSHpvs(s) PUSHp("" s "", sizeof(s)-1) #define PUSHn(n) STMT_START { TARGn(n,1); PUSHs(TARG); } STMT_END #define PUSHi(i) STMT_START { TARGi(i,1); PUSHs(TARG); } STMT_END @@ -502,7 +506,8 @@ Does not use C. See also C>, C> and C>. #define XPUSHs(s) STMT_START { EXTEND(sp,1); *++sp = (s); } STMT_END #define XPUSHTARG STMT_START { SvSETMAGIC(TARG); XPUSHs(TARG); } STMT_END -#define XPUSHp(p,l) STMT_START { sv_setpvn(TARG, (p), (l)); XPUSHTARG; } STMT_END +#define XPUSHp(p,l) \ + STMT_START { sv_setpvn(TARG, (p), (l)); XPUSHTARG; } STMT_END #define XPUSHpvs(s) XPUSHp("" s "", sizeof(s)-1) #define XPUSHn(n) STMT_START { TARGn(n,1); XPUSHs(TARG); } STMT_END #define XPUSHi(i) STMT_START { TARGi(i,1); XPUSHs(TARG); } STMT_END @@ -527,7 +532,8 @@ Does not use C. See also C>, C> and C>. #define SETs(s) (*sp = s) #define SETTARG STMT_START { SvSETMAGIC(TARG); SETs(TARG); } STMT_END -#define SETp(p,l) STMT_START { sv_setpvn(TARG, (p), (l)); SETTARG; } STMT_END +#define SETp(p,l) \ + STMT_START { sv_setpvn(TARG, (p), (l)); SETTARG; } STMT_END #define SETn(n) STMT_START { TARGn(n,1); SETs(TARG); } STMT_END #define SETi(i) STMT_START { TARGi(i,1); SETs(TARG); } STMT_END #define SETu(u) STMT_START { TARGu(u,1); SETs(TARG); } STMT_END diff --git a/regcomp.h b/regcomp.h index f07358b65faa..41813b8a01e3 100644 --- a/regcomp.h +++ b/regcomp.h @@ -94,7 +94,8 @@ typedef struct regexp_internal { #define PREGf_SKIP 0x00000001 #define PREGf_IMPLICIT 0x00000002 /* Converted .* to ^.* */ -#define PREGf_NAUGHTY 0x00000004 /* how exponential is this pattern? */ +#define PREGf_NAUGHTY 0x00000004 /* how exponential is + this pattern? */ #define PREGf_VERBARG_SEEN 0x00000008 #define PREGf_CUTGROUP_SEEN 0x00000010 #define PREGf_USE_RE_EVAL 0x00000020 /* compiled with "use re 'eval'" */ @@ -515,7 +516,8 @@ struct regnode_ssc { * other options only produce correct results under specific * constraints. */ -#define REGNODE_AFTER_PLUS(p,extra) ((p) + NODE_STEP_REGNODE + (extra)) +#define REGNODE_AFTER_PLUS(p,extra) \ + ((p) + NODE_STEP_REGNODE + (extra)) /* under DEBUGGING we check that all REGNODE_AFTER optimized macros did the * same thing that Perl_regnode_after() would have done. Note that when * not compiled under DEBUGGING the assert_() macro is empty. Thus we @@ -527,11 +529,13 @@ struct regnode_ssc { /* find the regnode after this p by using the opcode we previously extracted * with OP(p) */ -#define REGNODE_AFTER_opcode(p,op) REGNODE_AFTER_PLUS_DEBUG((p),REGNODE_ARG_LEN(op)) +#define REGNODE_AFTER_opcode(p,op) \ + REGNODE_AFTER_PLUS_DEBUG((p),REGNODE_ARG_LEN(op)) /* find the regnode after this p by using the size of the struct associated with * the opcode for p. use this when you *know* that p is pointer to a given type*/ -#define REGNODE_AFTER_type(p,t) REGNODE_AFTER_PLUS_DEBUG((p),EXTRA_SIZE(t)) +#define REGNODE_AFTER_type(p,t) \ + REGNODE_AFTER_PLUS_DEBUG((p),EXTRA_SIZE(t)) /* find the regnode after this p by using OP(p) to find the regnode type of p */ #define REGNODE_AFTER_varies(p) regnode_after(p,TRUE) @@ -821,11 +825,13 @@ ARGp_SET_inline(struct regnode *node, SV *ptr) { #define ANYOF_ALPHA ((CC_ALPHA_) * 2) #define ANYOF_NALPHA ((ANYOF_ALPHA) + 1) -#define ANYOF_ALPHANUMERIC ((CC_ALPHANUMERIC_) * 2) /* [[:alnum:]] isalnum(3), utf8::IsAlnum */ +#define ANYOF_ALPHANUMERIC ((CC_ALPHANUMERIC_) * 2) /* [[:alnum:]] isalnum(3), + utf8::IsAlnum */ #define ANYOF_NALPHANUMERIC ((ANYOF_ALPHANUMERIC) + 1) #define ANYOF_ASCII ((CC_ASCII_) * 2) #define ANYOF_NASCII ((ANYOF_ASCII) + 1) -#define ANYOF_BLANK ((CC_BLANK_) * 2) /* GNU extension: space and tab: non-vertical space */ +#define ANYOF_BLANK ((CC_BLANK_) * 2) /* GNU extension: space and tab: + non-vertical space */ #define ANYOF_NBLANK ((ANYOF_BLANK) + 1) #define ANYOF_CASED ((CC_CASED_) * 2) /* Pseudo class for [:lower:] or [:upper:] under /i */ @@ -846,7 +852,8 @@ ARGp_SET_inline(struct regnode *node, SV *ptr) { #define ANYOF_NSPACE ((ANYOF_SPACE) + 1) #define ANYOF_UPPER ((CC_UPPER_) * 2) #define ANYOF_NUPPER ((ANYOF_UPPER) + 1) -#define ANYOF_WORDCHAR ((CC_WORDCHAR_) * 2) /* \w, PL_utf8_alnum, utf8::IsWord, ALNUM */ +#define ANYOF_WORDCHAR ((CC_WORDCHAR_) * 2) /* \w, PL_utf8_alnum, utf8::IsWord, + ALNUM */ #define ANYOF_NWORDCHAR ((ANYOF_WORDCHAR) + 1) #define ANYOF_XDIGIT ((CC_XDIGIT_) * 2) #define ANYOF_NXDIGIT ((ANYOF_XDIGIT) + 1) @@ -939,12 +946,15 @@ ARGp_SET_inline(struct regnode *node, SV *ptr) { ((ANYOF_FLAGS(p) & ANYOF_MATCHES_POSIXL) \ && ANYOF_POSIXL_BITMAP(p) == nBIT_MASK(ANYOF_POSIXL_MAX)) -#define ANYOF_POSIXL_OR(source, dest) STMT_START { (dest)->classflags |= (source)->classflags; } STMT_END +#define ANYOF_POSIXL_OR(source, dest) \ + STMT_START { (dest)->classflags |= (source)->classflags; } STMT_END #define ANYOF_CLASS_OR(source, dest) ANYOF_POSIXL_OR((source), (dest)) -#define ANYOF_POSIXL_AND(source, dest) STMT_START { (dest)->classflags &= (source)->classflags; } STMT_END +#define ANYOF_POSIXL_AND(source, dest) \ + STMT_START { (dest)->classflags &= (source)->classflags; } STMT_END -#define ANYOF_BITMAP_ZERO(ret) Zero(((regnode_charclass*)(ret))->bitmap, ANYOF_BITMAP_SIZE, char) +#define ANYOF_BITMAP_ZERO(ret) \ + Zero(((regnode_charclass*)(ret))->bitmap, ANYOF_BITMAP_SIZE, char) #define ANYOF_BITMAP(p) ((regnode_charclass*)(p))->bitmap #define ANYOF_BITMAP_BYTE(p, c) BITMAP_BYTE(ANYOF_BITMAP(p), c) #define ANYOF_BITMAP_SET(p, c) (ANYOF_BITMAP_BYTE(p, c) |= ANYOF_BIT(c)) @@ -1183,8 +1193,10 @@ typedef struct _reg_ac_data reg_ac_data; /* these defines assume uniquecharcount is the correct variable, and state may be evaluated twice */ #define TRIE_NODENUM(state) (((state)-1)/(trie->uniquecharcount)+1) -#define SAFE_TRIE_NODENUM(state) ((state) ? (((state)-1)/(trie->uniquecharcount)+1) : (state)) -#define TRIE_NODEIDX(state) ((state) ? (((state)-1)*(trie->uniquecharcount)+1) : (state)) +#define SAFE_TRIE_NODENUM(state) \ + ((state) ? (((state)-1)/(trie->uniquecharcount)+1) : (state)) +#define TRIE_NODEIDX(state) \ + ((state) ? (((state)-1)*(trie->uniquecharcount)+1) : (state)) #ifdef DEBUGGING #define TRIE_CHARCOUNT(trie) ((trie)->charcount) @@ -1364,7 +1376,8 @@ re.pm, especially to the documentation. } \ }) -#define isDEBUG_WILDCARD (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_WILDCARD)) +#define isDEBUG_WILDCARD \ + (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_WILDCARD)) #define RE_PV_COLOR_DECL(rpv,rlen,isuni,dsv,pv,l,m,c1,c2) \ const char * const rpv = \ @@ -1441,7 +1454,8 @@ typedef enum { #if !defined(PERL_IN_XSUB_RE) || defined(PLUGGABLE_RE_EXTENSION) # define GET_REGCLASS_AUX_DATA(a,b,c,d,e,f) get_regclass_aux_data(a,b,c,d,e,f) #else -# define GET_REGCLASS_AUX_DATA(a,b,c,d,e,f) get_re_gclass_aux_data(a,b,c,d,e,f) +# define GET_REGCLASS_AUX_DATA(a,b,c,d,e,f) \ + get_re_gclass_aux_data(a,b,c,d,e,f) #endif #define REGNODE_TYPE(node) (PL_regnode_info[(node)].type) diff --git a/regexp.h b/regexp.h index 2f18b4fbb800..4d0d2d1e4ca4 100644 --- a/regexp.h +++ b/regexp.h @@ -57,7 +57,8 @@ struct reg_substr_data { }; # ifdef PERL_ANY_COW -# define SV_SAVED_COPY SV *saved_copy; /* If non-NULL, SV which is COW from original */ +# define SV_SAVED_COPY SV *saved_copy; /* If non-NULL, SV which is + COW from original */ # else # define SV_SAVED_COPY # endif @@ -77,12 +78,15 @@ typedef struct regexp_paren_pair { } regexp_paren_pair; # if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_UTF8_C) -# define _invlist_union(a, b, output) _invlist_union_maybe_complement_2nd(a, b, FALSE, output) -# define _invlist_intersection(a, b, output) _invlist_intersection_maybe_complement_2nd(a, b, FALSE, output) +# define _invlist_union(a, b, output) \ + _invlist_union_maybe_complement_2nd(a, b, FALSE, output) +# define _invlist_intersection(a, b, output) \ + _invlist_intersection_maybe_complement_2nd(a, b, FALSE, output) /* Subtracting b from a leaves in a everything that was there that isn't in b, * that is the intersection of a with b's complement */ -# define _invlist_subtract(a, b, output) _invlist_intersection_maybe_complement_2nd(a, b, TRUE, output) +# define _invlist_subtract(a, b, output) \ + _invlist_intersection_maybe_complement_2nd(a, b, TRUE, output) # endif /* record the position of a (?{...}) within a pattern */ @@ -302,7 +306,8 @@ and check for NULL. # include "op_reg_common.h" -# define RXf_PMf_STD_PMMOD (RXf_PMf_MULTILINE|RXf_PMf_SINGLELINE|RXf_PMf_FOLD|RXf_PMf_EXTENDED|RXf_PMf_EXTENDED_MORE|RXf_PMf_NOCAPTURE) +# define RXf_PMf_STD_PMMOD \ + (RXf_PMf_MULTILINE|RXf_PMf_SINGLELINE|RXf_PMf_FOLD|RXf_PMf_EXTENDED|RXf_PMf_EXTENDED_MORE|RXf_PMf_NOCAPTURE) # define CASE_STD_PMMOD_FLAGS_PARSE_SET(pmfl, x_count) \ case IGNORE_PAT_MOD: *(pmfl) |= RXf_PMf_FOLD; break; \ @@ -364,7 +369,8 @@ and check for NULL. * character is bit +1, etc. */ # define STD_PAT_MODS "msixxn" -# define CHARSET_PAT_MODS ASCII_RESTRICT_PAT_MODS DEPENDS_PAT_MODS LOCALE_PAT_MODS UNICODE_PAT_MODS +# define CHARSET_PAT_MODS \ + ASCII_RESTRICT_PAT_MODS DEPENDS_PAT_MODS LOCALE_PAT_MODS UNICODE_PAT_MODS /* This string is expected by XS_re_regexp_pattern() in universal.c to be ordered * so that the first character is the flag in bit RXf_PMf_STD_PMMOD_SHIFT of @@ -374,7 +380,8 @@ and check for NULL. # define EXT_PAT_MODS ONCE_PAT_MODS KEEPCOPY_PAT_MODS NOCAPTURE_PAT_MODS # define QR_PAT_MODS STD_PAT_MODS EXT_PAT_MODS CHARSET_PAT_MODS # define M_PAT_MODS QR_PAT_MODS LOOP_PAT_MODS -# define S_PAT_MODS M_PAT_MODS EXEC_PAT_MODS NONDESTRUCT_PAT_MODS +# define S_PAT_MODS \ + M_PAT_MODS EXEC_PAT_MODS NONDESTRUCT_PAT_MODS /* * NOTE: if you modify any RXf flags you should run regen.pl or @@ -486,15 +493,22 @@ and check for NULL. # define RX_ISTAINTED(rx_sv) (RX_EXTFLAGS(rx_sv) & RXf_TAINTED) # define RXp_ISTAINTED(prog) (RXp_EXTFLAGS(prog) & RXf_TAINTED) # define RX_TAINT_on(rx_sv) (RX_EXTFLAGS(rx_sv) |= RXf_TAINTED) -# define RXp_MATCH_TAINTED(prog) (RXp_EXTFLAGS(prog) & RXf_TAINTED_SEEN) -# define RX_MATCH_TAINTED(rx_sv) (RX_EXTFLAGS(rx_sv) & RXf_TAINTED_SEEN) -# define RXp_MATCH_TAINTED_on(prog) (RXp_EXTFLAGS(prog) |= RXf_TAINTED_SEEN) -# define RX_MATCH_TAINTED_on(rx_sv) (RX_EXTFLAGS(rx_sv) |= RXf_TAINTED_SEEN) -# define RXp_MATCH_TAINTED_off(prog) (RXp_EXTFLAGS(prog) &= ~RXf_TAINTED_SEEN) -# define RX_MATCH_TAINTED_off(rx_sv) (RX_EXTFLAGS(rx_sv) &= ~RXf_TAINTED_SEEN) +# define RXp_MATCH_TAINTED(prog) \ + (RXp_EXTFLAGS(prog) & RXf_TAINTED_SEEN) +# define RX_MATCH_TAINTED(rx_sv) \ + (RX_EXTFLAGS(rx_sv) & RXf_TAINTED_SEEN) +# define RXp_MATCH_TAINTED_on(prog) \ + (RXp_EXTFLAGS(prog) |= RXf_TAINTED_SEEN) +# define RX_MATCH_TAINTED_on(rx_sv) \ + (RX_EXTFLAGS(rx_sv) |= RXf_TAINTED_SEEN) +# define RXp_MATCH_TAINTED_off(prog) \ + (RXp_EXTFLAGS(prog) &= ~RXf_TAINTED_SEEN) +# define RX_MATCH_TAINTED_off(rx_sv) \ + (RX_EXTFLAGS(rx_sv) &= ~RXf_TAINTED_SEEN) # endif -# define RXp_HAS_CUTGROUP(prog) ((prog)->intflags & PREGf_CUTGROUP_SEEN) +# define RXp_HAS_CUTGROUP(prog) \ + ((prog)->intflags & PREGf_CUTGROUP_SEEN) # define RX_MATCH_TAINTED_set(rx_sv, t) \ ((t) \ @@ -651,7 +665,8 @@ and check for NULL. #define FBMcf_TAIL_DOLLARM 2 #define FBMcf_TAIL_Z 4 #define FBMcf_TAIL_z 8 -#define FBMcf_TAIL (FBMcf_TAIL_DOLLAR|FBMcf_TAIL_DOLLARM|FBMcf_TAIL_Z|FBMcf_TAIL_z) +#define FBMcf_TAIL \ + (FBMcf_TAIL_DOLLAR|FBMcf_TAIL_DOLLARM|FBMcf_TAIL_Z|FBMcf_TAIL_z) #define FBMrf_MULTILINE 1 diff --git a/sbox32_hash.h b/sbox32_hash.h index 6b37b1d91d1d..4cecf19d9e00 100644 --- a/sbox32_hash.h +++ b/sbox32_hash.h @@ -5,7 +5,8 @@ #if DEBUG_SBOX32_HASH == 1 #include -#define SBOX32_WARN6(pat,v0,v1,v2,v3,v4,v5) printf(pat, v0, v1, v2, v3, v4, v5) +#define SBOX32_WARN6(pat,v0,v1,v2,v3,v4,v5) \ + printf(pat, v0, v1, v2, v3, v4, v5) #define SBOX32_WARN5(pat,v0,v1,v2,v3,v4) printf(pat, v0, v1, v2, v3, v4) #define SBOX32_WARN4(pat,v0,v1,v2,v3) printf(pat, v0, v1, v2, v3) #define SBOX32_WARN3(pat,v0,v1,v2) printf(pat, v0, v1, v2) diff --git a/scope.h b/scope.h index 5b77da49f7eb..5c13fa9366c7 100644 --- a/scope.h +++ b/scope.h @@ -96,8 +96,10 @@ * macros */ #define SS_MAXPUSH 4 -#define SSCHECK(need) if (UNLIKELY(PL_savestack_ix + (I32)(need) > PL_savestack_max)) savestack_grow() -#define SSGROW(need) if (UNLIKELY(PL_savestack_ix + (I32)(need) > PL_savestack_max)) savestack_grow_cnt(need) +#define SSCHECK(need) \ + if (UNLIKELY(PL_savestack_ix + (I32)(need) > PL_savestack_max)) savestack_grow() +#define SSGROW(need) \ + if (UNLIKELY(PL_savestack_ix + (I32)(need) > PL_savestack_max)) savestack_grow_cnt(need) #define SSPUSHINT(i) (PL_savestack[PL_savestack_ix++].any_i32 = (I32)(i)) #define SSPUSHLONG(i) (PL_savestack[PL_savestack_ix++].any_long = (long)(i)) #define SSPUSHBOOL(p) (PL_savestack[PL_savestack_ix++].any_bool = (p)) @@ -289,7 +291,8 @@ scope has the given name. C must be a literal string. could have done savefreesharedpvREF, but this way actually seems cleaner, as it simplifies the code that does the saves, and reduces the load on the save stack. */ -#define SAVECOMPILEWARNINGS() save_pushptr(PL_compiling.cop_warnings, SAVEt_COMPILE_WARNINGS) +#define SAVECOMPILEWARNINGS() \ + save_pushptr(PL_compiling.cop_warnings, SAVEt_COMPILE_WARNINGS) #define SAVEPARSER(p) save_pushptr((p), SAVEt_PARSER) diff --git a/sv.h b/sv.h index 15f72209c305..692333801aaf 100644 --- a/sv.h +++ b/sv.h @@ -184,7 +184,8 @@ typedef enum { # define HVAUX_ARENA_ROOT_IX SVt_IV #endif #ifdef PERL_IN_SV_C -# define SVt_FIRST SVt_NULL /* the type of SV that new_SV() in sv.c returns */ +# define SVt_FIRST SVt_NULL /* the type of SV that new_SV() + in sv.c returns */ #endif #define PERL_ARENA_ROOTS_SIZE (SVt_LAST) @@ -473,7 +474,8 @@ perform the upgrade if necessary. See C>. /* scalar SVs with SVp_POK */ -#define SVppv_STATIC 0x40000000 /* PV is pointer to static const; must be set with SVf_IsCOW */ +#define SVppv_STATIC 0x40000000 /* PV is pointer to static const; + must be set with SVf_IsCOW */ /* PVAV */ #define SVpav_REAL 0x40000000 /* free old entries */ /* PVHV */ @@ -980,11 +982,13 @@ Set the size of the string buffer for the SV. See C>. ((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV)) \ == SVf_IOK) -#define SvIandPOK(sv) ((SvFLAGS(sv) & (SVf_IOK|SVf_POK)) == (SVf_IOK|SVf_POK)) +#define SvIandPOK(sv) \ + ((SvFLAGS(sv) & (SVf_IOK|SVf_POK)) == (SVf_IOK|SVf_POK)) #define SvIandPOK_on(sv) \ (assert_not_glob(sv) \ (SvFLAGS(sv) |= (SVf_IOK|SVp_IOK|SVf_POK|SVp_POK))) -#define SvIandPOK_off(sv) (SvFLAGS(sv) &= ~(SVf_IOK|SVp_IOK|SVf_IVisUV|SVf_POK|SVp_POK)) +#define SvIandPOK_off(sv) \ + (SvFLAGS(sv) &= ~(SVf_IOK|SVp_IOK|SVf_IVisUV|SVf_POK|SVp_POK)) #define SvBoolFlagsOK(sv) SvIandPOK(sv) @@ -1132,21 +1136,31 @@ not. /* "nog" means "doesn't have get magic" */ #define SvPOK_nog(sv) ((SvFLAGS(sv) & (SVf_POK|SVs_GMG)) == SVf_POK) #define SvIOK_nog(sv) ((SvFLAGS(sv) & (SVf_IOK|SVs_GMG)) == SVf_IOK) -#define SvUOK_nog(sv) ((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV|SVs_GMG)) == (SVf_IOK|SVf_IVisUV)) +#define SvUOK_nog(sv) \ + ((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV|SVs_GMG)) == (SVf_IOK|SVf_IVisUV)) #define SvNOK_nog(sv) ((SvFLAGS(sv) & (SVf_NOK|SVs_GMG)) == SVf_NOK) #define SvNIOK_nog(sv) (SvNIOK(sv) && !(SvFLAGS(sv) & SVs_GMG)) -#define SvPOK_nogthink(sv) ((SvFLAGS(sv) & (SVf_POK|SVf_THINKFIRST|SVs_GMG)) == SVf_POK) -#define SvIOK_nogthink(sv) ((SvFLAGS(sv) & (SVf_IOK|SVf_THINKFIRST|SVs_GMG)) == SVf_IOK) -#define SvUOK_nogthink(sv) ((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV|SVf_THINKFIRST|SVs_GMG)) == (SVf_IOK|SVf_IVisUV)) -#define SvNOK_nogthink(sv) ((SvFLAGS(sv) & (SVf_NOK|SVf_THINKFIRST|SVs_GMG)) == SVf_NOK) -#define SvNIOK_nogthink(sv) (SvNIOK(sv) && !(SvFLAGS(sv) & (SVf_THINKFIRST|SVs_GMG))) - -#define SvPOK_utf8_nog(sv) ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8|SVs_GMG)) == (SVf_POK|SVf_UTF8)) -#define SvPOK_utf8_nogthink(sv) ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8|SVf_THINKFIRST|SVs_GMG)) == (SVf_POK|SVf_UTF8)) - -#define SvPOK_byte_nog(sv) ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8|SVs_GMG)) == SVf_POK) -#define SvPOK_byte_nogthink(sv) ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8|SVf_THINKFIRST|SVs_GMG)) == SVf_POK) +#define SvPOK_nogthink(sv) \ + ((SvFLAGS(sv) & (SVf_POK|SVf_THINKFIRST|SVs_GMG)) == SVf_POK) +#define SvIOK_nogthink(sv) \ + ((SvFLAGS(sv) & (SVf_IOK|SVf_THINKFIRST|SVs_GMG)) == SVf_IOK) +#define SvUOK_nogthink(sv) \ + ((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV|SVf_THINKFIRST|SVs_GMG)) == (SVf_IOK|SVf_IVisUV)) +#define SvNOK_nogthink(sv) \ + ((SvFLAGS(sv) & (SVf_NOK|SVf_THINKFIRST|SVs_GMG)) == SVf_NOK) +#define SvNIOK_nogthink(sv) \ + (SvNIOK(sv) && !(SvFLAGS(sv) & (SVf_THINKFIRST|SVs_GMG))) + +#define SvPOK_utf8_nog(sv) \ + ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8|SVs_GMG)) == (SVf_POK|SVf_UTF8)) +#define SvPOK_utf8_nogthink(sv) \ + ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8|SVf_THINKFIRST|SVs_GMG)) == (SVf_POK|SVf_UTF8)) + +#define SvPOK_byte_nog(sv) \ + ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8|SVs_GMG)) == SVf_POK) +#define SvPOK_byte_nogthink(sv) \ + ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8|SVf_THINKFIRST|SVs_GMG)) == SVf_POK) #define SvPOK_pure_nogthink(sv) \ ((SvFLAGS(sv) & (SVf_POK|SVf_IOK|SVf_NOK|SVf_ROK|SVpgv_GP|SVf_THINKFIRST|SVs_GMG)) == SVf_POK) @@ -1272,7 +1286,8 @@ object type. Exposed to perl code via Internals::SvREADONLY(). # define SvREADONLY_off(sv) (SvFLAGS(sv) &= ~SVf_READONLY) #endif -#define SvSCREAM(sv) ((SvFLAGS(sv) & (SVp_SCREAM|SVp_POK)) == (SVp_SCREAM|SVp_POK)) +#define SvSCREAM(sv) \ + ((SvFLAGS(sv) & (SVp_SCREAM|SVp_POK)) == (SVp_SCREAM|SVp_POK)) #define SvSCREAM_on(sv) (SvFLAGS(sv) |= SVp_SCREAM) #define SvSCREAM_off(sv) (SvFLAGS(sv) &= ~SVp_SCREAM) @@ -1327,8 +1342,10 @@ object type. Exposed to perl code via Internals::SvREADONLY(). # define SvLEN(sv) (0 + ((XPV*) SvANY(sv))->xpv_len) # define SvEND(sv) ((sv)->sv_u.svu_pv + ((XPV*)SvANY(sv))->xpv_cur) -# define SvMAGIC(sv) (0 + *(assert_(SvTYPE(sv) >= SVt_PVMG) &((XPVMG*) SvANY(sv))->xmg_u.xmg_magic)) -# define SvSTASH(sv) (0 + *(assert_(SvTYPE(sv) >= SVt_PVMG) &((XPVMG*) SvANY(sv))->xmg_stash)) +# define SvMAGIC(sv) \ + (0 + *(assert_(SvTYPE(sv) >= SVt_PVMG) &((XPVMG*) SvANY(sv))->xmg_u.xmg_magic)) +# define SvSTASH(sv) \ + (0 + *(assert_(SvTYPE(sv) >= SVt_PVMG) &((XPVMG*) SvANY(sv))->xmg_stash)) #else /* Below is not PERL_DEBUG_COW */ # ifdef PERL_CORE # define SvLEN(sv) (0 + ((XPV*) SvANY(sv))->xpv_len) @@ -1697,8 +1714,10 @@ attention to precisely which outputs are influenced by which inputs. #else # define SvTAINTED(sv) (SvMAGICAL(sv) && sv_tainted(sv)) #endif -#define SvTAINTED_on(sv) STMT_START{ if(UNLIKELY(TAINTING_get)){sv_taint(sv);} }STMT_END -#define SvTAINTED_off(sv) STMT_START{ if(UNLIKELY(TAINTING_get)){sv_untaint(sv);} }STMT_END +#define SvTAINTED_on(sv) \ + STMT_START{ if(UNLIKELY(TAINTING_get)){sv_taint(sv);} }STMT_END +#define SvTAINTED_off(sv) \ + STMT_START{ if(UNLIKELY(TAINTING_get)){sv_untaint(sv);} }STMT_END #define SvTAINT(sv) \ STMT_START { \ @@ -2062,8 +2081,10 @@ END_EXTERN_C #define SvIsCOW(sv) (SvFLAGS(sv) & SVf_IsCOW) #define SvIsCOW_on(sv) (SvFLAGS(sv) |= SVf_IsCOW) #define SvIsCOW_off(sv) (SvFLAGS(sv) &= ~(SVf_IsCOW|SVppv_STATIC)) -#define SvIsCOW_shared_hash(sv) ((SvFLAGS(sv) & (SVf_IsCOW|SVppv_STATIC)) == (SVf_IsCOW) && SvLEN(sv) == 0) -#define SvIsCOW_static(sv) ((SvFLAGS(sv) & (SVf_IsCOW|SVppv_STATIC)) == (SVf_IsCOW|SVppv_STATIC)) +#define SvIsCOW_shared_hash(sv) \ + ((SvFLAGS(sv) & (SVf_IsCOW|SVppv_STATIC)) == (SVf_IsCOW) && SvLEN(sv) == 0) +#define SvIsCOW_static(sv) \ + ((SvFLAGS(sv) & (SVf_IsCOW|SVppv_STATIC)) == (SVf_IsCOW|SVppv_STATIC)) #define SvSHARED_HEK_FROM_PV(pvx) \ ((struct hek*)(pvx - STRUCT_OFFSET(struct hek, hek_key))) @@ -2186,10 +2207,13 @@ immediately written again. #define sv_pvbyte(sv) SvPVbyte_nolen(sv) #define sv_pvn_force_nomg(sv, lp) sv_pvn_force_flags(sv, lp, 0) -#define sv_utf8_upgrade_flags(sv, flags) sv_utf8_upgrade_flags_grow(sv, flags, 0) +#define sv_utf8_upgrade_flags(sv, flags) \ + sv_utf8_upgrade_flags_grow(sv, flags, 0) #define sv_utf8_upgrade_nomg(sv) sv_utf8_upgrade_flags(sv, 0) -#define sv_utf8_downgrade(sv, fail_ok) sv_utf8_downgrade_flags(sv, fail_ok, SV_GMAGIC) -#define sv_utf8_downgrade_nomg(sv, fail_ok) sv_utf8_downgrade_flags(sv, fail_ok, 0) +#define sv_utf8_downgrade(sv, fail_ok) \ + sv_utf8_downgrade_flags(sv, fail_ok, SV_GMAGIC) +#define sv_utf8_downgrade_nomg(sv, fail_ok) \ + sv_utf8_downgrade_flags(sv, fail_ok, 0) #define sv_catpvn_nomg(dsv, sstr, slen) sv_catpvn_flags(dsv, sstr, slen, 0) #define sv_catpv_nomg(dsv, sstr) sv_catpv_flags(dsv, sstr, 0) #define sv_setsv(dsv, ssv) \ @@ -2199,7 +2223,8 @@ immediately written again. #define sv_catsv_nomg(dsv, ssv) sv_catsv_flags(dsv, ssv, 0) #define sv_catsv_mg(dsv, ssv) sv_catsv_flags(dsv, ssv, SV_GMAGIC|SV_SMAGIC) #define sv_catpvn(dsv, sstr, slen) sv_catpvn_flags(dsv, sstr, slen, SV_GMAGIC) -#define sv_catpvn_mg(dsv, sstr, slen) sv_catpvn_flags(dsv, sstr, slen, SV_GMAGIC|SV_SMAGIC); +#define sv_catpvn_mg(dsv, sstr, slen) \ + sv_catpvn_flags(dsv, sstr, slen, SV_GMAGIC|SV_SMAGIC); #define sv_copypv(dsv, ssv) sv_copypv_flags(dsv, ssv, SV_GMAGIC) #define sv_copypv_nomg(dsv, ssv) sv_copypv_flags(dsv, ssv, 0) #define sv_2pv(sv, lp) sv_2pv_flags(sv, lp, SV_GMAGIC) @@ -2333,7 +2358,8 @@ properly null terminated. Equivalent to sv_setpvs(""), but more efficient. #define SvUNLOCK(sv) PL_unlockhook(aTHX_ sv) #define SvDESTROYABLE(sv) PL_destroyhook(aTHX_ sv) -#define SvSETMAGIC(x) STMT_START { if (UNLIKELY(SvSMAGICAL(x))) mg_set(x); } STMT_END +#define SvSETMAGIC(x) \ + STMT_START { if (UNLIKELY(SvSMAGICAL(x))) mg_set(x); } STMT_END #define SvSetSV_and(dst,src,finally) \ STMT_START { \ diff --git a/thread.h b/thread.h index 2f084e49e14e..9d8cbceb4dfc 100644 --- a/thread.h +++ b/thread.h @@ -41,7 +41,8 @@ # define pthread_attr_init(a) pthread_attr_create(a) # define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_setdetach_np(a,s) # define PTHREAD_CREATE(t,a,s,d) pthread_create(t,a,s,d) -# define pthread_key_create(k,d) pthread_keycreate(k,(pthread_destructor_t)(d)) +# define pthread_key_create(k,d) \ + pthread_keycreate(k,(pthread_destructor_t)(d)) # define pthread_mutexattr_init(a) pthread_mutexattr_create(a) # define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t) # endif @@ -50,12 +51,14 @@ /* XXX pthread_setdetach_np() missing in DCE threads on HP-UX 10.20 */ # define PTHREAD_ATTR_SETDETACHSTATE(a,s) (0) # define PTHREAD_CREATE(t,a,s,d) pthread_create(t,a,s,d) -# define pthread_key_create(k,d) pthread_keycreate(k,(pthread_destructor_t)(d)) +# define pthread_key_create(k,d) \ + pthread_keycreate(k,(pthread_destructor_t)(d)) # define pthread_mutexattr_init(a) pthread_mutexattr_create(a) # define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t) # endif # if defined(OEMVS) -# define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_attr_setdetachstate(a,&(s)) +# define PTHREAD_ATTR_SETDETACHSTATE(a,s) \ + pthread_attr_setdetachstate(a,&(s)) # define YIELD pthread_yield(NULL) # endif # endif diff --git a/utf8.h b/utf8.h index bca5e924f0de..17a0bd3785c2 100644 --- a/utf8.h +++ b/utf8.h @@ -747,7 +747,8 @@ uppercase/lowercase/titlecase/fold into. (LO)))) /* Should never be used, and be deprecated */ -#define TWO_BYTE_UTF8_TO_UNI(HI, LO) NATIVE_TO_UNI(TWO_BYTE_UTF8_TO_NATIVE(HI, LO)) +#define TWO_BYTE_UTF8_TO_UNI(HI, LO) \ + NATIVE_TO_UNI(TWO_BYTE_UTF8_TO_NATIVE(HI, LO)) /* diff --git a/utfebcdic.h b/utfebcdic.h index 1e5fc777f9ab..c0e153877039 100644 --- a/utfebcdic.h +++ b/utfebcdic.h @@ -133,12 +133,16 @@ END_EXTERN_C /* EBCDIC-happy ways of converting native code to UTF-8 */ /* Use these when ch is known to be < 256 */ -#define NATIVE_TO_LATIN1(ch) (__ASSERT_(FITS_IN_8_BITS(ch)) PL_e2a[(U8)(ch)]) -#define LATIN1_TO_NATIVE(ch) (__ASSERT_(FITS_IN_8_BITS(ch)) PL_a2e[(U8)(ch)]) +#define NATIVE_TO_LATIN1(ch) \ + (__ASSERT_(FITS_IN_8_BITS(ch)) PL_e2a[(U8)(ch)]) +#define LATIN1_TO_NATIVE(ch) \ + (__ASSERT_(FITS_IN_8_BITS(ch)) PL_a2e[(U8)(ch)]) /* Use these on bytes */ -#define NATIVE_UTF8_TO_I8(b) (__ASSERT_(FITS_IN_8_BITS(b)) PL_e2utf[(U8)(b)]) -#define I8_TO_NATIVE_UTF8(b) (__ASSERT_(FITS_IN_8_BITS(b)) PL_utf2e[(U8)(b)]) +#define NATIVE_UTF8_TO_I8(b) \ + (__ASSERT_(FITS_IN_8_BITS(b)) PL_e2utf[(U8)(b)]) +#define I8_TO_NATIVE_UTF8(b) \ + (__ASSERT_(FITS_IN_8_BITS(b)) PL_utf2e[(U8)(b)]) /* Transforms in wide UV chars */ #define NATIVE_TO_UNI(ch) \ diff --git a/util.h b/util.h index 20653e77cc3a..a2eb2774818f 100644 --- a/util.h +++ b/util.h @@ -177,13 +177,16 @@ typedef struct { selectable. These spare bits allow for additional features for the varargs stuff or ABI compat test flags in the future. */ -#define HSm_APIVERLEN 0x0000001F /* perl version string won't be more than 31 chars */ +#define HSm_APIVERLEN 0x0000001F /* perl version string won't + be more than 31 chars */ #define HS_APIVERLEN_MAX HSm_APIVERLEN -#define HSm_XSVERLEN 0x0000FF00 /* if 0, not present, dont check, die if over 255*/ +#define HSm_XSVERLEN 0x0000FF00 /* if 0, not present, dont check, + die if over 255*/ #define HS_XSVERLEN_MAX 0xFF /* uses var file to set default filename for newXS_deffile to use for CvFILE */ #define HSf_SETXSUBFN 0x00000020 -#define HSf_POPMARK 0x00000040 /* popmark mode or you must supply ax and items */ +#define HSf_POPMARK 0x00000040 /* popmark mode or you must + supply ax and items */ #define HSf_IMP_CXT 0x00000080 /* ABI, threaded, MULTIPLICITY, pTHX_ present */ #define HSm_INTRPSIZE 0xFFFF0000 /* ABI, interp struct size */ /* A mask of bits in the key which must always match between a XS mod and interp. @@ -191,7 +194,8 @@ typedef struct { the unlikely interp size will all 1 bits */ /* Maybe HSm_APIVERLEN one day if Perl_xs_apiversion_bootcheck is changed to a memcmp */ #define HSm_KEY_MATCH (HSm_INTRPSIZE|HSf_IMP_CXT) -#define HSf_NOCHK HSm_KEY_MATCH /* if all ABI bits are 1 in the key, dont chk */ +#define HSf_NOCHK HSm_KEY_MATCH /* if all ABI bits are 1 in + the key, dont chk */ #define HS_GETINTERPSIZE(key) ((key) >> 16) diff --git a/vutil.h b/vutil.h index 49b600506068..a736015a6840 100644 --- a/vutil.h +++ b/vutil.h @@ -13,7 +13,8 @@ #if PERL_VERSION_LT(5,15,4) # define ISA_VERSION_OBJ(v) (sv_isobject(v) && sv_derived_from(v,"version")) #else -# define ISA_VERSION_OBJ(v) (sv_isobject(v) && sv_derived_from_pvn(v,"version",7,0)) +# define ISA_VERSION_OBJ(v) \ + (sv_isobject(v) && sv_derived_from_pvn(v,"version",7,0)) #endif #if PERL_VERSION_GE(5,9,0) && !defined(PERL_CORE) @@ -39,7 +40,8 @@ static const char * Perl_prescan_version2(pTHX_ const char *s, bool strict, cons # define VNUMIFY(a) Perl_vnumify2(aTHX_ a) # define VNORMAL(a) Perl_vnormal2(aTHX_ a) # define VCMP(a,b) Perl_vcmp2(aTHX_ a,b) -# define PRESCAN_VERSION(a,b,c,d,e,f,g) Perl_prescan_version2(aTHX_ a,b,c,d,e,f,g) +# define PRESCAN_VERSION(a,b,c,d,e,f,g) \ + Perl_prescan_version2(aTHX_ a,b,c,d,e,f,g) # undef is_LAX_VERSION # define is_LAX_VERSION(a,b) \ (a != Perl_prescan_version2(aTHX_ a, FALSE, b, NULL, NULL, NULL, NULL)) @@ -68,7 +70,8 @@ const char * Perl_prescan_version(pTHX_ const char *s, bool strict, const char** # define VNORMAL(a) Perl_vnormal(aTHX_ a) # define VCMP(a,b) Perl_vcmp(aTHX_ a,b) -# define PRESCAN_VERSION(a,b,c,d,e,f,g) Perl_prescan_version(aTHX_ a,b,c,d,e,f,g) +# define PRESCAN_VERSION(a,b,c,d,e,f,g) \ + Perl_prescan_version(aTHX_ a,b,c,d,e,f,g) # ifndef is_LAX_VERSION # define is_LAX_VERSION(a,b) \ (a != Perl_prescan_version(aTHX_ a, FALSE, b, NULL, NULL, NULL, NULL)) diff --git a/zaphod32_hash.h b/zaphod32_hash.h index 138fcf663ca4..1ec2ab0a6522 100644 --- a/zaphod32_hash.h +++ b/zaphod32_hash.h @@ -3,7 +3,8 @@ #if DEBUG_ZAPHOD32_HASH == 1 #include -#define ZAPHOD32_WARN6(pat,v0,v1,v2,v3,v4,v5) printf(pat, v0, v1, v2, v3, v4, v5) +#define ZAPHOD32_WARN6(pat,v0,v1,v2,v3,v4,v5) \ + printf(pat, v0, v1, v2, v3, v4, v5) #define ZAPHOD32_WARN5(pat,v0,v1,v2,v3,v4) printf(pat, v0, v1, v2, v3, v4) #define ZAPHOD32_WARN4(pat,v0,v1,v2,v3) printf(pat, v0, v1, v2, v3) #define ZAPHOD32_WARN3(pat,v0,v1,v2) printf(pat, v0, v1, v2)