2012-05-28 00:00:52

by Eric Nelson

Subject: [PATCH V3] checkpatch: check for whitespace before semicolon at EOL

Requires --strict option during invocation:
~/linux$ scripts/checkpatch --strict foo.patch

This tests for a bad habits of mine like this:

return 0 ;

Note that it does allow a special case of a bare semicolon
for empty loops:

while (foo())
;

Signed-off-by: Eric Nelson <[email protected]>
---
scripts/checkpatch.pl | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index faea0ec..2262e1f 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2448,6 +2448,13 @@ sub process {
"space prohibited between function name and open parenthesis '('\n" . $herecurr);
}
}
+
+# check for whitespace before a non-naked semicolon
+ if ($line =~ /^\+.*\S\s+;/) {
+ CHK("SPACING",
+ "space prohibited before semicolon\n" . $herecurr);
+ }
+
# Check operator spacing.
if (!($line=~/\#\s*include/)) {
my $ops = qr{
--
1.7.9

2012-05-28 14:43:05

by Andy Whitcroft

Subject: Re: [PATCH V3] checkpatch: check for whitespace before semicolon at EOL

On Sun, May 27, 2012 at 05:00:46PM -0700, Eric Nelson wrote:
> Requires --strict option during invocation:
> ~/linux$ scripts/checkpatch --strict foo.patch
>
> This tests for a bad habits of mine like this:
>
> return 0 ;
>
> Note that it does allow a special case of a bare semicolon
> for empty loops:
>
> while (foo())
> ;
>
> Signed-off-by: Eric Nelson <[email protected]>
> ---
> scripts/checkpatch.pl | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index faea0ec..2262e1f 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -2448,6 +2448,13 @@ sub process {
> "space prohibited between function name and open parenthesis '('\n" . $herecurr);
> }
> }
> +
> +# check for whitespace before a non-naked semicolon
> + if ($line =~ /^\+.*\S\s+;/) {
> + CHK("SPACING",
> + "space prohibited before semicolon\n" . $herecurr);
> + }
> +

Would this not also falsly trigger on 'for (foo = 10; foo; foo--) {' ?

> # Check operator spacing.
> if (!($line=~/\#\s*include/)) {
> my $ops = qr{

-apw

2012-05-28 15:12:39

by Joe Perches

Subject: Re: [PATCH V3] checkpatch: check for whitespace before semicolon at EOL

On Mon, 2012-05-28 at 15:42 +0100, Andy Whitcroft wrote:
> On Sun, May 27, 2012 at 05:00:46PM -0700, Eric Nelson wrote:
> > +# check for whitespace before a non-naked semicolon
> > + if ($line =~ /^\+.*\S\s+;/) {
> > + CHK("SPACING",
> > + "space prohibited before semicolon\n" . $herecurr);
> > + }
> > +
>
> Would this not also falsly trigger on 'for (foo = 10; foo; foo--) {' ?

No, it checks for a non-space, then requires whitespace before the semi

2012-05-28 15:15:20

by Eric Nelson

Subject: Re: [PATCH V3] checkpatch: check for whitespace before semicolon at EOL

On 05/28/2012 07:42 AM, Andy Whitcroft wrote:
> On Sun, May 27, 2012 at 05:00:46PM -0700, Eric Nelson wrote:
>> Requires --strict option during invocation:
>> ~/linux$ scripts/checkpatch --strict foo.patch
>>
>> This tests for a bad habits of mine like this:
>>
>> return 0 ;
>>
>> Note that it does allow a special case of a bare semicolon
>> for empty loops:
>>
>> while (foo())
>> ;
>>
>> Signed-off-by: Eric Nelson<[email protected]>
>> ---
>> scripts/checkpatch.pl | 7 +++++++
>> 1 files changed, 7 insertions(+), 0 deletions(-)
>>
>> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
>> index faea0ec..2262e1f 100755
>> --- a/scripts/checkpatch.pl
>> +++ b/scripts/checkpatch.pl
>> @@ -2448,6 +2448,13 @@ sub process {
>> "space prohibited between function name and open parenthesis '('\n" . $herecurr);
>> }
>> }
>> +
>> +# check for whitespace before a non-naked semicolon
>> + if ($line =~ /^\+.*\S\s+;/) {
>> + CHK("SPACING",
>> + "space prohibited before semicolon\n" . $herecurr);
>> + }
>> +
>
> Would this not also falsly trigger on 'for (foo = 10; foo; foo--) {' ?
>

No, because there's no space before any of the semicolons.

I ran this against the last 1500 commits in the kernel and the
only case I found which seemed questionable was a fragment
like this:
for (foo=10; ; foo--) {

This points out that my commit message is wrong because it
doesn't only check at EOL (V1 did).

My testing also generated a large number of warnings like this for
patch 89812fc81f8d62d70433a8ff63d26819f372e8ec.

CHECK: space prohibited before semicolon
#2459: FILE: tools/perf/util/parse-events-flex.c:439:
+ } ;

>> # Check operator spacing.
>> if (!($line=~/\#\s*include/)) {
>> my $ops = qr{
>
> -apw