lkml.org 
[lkml]   [2008]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/13] checkpatch: allow parentheses on return for comparisons
    Date
    From: Andy Whitcroft <apw@canonical.com>

    It seems to be a common idiom to include braces on conditionals in all
    contexts including return. Allow this exception to the return is not
    a function checks. Reported by Kay Sievers.

    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    ---
    scripts/checkpatch.pl | 5 +++--
    1 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
    index b953c76..5c7fd1a 100755
    --- a/scripts/checkpatch.pl
    +++ b/scripts/checkpatch.pl
    @@ -127,6 +127,7 @@ our $Lval = qr{$Ident(?:$Member)*};

    our $Constant = qr{(?:[0-9]+|0x[0-9a-fA-F]+)[UL]*};
    our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};
    +our $Compare = qr{<=|>=|==|!=|<|>};
    our $Operators = qr{
    <=|>=|==|!=|
    =>|->|<<|>>|<|>|!|~|
    @@ -1983,9 +1984,9 @@ sub process {
    my $spacing = $1;
    my $value = $2;

    - # Flatten any parentheses and braces
    + # Flatten any parentheses
    $value =~ s/\)\(/\) \(/g;
    - while ($value =~ s/\([^\(\)]*\)/1/) {
    + while ($value !~ /(?:$Ident|-?$Constant)\s*$Compare\s*(?:$Ident|-?$Constant)/ && $value =~ s/\([^\(\)]*\)/1/) {
    }

    if ($value =~ /^(?:$Ident|-?$Constant)$/) {
    --
    1.6.0.4.911.gc990


    \
     
     \ /
      Last update: 2008-12-07 19:35    [W:2.542 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site