checkpatch: add fix option for LOGICAL_CONTINUATIONS
PATCH v2 1/1 checkpatch: add fix option for LOGICAL_CONTINUATIONS
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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 adding logical operator at the end of previous line and removing from current line, if both the lines are additions (ie start with '+')
---
changes in v2: quote $operator at substitution
scripts/checkpatch.pl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
scripts/checkpatch.pl +8 -2
@@ -3553,8 +3553,14 @@ 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 =~ /^\+/) { + # add logical operator to the previous line, remove from current line + $fixed[$fixlinenr - 1] .= " $operator"; + $fixed[$fixlinenr] =~ s/\Q$operator\E\s*//; + } } # check indentation starts on a tab stop
Signature · 1 line
2.17.1
Joe Perches
maintainerQuoted 11 lines · Aditya Srivastava
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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
(quoted diff) +2
-0+ if (!ret + && camera_port ==
Quoted 3 lines
Provide a simple fix by adding logical operator at the end of previous line and removing from current line, if both the lines are additions (ie start with '+')
[]
scripts/checkpatch.pl
Quoted 1 line
scripts/checkpatch.pl +0
-0
[]
Quoted 5 lines
scripts/checkpatch.pl +0
-0@@ -3553,8 +3553,14 @@ sub process {# check for && or || at the start of a line if ($rawline =~ /^\+\s*(&&|\|\|)/) {
scripts/checkpatch.pl sub process { · line 3563
Quoted 10 lines
scripts/checkpatch.pl +8
-2- 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 =~ /^\+/) { + # add logical operator to the previous line, remove from current line + $fixed[$fixlinenr - 1] .= " $operator"; + $fixed[$fixlinenr] =~ s/\Q$operator\E\s*//; + }
One thing to be concerned about is a statement like
if (foo // comment && bar)
This should really perform the insertion at the last non-comment, non-whitespace char of the previous line.
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v3 1/1 checkpatch: add fix option for LOGICAL_CONTINUATIONS
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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 adding logical operator at the end of previous line and removing from current line, if both the lines are additions (ie start with '+')
---
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
scripts/checkpatch.pl | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
scripts/checkpatch.pl +16 -2
@@ -3553,8 +3553,22 @@ 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 =~ /^\+/) { + # add logical operator to the previous line, remove from current line + # if last line ends with a comment + if ($prevrawline =~ /(\/\/.*)$/) { + my $comment = trim($1); + $fixed[$fixlinenr - 1] =~ s/\s*$comment//; + $fixed[$fixlinenr - 1] .= " $operator $comment"; + } + else { + $fixed[$fixlinenr - 1] .= " $operator"; + } + $fixed[$fixlinenr] =~ s/\Q$operator\E\s*//; + } } # check indentation starts on a tab stop
Signature · 6 lines
2.17.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Joe Perches
maintainerQuoted 15 lines · Aditya Srivastava
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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
(quoted diff) +2
-0+ if (!ret + && camera_port ==Provide a simple fix by adding logical operator at the end of previous line and removing from current line, if both the lines are additions (ie start with '+')
Quoted 6 lines
Signed-off-by Aditya Srivastava <[email protected]>---
changes in v2: quote $operator at substitutionchanges 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
[]
scripts/checkpatch.pl
Quoted 1 line
scripts/checkpatch.pl +0
-0
[]
Quoted 5 lines
scripts/checkpatch.pl +0
-0@@ -3553,8 +3553,22 @@ sub process {# check for && or || at the start of a line if ($rawline =~ /^\+\s*(&&|\|\|)/) {
scripts/checkpatch.pl sub process { · line 3562
Quoted 9 lines
scripts/checkpatch.pl +7
-2- 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 =~ /^\+/) { + # add logical operator to the previous line, remove from current line + # if last line ends with a comment + if ($prevrawline =~ /(\/\/.*)$/) {
Not the best mechanism.
check $prevline =~ /[\s$;]*$/ and use the starting position of any match as the insertion point, and then insert the operator and matching bits from the $prevrawline.
I'll leave that as an exercise for you for now.
Quoted 3 lines
scripts/checkpatch.pl +3
-0+ my $comment = trim($1); + $fixed[$fixlinenr - 1] =~ s/\s*$comment//; + $fixed[$fixlinenr - 1] .= " $operator $comment";
PATCH v4 1/1 checkpatch: add fix option for LOGICAL_CONTINUATIONS
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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 adding logical operator at the end of previous line and removing from current line, if both the lines are additions (ie start with '+')
---
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
scripts/checkpatch.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
scripts/checkpatch.pl +13 -2
@@ -3553,8 +3553,19 @@ 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 =~ /^\+/) { + # add logical operator to the previous line, remove from current line + # match line termination at comment or whitespace + if ($prevrawline =~ /(\s*(?:\/\/.*)*)$/) { + my $match = $1; + $fixed[$fixlinenr - 1] =~ s/$match//; + $fixed[$fixlinenr - 1] .= " $operator$match"; + } + $fixed[$fixlinenr] =~ s/\Q$operator\E\s*//; + } } # check indentation starts on a tab stop
Signature · 6 lines
2.17.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Joe Perches
maintainerQuoted 19 lines · Aditya Srivastava
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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
(quoted diff) +2
-0+ if (!ret + && camera_port ==Provide a simple fix by adding logical operator at the end of previous line and removing from current line, if both the lines are additions (ie start with '+')
Signed-off-by Aditya Srivastava <[email protected]>---
changes in v2: quote $operator at substitution
Quoted 7 lines
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 linechanges 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
nak. I gave you a hint to the match string to use.
$prevline =~ /[\s$;]*$/
this matches either /* foo */ or // foo comment styles (or optional blanks before EOL)
Try something like:
---
scripts/checkpatch.pl +9 -2
@@ -3434,8 +3434,15 @@ 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 =~ /^\+/) { + # add logical operator to the previous line, remove from current line + $prevline =~ /([\s$;]*$)/; + substr($fixed[$fixlinenr - 1], $-[0]) = " $operator" . substr($prevrawline, $-[0],$+[0]); + $fixed[$fixlinenr] =~ s/\Q$operator\E\s*//; + } } # check indentation starts on a tab stop
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v5 1/1 checkpatch: add fix option for LOGICAL_CONTINUATIONS
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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 adding logical operator at the end of previous line and removing from current line, if both the lines are additions (ie start with '+')
---
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 '$;'
scripts/checkpatch.pl | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
scripts/checkpatch.pl +11 -2
@@ -3553,8 +3553,17 @@ 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 =~ /^\+/) { + # add logical operator to the previous line, remove from current line + if ($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
Signature · 1 line
2.17.1
Joe Perches
maintainerQuoted 57 lines · Aditya Srivastava
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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
(quoted diff) +2
-0+ if (!ret + && camera_port ==Provide a simple fix by adding logical operator at the end of previous line and removing from current line, if both the lines are additions (ie start with '+')
Signed-off-by Aditya Srivastava <[email protected]>---
changes in v2: quote $operator at substitutionchanges 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 linechanges 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 operatorchanges in v5: improve regex for comment and line end with '$;'
scripts/checkpatch.pl | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)scripts/checkpatch.pl +0
-0@@ -3553,8 +3553,17 @@ sub process {# check for && or || at the start of a line if ($rawline =~ /^\+\s*(&&|\|\|)/) {scripts/checkpatch.pl +11
-2- 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 =~ /^\+/) { + # add logical operator to the previous line, remove from current line + if ($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*//; + }}
Quoted 1 line
# check indentation starts on a tab stop
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Joe Perches
maintainerQuoted 11 lines · Aditya Srivastava
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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
(quoted diff) +2
-0+ if (!ret + && camera_port ==
Quoted 3 lines
Provide a simple fix by adding logical operator at the end of previous line and removing from current line, if both the lines are additions (ie start with '+')
Not quite yet.
Quoted 1 line
changes in v5: improve regex for comment and line end with '$;'
[]
scripts/checkpatch.pl
Quoted 1 line
scripts/checkpatch.pl +0
-0
[]
scripts/checkpatch.pl sub process { · line 3561
Quoted 13 lines
scripts/checkpatch.pl +0
-0@@ -3553,8 +3553,17 @@ sub process {# check for && or || at the start of a line if ($rawline =~ /^\+\s*(&&|\|\|)/) {scripts/checkpatch.pl +6
-2- 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 =~ /^\+/) { + # add logical operator to the previous line, remove from current line + if ($prevline =~ /[\s$;]*$/) {
This if is misleading as it will always match at least the EOL
scripts/checkpatch.pl sub process { · line 3563
Quoted 2 lines
scripts/checkpatch.pl +2
-0+ my $line_end = substr($prevrawline, $-[0]); + $fixed[$fixlinenr - 1] =~ s/\Q$line_end\E/ $operator$line_end/;
It makes it seem as if this part is only done when the test is true. The test is always true.
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v6 1/1 checkpatch: add fix option for LOGICAL_CONTINUATIONS
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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 '+')
---
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
scripts/checkpatch.pl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
scripts/checkpatch.pl +10 -2
@@ -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
Signature · 6 lines
2.17.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Joe Perches
maintainerQuoted 11 lines · Aditya Srivastava
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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
(quoted diff) +2
-0+ if (!ret + && camera_port ==
Quoted 5 lines
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 <[email protected]>
[]
scripts/checkpatch.pl
Quoted 1 line
scripts/checkpatch.pl +0
-0
[]
Quoted 5 lines
scripts/checkpatch.pl +0
-0@@ -3553,8 +3553,16 @@ sub process {# check for && or || at the start of a line if ($rawline =~ /^\+\s*(&&|\|\|)/) {
scripts/checkpatch.pl sub process { · line 3563
Quoted 10 lines
scripts/checkpatch.pl +8
-2- 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/;
This doesn't work when the same leading whitespace and trailing whitespace characters exist.
You need to use something like:
$fixed[$fixlinenr - 1] =~ s/\Q$line_end\E$/ $operator$line_end/;
(note the $ after \E to use EOL)
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v7 1/1 checkpatch: add fix option for LOGICAL_CONTINUATIONS
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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 '+')
---
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(-)
scripts/checkpatch.pl +10 -2
@@ -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
Signature · 6 lines
2.17.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Quoted 50 lines · Aditya Srivastava
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
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
(quoted diff) +2
-0+ 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 <[email protected]>---
changes in v2: quote $operator at substitutionchanges 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 linechanges 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 operatorchanges 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(-)scripts/checkpatch.pl +3
-2@@ -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) &&
scripts/checkpatch.pl sub process { · line 3568
Quoted 10 lines
scripts/checkpatch.pl +7
-0+ $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
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Quoted 3 lines · Aditya
Quoted 2 lines · Aditya Srivastava
Currently, checkpatch warns if logical continuations are placed at the start of a line and not at the end of previous line.
Quoted 58 lines
Quoted 58 lines
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
(quoted diff) +2
-0+ 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 <[email protected]>---
changes in v2: quote $operator at substitutionchanges 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 linechanges 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 operatorchanges 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(-)scripts/checkpatch.pl +0
-0@@ -3553,8 +3553,16 @@ sub process {# check for && or || at the start of a line if ($rawline =~ /^\+\s*(&&|\|\|)/) {scripts/checkpatch.pl +10
-2- 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*//; + }}
Quoted 8 lines
Quoted 2 lines
# check indentation starts on a tab stopHi Joe
You probably missed this patch. Please review :)Thanks
Aditya
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees