mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 20:20:50 +07:00
checkpatch: track #ifdef/#else/#endif when tracking blocks
When picking up a complete statement or block for analysis we cannot simply track open/close/etc parenthesis we must take into account preprocessor section boundaries. Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
8b1b33786b
commit
4635f4fbaf
@ -405,6 +405,7 @@ sub ctx_statement_block {
|
||||
|
||||
my $type = '';
|
||||
my $level = 0;
|
||||
my @stack = ([$type, $level]);
|
||||
my $p;
|
||||
my $c;
|
||||
my $len = 0;
|
||||
@ -436,6 +437,16 @@ sub ctx_statement_block {
|
||||
$remainder = substr($blk, $off);
|
||||
|
||||
#warn "CSB: c<$c> type<$type> level<$level> remainder<$remainder> coff_set<$coff_set>\n";
|
||||
|
||||
# Handle nested #if/#else.
|
||||
if ($remainder =~ /^#\s*(?:ifndef|ifdef|if)\s/) {
|
||||
push(@stack, [ $type, $level ]);
|
||||
} elsif ($remainder =~ /^#\s*(?:else|elif)\b/) {
|
||||
($type, $level) = @{$stack[$#stack - 1]};
|
||||
} elsif ($remainder =~ /^#\s*endif\b/) {
|
||||
($type, $level) = @{pop(@stack)};
|
||||
}
|
||||
|
||||
# Statement ends at the ';' or a close '}' at the
|
||||
# outermost level.
|
||||
if ($level == 0 && $c eq ';') {
|
||||
@ -582,11 +593,22 @@ sub ctx_block_get {
|
||||
my @res = ();
|
||||
|
||||
my $level = 0;
|
||||
my @stack = ($level);
|
||||
for ($line = $start; $remain > 0; $line++) {
|
||||
next if ($rawlines[$line] =~ /^-/);
|
||||
$remain--;
|
||||
|
||||
$blk .= $rawlines[$line];
|
||||
|
||||
# Handle nested #if/#else.
|
||||
if ($rawlines[$line] =~ /^.\s*#\s*(?:ifndef|ifdef|if)\s/) {
|
||||
push(@stack, $level);
|
||||
} elsif ($rawlines[$line] =~ /^.\s*#\s*(?:else|elif)\b/) {
|
||||
$level = $stack[$#stack - 1];
|
||||
} elsif ($rawlines[$line] =~ /^.\s*#\s*endif\b/) {
|
||||
$level = pop(@stack);
|
||||
}
|
||||
|
||||
foreach my $c (split(//, $rawlines[$line])) {
|
||||
##print "C<$c>L<$level><$open$close>O<$off>\n";
|
||||
if ($off > 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user