Skip to content

Commit 0d4a0c0

Browse files
committed
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.
1 parent 3ef16c5 commit 0d4a0c0

29 files changed

+414
-203
lines changed

XSUB.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,8 @@ Rethrows a previously caught exception. See L<perlguts/"Exception Handling">.
386386
HS_CXT, __FILE__, "v" PERL_API_VERSION_STRING, XS_VERSION)
387387
#else
388388
/* should this be a #error? if you want both checked, you better supply XS_VERSION right? */
389-
# define XS_BOTHVERSION_SETXSUBFN_POPMARK_BOOTCHECK XS_APIVERSION_SETXSUBFN_POPMARK_BOOTCHECK
389+
# define XS_BOTHVERSION_SETXSUBFN_POPMARK_BOOTCHECK \
390+
XS_APIVERSION_SETXSUBFN_POPMARK_BOOTCHECK
390391
#endif
391392

392393
/* For a normal bootstrap without API or XS version checking.

cop.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -531,14 +531,16 @@ string C<p>, creating the package if necessary.
531531
((c)->cop_stashoff = (hv) \
532532
? alloccopstash(hv) \
533533
: 0)
534-
# define CopFILE_free(c) (PerlMemShared_free(CopFILE(c)),(CopFILE(c) = NULL))
534+
# define CopFILE_free(c) \
535+
(PerlMemShared_free(CopFILE(c)),(CopFILE(c) = NULL))
535536

536537
#else /* Above: yes threads; Below no threads */
537538

538539
# define CopFILEGV(c) ((c)->cop_filegv)
539540
# define CopFILEGV_set(c,gv) ((c)->cop_filegv = (GV*)SvREFCNT_inc(gv))
540541
# define CopFILE_set(c,pv) CopFILEGV_set((c), gv_fetchfile(pv))
541-
# define CopFILE_setn(c,pv,l) CopFILEGV_set((c), gv_fetchfile_flags((pv),(l),0))
542+
# define CopFILE_setn(c,pv,l) \
543+
CopFILEGV_set((c), gv_fetchfile_flags((pv),(l),0))
542544
# define CopFILESV(c) (CopFILEGV(c) ? GvSV(CopFILEGV(c)) : NULL)
543545
# define CopFILEAV(c) (CopFILEGV(c) ? GvAV(CopFILEGV(c)) : NULL)
544546
# ifdef DEBUGGING
@@ -552,7 +554,8 @@ string C<p>, creating the package if necessary.
552554
? GvNAME(CopFILEGV(c))+2 : NULL)
553555
# define CopSTASH(c) ((c)->cop_stash)
554556
# define CopSTASH_set(c,hv) ((c)->cop_stash = (hv))
555-
# define CopFILE_free(c) (SvREFCNT_dec(CopFILEGV(c)),(CopFILEGV(c) = NULL))
557+
# define CopFILE_free(c) \
558+
(SvREFCNT_dec(CopFILEGV(c)),(CopFILEGV(c) = NULL))
556559

557560
#endif /* USE_ITHREADS */
558561

@@ -683,7 +686,8 @@ by setting C<*flags> to 0 or C<SVf_UTF8>.
683686

684687
#define CopLABEL(c) Perl_cop_fetch_label(aTHX_ (c), NULL, NULL)
685688
#define CopLABEL_len(c,len) Perl_cop_fetch_label(aTHX_ (c), len, NULL)
686-
#define CopLABEL_len_flags(c,len,flags) Perl_cop_fetch_label(aTHX_ (c), len, flags)
689+
#define CopLABEL_len_flags(c,len,flags) \
690+
Perl_cop_fetch_label(aTHX_ (c), len, flags)
687691
#define CopLABEL_alloc(pv) ((pv)?savepv(pv):NULL)
688692

689693
#define CopSTASH_ne(c,hv) (!CopSTASH_eq(c,hv))
@@ -841,7 +845,8 @@ struct block_loop {
841845

842846
#define CxLABEL(c) (CopLABEL((c)->blk_oldcop))
843847
#define CxLABEL_len(c,len) (CopLABEL_len((c)->blk_oldcop, len))
844-
#define CxLABEL_len_flags(c,len,flags) ((const char *)CopLABEL_len_flags((c)->blk_oldcop, len, flags))
848+
#define CxLABEL_len_flags(c,len,flags) \
849+
((const char *)CopLABEL_len_flags((c)->blk_oldcop, len, flags))
845850
#define CxHASARGS(c) (((c)->cx_type & CXp_HASARGS) == CXp_HASARGS)
846851

847852
/* CxLVAL(): the lval flags of the call site: the relevant flag bits from

cv.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ See L<perlguts/Autoloading with XSUBs>.
3838
# define Nullcv Null(CV*)
3939
#endif
4040

41-
#define CvSTASH(sv) (MUTABLE_HV(((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_stash))
41+
#define CvSTASH(sv) \
42+
(MUTABLE_HV(((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_stash))
4243
#define CvSTASH_set(cv,st) Perl_cvstash_set(aTHX_ cv, st)
4344
#define CvSTART(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_start_u.xcv_start
4445
#define CvROOT(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_root_u.xcv_root
4546
#define CvXSUB(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_root_u.xcv_xsub
46-
#define CvXSUBANY(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_start_u.xcv_xsubany
47+
#define CvXSUBANY(sv) \
48+
((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_start_u.xcv_xsubany
4749
#define CvGV(sv) Perl_CvGV(aTHX_ (CV *)(sv))
4850
#define CvGV_set(cv,gv) Perl_cvgv_set(aTHX_ cv, gv)
4951
#define CvHASGV(cv) cBOOL(SvANY(cv)->xcv_gv_u.xcv_gv)

dosish.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
#else
2222
# define PERL_SYS_INIT_BODY(c,v) \
2323
MALLOC_CHECK_TAINT2(*c,*v); PERLIO_INIT
24-
# define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined, or somethin?" */
24+
# define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined,
25+
or somethin?" */
2526
#endif
2627

2728
/* Generally add things last-in first-terminated. IO and memory terminations

gv.h

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,12 @@ struct gp {
5454
assert(SvTYPE(_gvname_hek) == SVt_PVGV || SvTYPE(_gvname_hek) >= SVt_PVLV); \
5555
&(GvXPVGV(_gvname_hek)->xiv_u.xivu_namehek); \
5656
}))
57-
# define GvNAME_get(gv) ({ assert(GvNAME_HEK(gv)); (char *)HEK_KEY(GvNAME_HEK(gv)); })
58-
# define GvNAMELEN_get(gv) ({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); })
59-
# define GvNAMEUTF8(gv) ({ assert(GvNAME_HEK(gv)); HEK_UTF8(GvNAME_HEK(gv)); })
57+
# define GvNAME_get(gv) \
58+
({ assert(GvNAME_HEK(gv)); (char *)HEK_KEY(GvNAME_HEK(gv)); })
59+
# define GvNAMELEN_get(gv) \
60+
({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); })
61+
# define GvNAMEUTF8(gv) \
62+
({ assert(GvNAME_HEK(gv)); HEK_UTF8(GvNAME_HEK(gv)); })
6063
#else
6164
# define GvGP(gv) (0+(gv)->sv_u.svu_gp)
6265
# define GvGP_set(gv,gp) ((gv)->sv_u.svu_gp = (gp))
@@ -228,9 +231,11 @@ Return the CV from the GV.
228231
time, so don't try to free what's there. */
229232
#define GV_ADDMULTI 0x02 /* add, pretending it has been added
230233
already; used also by gv_init_* */
231-
#define GV_ADDWARN 0x04 /* add, but warn if symbol wasn't already there */
234+
#define GV_ADDWARN 0x04 /* add, but warn if symbol wasn't
235+
already there */
232236
/* 0x08 UNUSED */
233-
#define GV_NOINIT 0x10 /* add, but don't init symbol, if type != PVGV */
237+
#define GV_NOINIT 0x10 /* add, but don't init symbol,
238+
if type != PVGV */
234239
/* This is used by toke.c to avoid turing placeholder constants in the symbol
235240
table into full PVGVs with attached constant subroutines. */
236241
#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.
273278
#define gv_fetchsv_nomg(n,f,t) gv_fetchsv(n,(f)|GV_NO_SVGMAGIC,t)
274279
#define gv_init(gv,stash,name,len,multi) \
275280
gv_init_pvn(gv,stash,name,len,GV_ADDMULTI*cBOOL(multi))
276-
#define gv_fetchmeth(stash,name,len,level) gv_fetchmeth_pvn(stash, name, len, level, 0)
277-
#define gv_fetchmeth_autoload(stash,name,len,level) gv_fetchmeth_pvn_autoload(stash, name, len, level, 0)
278-
#define gv_fetchmethod_flags(stash,name,flags) gv_fetchmethod_pv_flags(stash, name, flags)
281+
#define gv_fetchmeth(stash,name,len,level) \
282+
gv_fetchmeth_pvn(stash, name, len, level, 0)
283+
#define gv_fetchmeth_autoload(stash,name,len,level) \
284+
gv_fetchmeth_pvn_autoload(stash, name, len, level, 0)
285+
#define gv_fetchmethod_flags(stash,name,flags) \
286+
gv_fetchmethod_pv_flags(stash, name, flags)
279287

280288
/*
281289
=for apidoc gv_autoload4

handy.h

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ required, but is kept for backwards compatibility.
130130
* XXX Should really be a Configure probe, with HAS__FUNCTION__
131131
* and FUNCTION__ as results.
132132
* XXX Similarly, a Configure probe for __FILE__ and __LINE__ is needed. */
133-
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__SUNPRO_C)) /* C99 or close enough. */
133+
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) ||\
134+
(defined(__SUNPRO_C)) /* C99 or close enough. */
134135
# define FUNCTION__ __func__
135136
# define SAFE_FUNCTION__ __func__
136137
#elif (defined(__DECC_VER)) /* Tru64 or VMS, and strict C89 being used, but not modern enough cc (in Tru64, -c99 not known, only -std1). */
@@ -457,7 +458,8 @@ Perl_xxx(aTHX_ ...) form for any API calls where it's used.
457458
Perl_sv_catxmlpvn(aTHX_ dsv, STR_WITH_LEN(str), utf8)
458459

459460

460-
#define lex_stuff_pvs(pv,flags) Perl_lex_stuff_pvn(aTHX_ STR_WITH_LEN(pv), flags)
461+
#define lex_stuff_pvs(pv,flags) \
462+
Perl_lex_stuff_pvn(aTHX_ STR_WITH_LEN(pv), flags)
461463

462464
#define get_cvs(str, flags) \
463465
Perl_get_cvn_flags(aTHX_ STR_WITH_LEN(str), (flags))
@@ -684,7 +686,8 @@ based on the underlying C library functions):
684686
#define strnNE(s1,s2,l) (strncmp(s1,s2,l) != 0)
685687
#define strnEQ(s1,s2,l) (strncmp(s1,s2,l) == 0)
686688

687-
#define memEQ(s1,s2,l) (memcmp(((const void *) (s1)), ((const void *) (s2)), l) == 0)
689+
#define memEQ(s1,s2,l) \
690+
(memcmp(((const void *) (s1)), ((const void *) (s2)), l) == 0)
688691
#define memNE(s1,s2,l) (! memEQ(s1,s2,l))
689692

690693
/* memEQ and memNE where second comparand is a string constant */
@@ -716,7 +719,8 @@ based on the underlying C library functions):
716719
#define memGT(s1,s2,l) (memcmp(s1,s2,l) > 0)
717720
#define memGE(s1,s2,l) (memcmp(s1,s2,l) >= 0)
718721

719-
#define memCHRs(s1,c) ((const char *) memchr(ASSERT_IS_LITERAL(s1) , c, sizeof(s1)-1))
722+
#define memCHRs(s1,c) \
723+
((const char *) memchr(ASSERT_IS_LITERAL(s1) , c, sizeof(s1)-1))
720724

721725
/*
722726
* Character classes.
@@ -1638,7 +1642,8 @@ END_EXTERN_C
16381642
# define isPUNCT_A(c) generic_isCC_A_(c, CC_PUNCT_)
16391643
# define isSPACE_A(c) generic_isCC_A_(c, CC_SPACE_)
16401644
# define isWORDCHAR_A(c) generic_isCC_A_(c, CC_WORDCHAR_)
1641-
# define isXDIGIT_A(c) generic_isCC_(c, CC_XDIGIT_) /* No non-ASCII xdigits */
1645+
# define isXDIGIT_A(c) generic_isCC_(c, CC_XDIGIT_) /* No non-ASCII
1646+
xdigits */
16421647
# define isIDFIRST_A(c) generic_isCC_A_(c, CC_IDFIRST_)
16431648
# define isALPHA_L1(c) generic_isCC_(c, CC_ALPHA_)
16441649
# define isALPHANUMERIC_L1(c) generic_isCC_(c, CC_ALPHANUMERIC_)
@@ -2176,11 +2181,13 @@ END_EXTERN_C
21762181
#define isPRINT_uvchr(c) generic_invlist_uvchr_(CC_PRINT_, c)
21772182

21782183
#define isPUNCT_uvchr(c) generic_invlist_uvchr_(CC_PUNCT_, c)
2179-
#define isSPACE_uvchr(c) generic_uvchr_(CC_SPACE_, is_XPERLSPACE_cp_high, c)
2184+
#define isSPACE_uvchr(c) \
2185+
generic_uvchr_(CC_SPACE_, is_XPERLSPACE_cp_high, c)
21802186
#define isPSXSPC_uvchr(c) isSPACE_uvchr(c)
21812187

21822188
#define isUPPER_uvchr(c) generic_invlist_uvchr_(CC_UPPER_, c)
2183-
#define isVERTWS_uvchr(c) generic_uvchr_(CC_VERTSPACE_, is_VERTWS_cp_high, c)
2189+
#define isVERTWS_uvchr(c) \
2190+
generic_uvchr_(CC_VERTSPACE_, is_VERTWS_cp_high, c)
21842191
#define isWORDCHAR_uvchr(c) generic_invlist_uvchr_(CC_WORDCHAR_, c)
21852192
#define isXDIGIT_uvchr(c) generic_uvchr_(CC_XDIGIT_, is_XDIGIT_cp_high, c)
21862193

@@ -2721,7 +2728,8 @@ PoisonWith(0xEF) for catching access to freed memory.
27212728

27222729
#define MEM_SIZE_MAX ((MEM_SIZE)-1)
27232730

2724-
#define _PERL_STRLEN_ROUNDUP_UNCHECKED(n) (((n) - 1 + PERL_STRLEN_ROUNDUP_QUANTUM) & ~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM - 1))
2731+
#define _PERL_STRLEN_ROUNDUP_UNCHECKED(n) \
2732+
(((n) - 1 + PERL_STRLEN_ROUNDUP_QUANTUM) & ~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM - 1))
27252733

27262734
#ifdef PERL_MALLOC_WRAP
27272735

@@ -2775,7 +2783,8 @@ PoisonWith(0xEF) for catching access to freed memory.
27752783

27762784
# define MEM_WRAP_CHECK_(n,t) MEM_WRAP_CHECK(n,t),
27772785

2778-
# 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))
2786+
# define PERL_STRLEN_ROUNDUP(n) \
2787+
((void)(((n) > MEM_SIZE_MAX - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (croak_memory_wrap(),0) : 0), _PERL_STRLEN_ROUNDUP_UNCHECKED(n))
27792788
#else
27802789

27812790
# define MEM_WRAP_CHECK(n,t)
@@ -2835,9 +2844,12 @@ enum mem_log_type {
28352844
#endif
28362845

28372846
#ifdef PERL_MEM_LOG
2838-
#define MEM_LOG_ALLOC(n,t,a) Perl_mem_log_alloc(n,sizeof(t),STRINGIFY(t),a,__FILE__,__LINE__,FUNCTION__)
2839-
#define MEM_LOG_REALLOC(n,t,v,a) Perl_mem_log_realloc(n,sizeof(t),STRINGIFY(t),v,a,__FILE__,__LINE__,FUNCTION__)
2840-
#define MEM_LOG_FREE(a) Perl_mem_log_free(a,__FILE__,__LINE__,FUNCTION__)
2847+
#define MEM_LOG_ALLOC(n,t,a) \
2848+
Perl_mem_log_alloc(n,sizeof(t),STRINGIFY(t),a,__FILE__,__LINE__,FUNCTION__)
2849+
#define MEM_LOG_REALLOC(n,t,v,a) \
2850+
Perl_mem_log_realloc(n,sizeof(t),STRINGIFY(t),v,a,__FILE__,__LINE__,FUNCTION__)
2851+
#define MEM_LOG_FREE(a) \
2852+
Perl_mem_log_free(a,__FILE__,__LINE__,FUNCTION__)
28412853
#endif
28422854

28432855
#ifndef MEM_LOG_ALLOC
@@ -2850,9 +2862,12 @@ enum mem_log_type {
28502862
#define MEM_LOG_FREE(a) (a)
28512863
#endif
28522864

2853-
#define Newx(v,n,t) (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2854-
#define Newxc(v,n,t,c) (v = (MEM_WRAP_CHECK_(n,t) (c*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2855-
#define Newxz(v,n,t) (v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safecalloc((n),sizeof(t)))))
2865+
#define Newx(v,n,t) \
2866+
(v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2867+
#define Newxc(v,n,t,c) \
2868+
(v = (MEM_WRAP_CHECK_(n,t) (c*)MEM_LOG_ALLOC(n,t,safemalloc((MEM_SIZE)((n)*sizeof(t))))))
2869+
#define Newxz(v,n,t) \
2870+
(v = (MEM_WRAP_CHECK_(n,t) (t*)MEM_LOG_ALLOC(n,t,safecalloc((n),sizeof(t)))))
28562871

28572872
#ifndef PERL_CORE
28582873
/* pre 5.9.x compatibility */
@@ -2879,16 +2894,23 @@ enum mem_log_type {
28792894
#define perl_assert_ptr(p) assert( ((void*)(p)) != 0 )
28802895

28812896

2882-
#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)))
2883-
#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)))
2884-
#define Zero(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), (void)memzero((char*)(d), (n) * sizeof(t)))
2897+
#define Move(s,d,n,t) \
2898+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
2899+
#define Copy(s,d,n,t) \
2900+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
2901+
#define Zero(d,n,t) \
2902+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), (void)memzero((char*)(d), (n) * sizeof(t)))
28852903

28862904
/* Like above, but returns a pointer to 'd' */
2887-
#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)))
2888-
#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)))
2889-
#define ZeroD(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t)))
2890-
2891-
#define PoisonWith(d,n,t,b) (MEM_WRAP_CHECK_(n,t) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t)))
2905+
#define MoveD(s,d,n,t) \
2906+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memmove((char*)(d),(const char*)(s), (n) * sizeof(t)))
2907+
#define CopyD(s,d,n,t) \
2908+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)))
2909+
#define ZeroD(d,n,t) \
2910+
(MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t)))
2911+
2912+
#define PoisonWith(d,n,t,b) \
2913+
(MEM_WRAP_CHECK_(n,t) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t)))
28922914
#define PoisonNew(d,n,t) PoisonWith(d,n,t,0xAB)
28932915
#define PoisonFree(d,n,t) PoisonWith(d,n,t,0xEF)
28942916
#define Poison(d,n,t) PoisonFree(d,n,t)

hv.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525
# define USE_PERL_PERTURB_KEYS 1
2626
# define PL_HASH_RAND_BITS_ENABLED PL_hash_rand_bits_enabled
2727
# endif
28-
# define PERL_HASH_ITER_BUCKET(iter) (((iter)->xhv_riter) ^ ((iter)->xhv_rand))
28+
# define PERL_HASH_ITER_BUCKET(iter) \
29+
(((iter)->xhv_riter) ^ ((iter)->xhv_rand))
2930
#endif
3031

3132
#ifdef PERL_USE_UNSHARED_KEYS_IN_LARGE_HASHES
32-
#define LARGE_HASH_HEURISTIC(hv,new_max) S_large_hash_heuristic(aTHX_ (hv), (new_max))
33+
#define LARGE_HASH_HEURISTIC(hv,new_max) \
34+
S_large_hash_heuristic(aTHX_ (hv), (new_max))
3335
#else
3436
#define LARGE_HASH_HEURISTIC(hv,new_max) 0
3537
#endif
@@ -366,8 +368,10 @@ whether it is valid to call C<HvAUX()>.
366368
#define HvUSEDKEYS(hv) (HvTOTALKEYS(hv) - HvPLACEHOLDERS_get(hv))
367369
#define HvTOTALKEYS(hv) (((XPVHV*) SvANY(hv))->xhv_keys)
368370
#define HvPLACEHOLDERS(hv) (*Perl_hv_placeholders_p(aTHX_ MUTABLE_HV(hv)))
369-
#define HvPLACEHOLDERS_get(hv) (SvMAGIC(hv) ? Perl_hv_placeholders_get(aTHX_ (const HV *)hv) : 0)
370-
#define HvPLACEHOLDERS_set(hv,p) Perl_hv_placeholders_set(aTHX_ MUTABLE_HV(hv), p)
371+
#define HvPLACEHOLDERS_get(hv) \
372+
(SvMAGIC(hv) ? Perl_hv_placeholders_get(aTHX_ (const HV *)hv) : 0)
373+
#define HvPLACEHOLDERS_set(hv,p) \
374+
Perl_hv_placeholders_set(aTHX_ MUTABLE_HV(hv), p)
371375

372376
/* This (now) flags whether *new* keys in the hash will be allocated from the
373377
* 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<HvAUX()>.
481485
#define HV_ITERNEXT_WANTPLACEHOLDERS 0x01 /* Don't skip placeholders. */
482486

483487
#define hv_iternext(hv) hv_iternext_flags(hv, 0)
484-
#define hv_magic(hv, gv, how) sv_magic(MUTABLE_SV(hv), MUTABLE_SV(gv), how, NULL, 0)
488+
#define hv_magic(hv, gv, how) \
489+
sv_magic(MUTABLE_SV(hv), MUTABLE_SV(gv), how, NULL, 0)
485490
#define hv_undef(hv) Perl_hv_undef_flags(aTHX_ hv, 0)
486491

487492
#define Perl_sharepvn(pv, len, hash) HEK_KEY(share_hek(pv, len, hash))

0 commit comments

Comments
 (0)