Skip to content

Commit 8e7506c

Browse files
committed
WS Cleanup Stage #9 - break remaining long line comments
1 parent 742deec commit 8e7506c

26 files changed

+360
-180
lines changed

XSUB.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,8 @@ Rethrows a previously caught exception. See L<perlguts/"Exception Handling">.
360360
Perl_xs_handshake(HS_KEY(FALSE, FALSE, "v" PERL_API_VERSION_STRING, XS_VERSION), \
361361
HS_CXT, __FILE__, items, ax, "v" PERL_API_VERSION_STRING, XS_VERSION)
362362
#else
363-
/* should this be a #error? if you want both checked, you better supply XS_VERSION right? */
363+
/* should this be a #error? if you want both checked,
364+
you better supply XS_VERSION right? */
364365
# define XS_BOTHVERSION_BOOTCHECK XS_APIVERSION_BOOTCHECK
365366
#endif
366367

@@ -373,7 +374,8 @@ Rethrows a previously caught exception. See L<perlguts/"Exception Handling">.
373374
Perl_xs_handshake(HS_KEY(FALSE, TRUE, "v" PERL_API_VERSION_STRING, XS_VERSION), \
374375
HS_CXT, __FILE__, "v" PERL_API_VERSION_STRING, XS_VERSION)
375376
#else
376-
/* should this be a #error? if you want both checked, you better supply XS_VERSION right? */
377+
/* should this be a #error? if you want both checked,
378+
you better supply XS_VERSION right? */
377379
# define XS_BOTHVERSION_POPMARK_BOOTCHECK XS_APIVERSION_POPMARK_BOOTCHECK
378380
#endif
379381

@@ -385,7 +387,8 @@ Rethrows a previously caught exception. See L<perlguts/"Exception Handling">.
385387
Perl_xs_handshake(HS_KEY(TRUE, TRUE, "v" PERL_API_VERSION_STRING, XS_VERSION), \
386388
HS_CXT, __FILE__, "v" PERL_API_VERSION_STRING, XS_VERSION)
387389
#else
388-
/* should this be a #error? if you want both checked, you better supply XS_VERSION right? */
390+
/* should this be a #error? if you want both checked,
391+
you better supply XS_VERSION right? */
389392
# define XS_BOTHVERSION_SETXSUBFN_POPMARK_BOOTCHECK \
390393
XS_APIVERSION_SETXSUBFN_POPMARK_BOOTCHECK
391394
#endif

cop.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,9 +1086,11 @@ struct context {
10861086
#define G_DISCARD 0x4 /* Call FREETMPS.
10871087
Don't change this without consulting the
10881088
hash actions codes defined in hv.h */
1089-
#define G_EVAL 0x8 /* Assume eval {} around subroutine call. */
1089+
#define G_EVAL 0x8 /* Assume eval {} around
1090+
subroutine call. */
10901091
#define G_NOARGS 0x10 /* Don't construct a @_ array. */
1091-
#define G_KEEPERR 0x20 /* Warn for errors, don't overwrite $@ */
1092+
#define G_KEEPERR 0x20 /* Warn for errors, don't
1093+
overwrite $@ */
10921094
#define G_NODEBUG 0x40 /* Disable debugging at toplevel. */
10931095
#define G_METHOD 0x80 /* Calling method. */
10941096
#define G_FAKINGEVAL 0x100 /* Faking an eval context for call_sv or
@@ -1099,16 +1101,19 @@ struct context {
10991101
#define G_WRITING_TO_STDERR 0x400 /* Perl_write_to_stderr() is calling
11001102
Perl_magic_methcall(). */
11011103
#define G_RE_REPARSING 0x800 /* compiling a run-time /(?{..})/ */
1102-
#define G_METHOD_NAMED 0x1000 /* calling named method, eg without :: or ' */
1104+
#define G_METHOD_NAMED 0x1000 /* calling named method, eg
1105+
without :: or ' */
11031106
#define G_RETHROW 0x2000 /* eval_sv(): re-throw any error */
11041107

11051108
/* flag bits for PL_in_eval */
11061109
#define EVAL_NULL 0 /* not in an eval */
11071110
#define EVAL_INEVAL 1 /* some enclosing scope is an eval */
1108-
#define EVAL_WARNONLY 2 /* used by yywarn() when calling yyerror() */
1111+
#define EVAL_WARNONLY 2 /* used by yywarn() when
1112+
calling yyerror() */
11091113
#define EVAL_KEEPERR 4 /* set by Perl_call_sv if G_KEEPERR */
11101114
#define EVAL_INREQUIRE 8 /* The code is being required. */
1111-
#define EVAL_RE_REPARSING 0x10 /* eval_sv() called with G_RE_REPARSING */
1115+
#define EVAL_RE_REPARSING 0x10 /* eval_sv() called with
1116+
G_RE_REPARSING */
11121117
/* if adding extra bits, make sure they can fit in CxOLD_OP_TYPE() */
11131118

11141119
/* Support for switching (stack and block) contexts.

cv.h

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,13 @@ See L<perlguts/Autoloading with XSUBs>.
6363
Must be assert protected as in Perl_CvDEPTH before use. */
6464
#define CvDEPTHunsafe(sv) ((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_depth
6565

66-
/* these CvPADLIST/CvRESERVED asserts can be reverted one day, once stabilized */
66+
/* these CvPADLIST/CvRESERVED asserts can be
67+
reverted one day, once stabilized */
6768
#define CvPADLIST(sv) \
6869
(*(assert_(!CvISXSUB((CV*)(sv))) \
6970
&(((XPVCV*)MUTABLE_PTR(SvANY(sv)))->xcv_padlist_u.xcv_padlist)))
70-
/* CvPADLIST_set is not public API, it can be removed one day, once stabilized */
71+
/* CvPADLIST_set is not public API, it can
72+
be removed one day, once stabilized */
7173
#ifdef DEBUGGING
7274
# define CvPADLIST_set(sv, padlist) Perl_set_padlist((CV*)sv, padlist)
7375
#else
@@ -115,15 +117,17 @@ See L<perlguts/Autoloading with XSUBs>.
115117
* renamed to avoid collision with an upcoming feature */
116118
#define CVf_NOWARN_AMBIGUOUS 0x0001
117119

118-
#define CVf_LVALUE 0x0002 /* CV return value can be used as lvalue */
120+
#define CVf_LVALUE 0x0002 /* CV return value can be
121+
used as lvalue */
119122
#define CVf_CONST 0x0004 /* inlinable sub */
120123
#define CVf_ISXSUB 0x0008 /* CV is an XSUB, not pure perl. */
121124

122125
#define CVf_WEAKOUTSIDE 0x0010 /* CvOUTSIDE isn't ref counted */
123126
#define CVf_CLONE 0x0020 /* anon CV uses external lexicals */
124127
#define CVf_CLONED 0x0040 /* a clone of one of those */
125128
#define CVf_ANON 0x0080 /* CV is not pointed to by a GV */
126-
#define CVf_UNIQUE 0x0100 /* sub is only called once (eg PL_main_cv,
129+
#define CVf_UNIQUE 0x0100 /* sub is only called once
130+
(eg PL_main_cv,
127131
require, eval). */
128132
#define CVf_NODEBUG 0x0200 /* no DB::sub indirection for this CV
129133
(esp. useful for special XSUBs) */
@@ -132,13 +136,15 @@ See L<perlguts/Autoloading with XSUBs>.
132136
# define CVf_SLABBED 0x0800 /* Holds refcount on op slab */
133137
#endif
134138
#define CVf_DYNFILE 0x1000 /* The filename is malloced */
135-
#define CVf_AUTOLOAD 0x2000 /* SvPVX contains AUTOLOADed sub name */
139+
#define CVf_AUTOLOAD 0x2000 /* SvPVX contains AUTOLOADed
140+
sub name */
136141
#define CVf_HASEVAL 0x4000 /* contains string eval */
137142
#define CVf_NAMED 0x8000 /* Has a name HEK */
138143
#define CVf_LEXICAL 0x10000 /* Omit package from name */
139144
#define CVf_ANONCONST 0x20000 /* :const - create anonconst op */
140145
#define CVf_SIGNATURE 0x40000 /* CV uses a signature */
141-
#define CVf_REFCOUNTED_ANYSV 0x80000 /* CvXSUBANY().any_sv is refcounted */
146+
#define CVf_REFCOUNTED_ANYSV 0x80000 /* CvXSUBANY().any_sv
147+
is refcounted */
142148

143149
/* This symbol for optimised communication between toke.c and op.c: */
144150
#define CVf_BUILTIN_ATTRS (CVf_NOWARN_AMBIGUOUS|CVf_LVALUE|CVf_ANONCONST)

form.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
#define FF_LITERAL 2 /* append <arg> literal chars */
1313
#define FF_SKIP 3 /* skip <arg> chars in format */
1414
#define FF_FETCH 4 /* get next item and set field size to <arg> */
15-
#define FF_CHECKNL 5 /* find max len of item (up to \n) that fits field */
15+
#define FF_CHECKNL 5 /* find max len of item (up to
16+
\n) that fits field */
1617
#define FF_CHECKCHOP 6 /* like CHECKNL, but up to highest split point */
17-
#define FF_SPACE 7 /* append padding space (diff of field, item size) */
18+
#define FF_SPACE 7 /* append padding space (diff
19+
of field, item size) */
1820
#define FF_HALFSPACE 8 /* like FF_SPACE, but only append half as many */
1921
#define FF_ITEM 9 /* append a text item, while blanking ctrl chars */
2022
#define FF_CHOP 10 /* (for ^*) chop the current item */

gv.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,18 @@ Return the CV from the GV.
238238
if type != PVGV */
239239
/* This is used by toke.c to avoid turing placeholder constants in the symbol
240240
table into full PVGVs with attached constant subroutines. */
241-
#define GV_NOADD_NOINIT 0x20 /* Don't add the symbol if it's not there.
241+
#define GV_NOADD_NOINIT 0x20 /* Don't add the symbol
242+
if it's not there.
242243
Don't init it if it is there but ! PVGV */
243-
#define GV_NOEXPAND 0x40 /* Don't expand SvOK() entries to PVGV */
244-
#define GV_NOTQUAL 0x80 /* A plain symbol name, not qualified with a
244+
#define GV_NOEXPAND 0x40 /* Don't expand SvOK()
245+
entries to PVGV */
246+
#define GV_NOTQUAL 0x80 /* A plain symbol name, not
247+
qualified with a
245248
package (so skip checks for :: and ') */
246-
#define GV_AUTOLOAD 0x100 /* gv_fetchmethod_flags() should AUTOLOAD */
247-
#define GV_CROAK 0x200 /* gv_fetchmethod_flags() should croak */
249+
#define GV_AUTOLOAD 0x100 /* gv_fetchmethod_flags()
250+
should AUTOLOAD */
251+
#define GV_CROAK 0x200 /* gv_fetchmethod_flags()
252+
should croak */
248253
#define GV_ADDMG 0x400 /* add if magical */
249254
#define GV_NO_SVGMAGIC 0x800 /* Skip get-magic on an SV argument;
250255
used only by gv_fetchsv(_nomg) */

handy.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ required, but is kept for backwards compatibility.
133133
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__SUNPRO_C)) /* C99 or close enough. */
134134
# define FUNCTION__ __func__
135135
# define SAFE_FUNCTION__ __func__
136-
#elif (defined(__DECC_VER)) /* Tru64 or VMS, and strict C89 being used, but not modern enough cc (in Tru64, -c99 not known, only -std1). */
136+
#elif (defined(__DECC_VER)) /* Tru64 or VMS, and strict C89 being used, but not
137+
modern enough cc (in Tru64, -c99 not known, only -std1). */
137138
# define FUNCTION__ ("")
138139
# define SAFE_FUNCTION__ ("UNKNOWN")
139140
#else
@@ -1640,7 +1641,8 @@ END_EXTERN_C
16401641
# define isPUNCT_A(c) generic_isCC_A_(c, CC_PUNCT_)
16411642
# define isSPACE_A(c) generic_isCC_A_(c, CC_SPACE_)
16421643
# define isWORDCHAR_A(c) generic_isCC_A_(c, CC_WORDCHAR_)
1643-
# define isXDIGIT_A(c) generic_isCC_(c, CC_XDIGIT_) /* No non-ASCII
1644+
# define isXDIGIT_A(c) generic_isCC_(c, CC_XDIGIT_) /* No
1645+
non-ASCII
16441646
xdigits */
16451647
# define isIDFIRST_A(c) generic_isCC_A_(c, CC_IDFIRST_)
16461648
# define isALPHA_L1(c) generic_isCC_(c, CC_ALPHA_)

hv.h

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
*
99
*/
1010

11-
/* These control hash traversal randomization and the environment variable PERL_PERTURB_KEYS.
11+
/* These control hash traversal randomization and
12+
the environment variable PERL_PERTURB_KEYS.
1213
* Currently disabling this functionality will break a few tests, but should otherwise work fine.
1314
* See perlrun for more details. */
1415

@@ -91,12 +92,15 @@ struct mro_meta {
9192
value stored in and owned by mro_linear_all. */
9293
SV *mro_linear_current;
9394
HV *mro_nextmethod; /* next::method caching */
94-
U32 cache_gen; /* Bumping this invalidates our method cache */
95-
U32 pkg_gen; /* Bumps when local methods/@ISA change */
95+
U32 cache_gen; /* Bumping this invalidates
96+
our method cache */
97+
U32 pkg_gen; /* Bumps when local methods/@ISA
98+
change */
9699
const struct mro_alg *mro_which; /* which mro alg is in use? */
97100
HV *isa; /* Everything this class @ISA */
98101
HV *super; /* SUPER method cache */
99-
CV *destroy; /* DESTROY method if destroy_gen non-zero */
102+
CV *destroy; /* DESTROY method if destroy_gen
103+
non-zero */
100104
U32 destroy_gen; /* Generation number of DESTROY cache */
101105
};
102106

@@ -116,7 +120,8 @@ union _xhvnameu {
116120

117121
struct xpvhv_aux {
118122
union _xhvnameu xhv_name_u; /* name, if a symbol table */
119-
AV *xhv_backreferences; /* back references for weak references */
123+
AV *xhv_backreferences; /* back references for
124+
weak references */
120125
HE *xhv_eiter; /* current entry of iterator */
121126
I32 xhv_riter; /* current root of iterator */
122127

@@ -136,8 +141,10 @@ struct xpvhv_aux {
136141
U32 xhv_aux_flags; /* assorted extra flags */
137142
};
138143

139-
#define HvAUXf_SCAN_STASH 0x1 /* stash is being scanned by gv_check */
140-
#define HvAUXf_NO_DEREF 0x2 /* @{}, %{} etc (and nomethod) not present */
144+
#define HvAUXf_SCAN_STASH 0x1 /* stash is being scanned
145+
by gv_check */
146+
#define HvAUXf_NO_DEREF 0x2 /* @{}, %{} etc (and nomethod)
147+
not present */
141148

142149
/* hash structure: */
143150
/* This structure must match the beginning of struct xpvmg in sv.h. */
@@ -449,7 +456,8 @@ whether it is valid to call C<HvAUX()>.
449456
#define HEK_FLAGS(hek) (*((unsigned char *)(HEK_KEY(hek))+HEK_LEN(hek)+1))
450457

451458
#define HVhek_UTF8 0x01 /* Key is utf8 encoded. */
452-
#define HVhek_WASUTF8 0x02 /* Key is bytes here, but was supplied as utf8. */
459+
#define HVhek_WASUTF8 0x02 /* Key is bytes here, but was
460+
supplied as utf8. */
453461
#define HVhek_NOTSHARED 0x04 /* This key isn't a shared hash key. */
454462
/* the following flags are options for functions, they are not stored in heks */
455463
#define HVhek_FREEKEY 0x100 /* Internal flag to say key is Newx()ed. */
@@ -634,7 +642,8 @@ instead of a string/length pair, and no precomputed hash.
634642

635643
/* Flag bits are HVhek_UTF8, HVhek_WASUTF8, then */
636644
#define HVrhek_undef 0x00 /* Value is undef. */
637-
#define HVrhek_delete 0x10 /* Value is placeholder - signifies delete. */
645+
#define HVrhek_delete 0x10 /* Value is placeholder -
646+
signifies delete. */
638647
#define HVrhek_IV 0x20 /* Value is IV. */
639648
#define HVrhek_UV 0x30 /* Value is UV. */
640649
#define HVrhek_PV 0x40 /* Value is a (byte) string. */

hv_func.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@
115115
#else
116116

117117
#define PVT_PERL_HASH_FUNC "SBOX32_WITH_" PVT__PERL_HASH_FUNC
118-
/* note the 4 in the below code comes from the fact the seed to initialize the SBOX is 128 bits */
118+
/* note the 4 in the below code comes from the fact
119+
the seed to initialize the SBOX is 128 bits */
119120
#define PVT_PERL_HASH_SEED_BYTES \
120121
( PVT__PERL_HASH_SEED_BYTES + (int)( 4 * sizeof(U32)) )
121122

hv_macro.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
#define ROTL64(x,r) _rotl64(x,r)
6767
#define ROTR64(x,r) _rotr64(x,r)
6868
#else
69-
/* gcc recognises this code and generates a rotate instruction for CPUs with one */
69+
/* gcc recognises this code and generates a
70+
rotate instruction for CPUs with one */
7071
#define ROTL32(x,r) (((U32)(x) << (r)) | ((U32)(x) >> (32 - (r))))
7172
#define ROTR32(x,r) (((U32)(x) << (32 - (r))) | ((U32)(x) >> (r)))
7273
#define ROTL64(x,r) ( ( (U64)(x) << (r) ) | ( (U64)(x) >> ( 64 - (r) ) ) )

0 commit comments

Comments
 (0)