lkml.org 
[lkml]   [2008]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/17] checkpatch: conditional indent -- labels have different indent rules
    Date
    Labels have different indent rules and must be ignored when checking
    the conditional indent levels. Also correct identify labels in
    single statement conditionals.

    Signed-off-by: Andy Whitcroft <apw@shadowen.org>
    ---
    scripts/checkpatch.pl | 11 ++++++++---
    1 files changed, 8 insertions(+), 3 deletions(-)

    diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
    index 1148213..1e7d2cd 100755
    --- a/scripts/checkpatch.pl
    +++ b/scripts/checkpatch.pl
    @@ -782,9 +782,9 @@ sub annotate_values {
    }
    $type = 'N';

    - } elsif ($cur =~ /^(if|while|typeof|__typeof__|for)\b/o) {
    + } elsif ($cur =~ /^(if|while|for)\b/o) {
    print "COND($1)\n" if ($dbg_values > 1);
    - $av_pending = 'N';
    + $av_pending = 'E';
    $type = 'N';

    } elsif ($cur =~/^(case)/o) {
    @@ -792,7 +792,7 @@ sub annotate_values {
    $av_pend_colon = 'C';
    $type = 'N';

    - } elsif ($cur =~/^(return|else|goto)/o) {
    + } elsif ($cur =~/^(return|else|goto|typeof|__typeof__)\b/o) {
    print "KEYWORD($1)\n" if ($dbg_values > 1);
    $type = 'N';

    @@ -1846,6 +1846,11 @@ sub process {
    $check = 0;
    }

    + # Ignore the current line if it is label.
    + if ($s =~ /^\s*$Ident\s*:/) {
    + $check = 0;
    + }
    +
    my (undef, $sindent) = line_stats("+" . $s);

    ##print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s>\n";
    --
    1.6.0.rc1.258.g80295


    \
     
     \ /
      Last update: 2008-08-11 22:17    [W:0.021 / U:0.496 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site