From: Joe Perches <joe@perches.com>
To: "Allan, Bruce W" <bruce.w.allan@intel.com>
Cc: David Miller <davem@davemloft.net>,
Andy Whitcroft <apw@shadowen.org>,
Andrew Morton <akpm@linux-foundation.org>,
"andrei.emeltchenko.news@gmail.com"
<andrei.emeltchenko.news@gmail.com>,
"linville@tuxdriver.com" <linville@tuxdriver.com>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH] checkpatch: Add some --strict coding style checks
Date: Tue, 21 Feb 2012 17:36:21 -0800 [thread overview]
Message-ID: <1329874581.5143.22.camel@joe2Laptop> (raw)
In-Reply-To: <804857E1F29AAC47BF68C404FC60A18429B3EE@ORSMSX102.amr.corp.intel.com>
On Tue, 2012-02-21 at 22:09 +0000, Allan, Bruce W wrote:
> This appears to falsely complain about parenthesis alignment in
> conditional statements with multiple opening parentheses.
Hey Allan.
Can you try this one please?
---
scripts/checkpatch.pl | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index a3b9782..e95419e 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1330,6 +1330,35 @@ sub check_absolute_file {
}
}
+sub pos_last_openparen {
+
+ my ($args) = @_;
+
+ my $pos = 0;
+ my $len = length($args);
+
+ my $opens = $args =~ tr/\(/\(/;
+ my $closes = $args =~ tr/\)/\)/;
+
+ my $last_openparen = 0;
+
+ if (($opens == 0) || ($closes >= $opens)) {
+ return 0;
+ }
+
+ for ($pos = 0; $pos < $len; $pos++) {
+ if (substr($args, $pos) =~ /^($FuncArg)/) {
+ $pos += length($1);
+ }
+
+ if (substr($args, $pos, 1) eq '(') {
+ $last_openparen = $pos;
+ }
+ }
+
+ return $last_openparen + 1;
+}
+
sub process {
my $filename = shift;
@@ -1783,6 +1812,35 @@ sub process {
"please, no space before tabs\n" . $herevet);
}
+# check for && or || at the start of a line
+ if ($rawline =~ /^\+\s*(&&|\|\|)/) {
+ CHK("LOGICAL_CONTINUATIONS",
+ "Logical continuations should be on the previous line\n" . $hereprev);
+ }
+
+# check multi-line statement indentation matches previous line
+ if ($prevline =~ /^\+(\t*)(if \(|$Ident\().*(\&\&|\|\||,)\s*$/ && $rawline =~ /^\+([ \t]*)/) {
+ $prevline =~ /^\+(\t*)(if \(|$Ident\()(.*)(\&\&|\|\||,)\s*$/;
+ my $oldindent = $1;
+ my $if_or_func = $2;
+ my $args = $3;
+
+ my $pos = pos_last_openparen($args);
+
+ my $len = length($if_or_func) + $pos;
+ $rawline =~ /^\+([ \t]*)/;
+ my $newindent = $1;
+
+ my $goodindent = $oldindent .
+ "\t" x ($len / 8) .
+ " " x ($len % 8);
+
+ if ($newindent ne $goodindent) {
+ CHK("PARENTHESIS_ALIGNMENT",
+ "Alignment should match open parenthesis\n" . $hereprev);
+ }
+ }
+
# check for spaces at the beginning of a line.
# Exceptions:
# 1) within comments
next prev parent reply other threads:[~2012-02-22 1:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-20 20:37 pull request: wireless 2012-02-20 John W. Linville
[not found] ` <20120220203740.GD6740-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2012-02-21 0:23 ` David Miller
[not found] ` <20120220.192324.498901675497866305.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2012-02-21 15:14 ` John W. Linville
2012-02-21 19:44 ` David Miller
2012-02-21 20:38 ` Andrei Emeltchenko
2012-02-21 20:40 ` David Miller
[not found] ` <20120221.154053.2103818562080068513.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2012-02-21 20:59 ` [PATCH] checkpatch: Add some --strict coding style checks Joe Perches
2012-02-21 21:09 ` Andrew Morton
2012-02-21 21:11 ` Joe Perches
2012-02-21 22:09 ` Allan, Bruce W
2012-02-21 23:16 ` Joe Perches
2012-02-22 1:36 ` Joe Perches [this message]
2012-02-22 1:56 ` Allan, Bruce W
2012-02-22 1:58 ` Joe Perches
2012-02-22 2:17 ` Allan, Bruce W
[not found] ` <804857E1F29AAC47BF68C404FC60A18429B98A-P5GAC/sN6hlcIJlls4ac1rfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2012-02-23 3:43 ` Joe Perches
2012-02-24 18:22 ` Allan, Bruce W
2012-02-24 18:37 ` [PATCH v2] " Joe Perches
2012-02-29 14:38 ` Kalle Valo
[not found] ` <804857E1F29AAC47BF68C404FC60A18429B3EE-P5GAC/sN6hlcIJlls4ac1rfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2012-02-22 9:35 ` [PATCH] " David Laight
2012-02-22 9:46 ` Johannes Berg
2012-02-22 10:07 ` pull request: wireless 2012-02-20 Zefir Kurtisi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329874581.5143.22.camel@joe2Laptop \
--to=joe@perches.com \
--cc=akpm@linux-foundation.org \
--cc=andrei.emeltchenko.news@gmail.com \
--cc=apw@shadowen.org \
--cc=bruce.w.allan@intel.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).