From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49267C3E8C5 for ; Sun, 29 Nov 2020 22:28:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13C4B2078D for ; Sun, 29 Nov 2020 22:28:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727282AbgK2W2L (ORCPT ); Sun, 29 Nov 2020 17:28:11 -0500 Received: from smtprelay0216.hostedemail.com ([216.40.44.216]:49248 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725950AbgK2W2K (ORCPT ); Sun, 29 Nov 2020 17:28:10 -0500 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay01.hostedemail.com (Postfix) with ESMTP id 63192100E7B40; Sun, 29 Nov 2020 22:27:29 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: wheel10_07047072739c X-Filterd-Recvd-Size: 3936 Received: from XPS-9350.home (unknown [47.151.128.180]) (Authenticated sender: joe@perches.com) by omf05.hostedemail.com (Postfix) with ESMTPA; Sun, 29 Nov 2020 22:27:28 +0000 (UTC) Message-ID: <45c8575f69602a3ad6bc3129ab99905e9f233af0.camel@perches.com> Subject: Re: [PATCH v7] checkpatch: add fix option for LOGICAL_CONTINUATIONS From: Joe Perches To: Aditya , Andrew Morton Cc: lukas.bulwahn@gmail.com, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org Date: Sun, 29 Nov 2020 14:27:27 -0800 In-Reply-To: References: <20201123102818.24364-1-yashsri421@gmail.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.38.1-1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 2020-11-29 at 14:25 +0530, Aditya wrote: > On 23/11/20 3:58 pm, Aditya Srivastava wrote: > > Currently, checkpatch warns if logical continuations are placed at the > > start of a line and not at the end of previous line. Acked-by: Joe Perches > > > > E.g., running checkpatch on commit 3485507fc272 ("staging: > > bcm2835-camera: Reduce length of enum names") reports: > > > > CHECK:LOGICAL_CONTINUATIONS: Logical continuations should be on the > > previous line > > + if (!ret > > + && camera_port == > > > > Provide a simple fix by inserting logical operator at the last > > non-comment, non-whitespace char of the previous line and removing from > > current line, if both the lines are additions(ie start with '+') > > > > Signed-off-by: Aditya Srivastava > > --- > > changes in v2: quote $operator at substitution > > > > changes in v3: add a check for previous line ending with comment; > > If so, insert $operator at the last non-comment, non-whitespace char of the previous line > > > > changes in v4: improve the matching mechanism by matching line termination at comment or white space; > > insert the operator before comments (if any) separated by a whitespace; > > append the comment and its pre-whitespace after the inserted operator (if comment was present), > > ie if no comment was present nothing will be inserted after the operator > > > > changes in v5: improve regex for comment and line end with '$;' > > > > changes in v6: remove if-check; modify commit message > > > > changes in v7: add an extra '$' symbol at '$fixed[$fixlinenr - 1]' regex substitution to ensure match at line end > > > >  scripts/checkpatch.pl | 12 ++++++++++-- > >  1 file changed, 10 insertions(+), 2 deletions(-) > > > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > > index 5b1a5a65e69a..fb3c50e0bde2 100755 > > --- a/scripts/checkpatch.pl > > +++ b/scripts/checkpatch.pl > > @@ -3553,8 +3553,16 @@ sub process { > >   > > > >  # 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); > > + my $operator = $1; > > + if (CHK("LOGICAL_CONTINUATIONS", > > + "Logical continuations should be on the previous line\n" . $hereprev) && > > + $fix && $prevrawline =~ /^\+/) { > > + # insert logical operator at last non-comment, non-whitepsace char on previous line > > + $prevline =~ /[\s$;]*$/; > > + my $line_end = substr($prevrawline, $-[0]); > > + $fixed[$fixlinenr - 1] =~ s/\Q$line_end\E$/ $operator$line_end/; > > + $fixed[$fixlinenr] =~ s/\Q$operator\E\s*//; > > + } > >   } > >   > > > >  # check indentation starts on a tab stop > > > > Hi Joe > You probably missed this patch. Please review :) > > Thanks > Aditya