checkpatch: improve type matcher debug

Improve type matcher debug so we can see what it does match.  As part
of this move us to to using the common debug framework.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andy Whitcroft 2008-07-23 21:29:06 -07:00 committed by Linus Torvalds
parent 389a2fe57f
commit 7429c6903e
1 changed files with 7 additions and 4 deletions

View File

@ -17,7 +17,6 @@ my $quiet = 0;
my $tree = 1; my $tree = 1;
my $chk_signoff = 1; my $chk_signoff = 1;
my $chk_patch = 1; my $chk_patch = 1;
my $tst_type = 0;
my $tst_only; my $tst_only;
my $emacs = 0; my $emacs = 0;
my $terse = 0; my $terse = 0;
@ -44,7 +43,6 @@ GetOptions(
'summary-file!' => \$summary_file, 'summary-file!' => \$summary_file,
'debug=s' => \%debug, 'debug=s' => \%debug,
'test-type!' => \$tst_type,
'test-only=s' => \$tst_only, 'test-only=s' => \$tst_only,
) or exit; ) or exit;
@ -67,6 +65,7 @@ if ($#ARGV < 0) {
my $dbg_values = 0; my $dbg_values = 0;
my $dbg_possible = 0; my $dbg_possible = 0;
my $dbg_type = 0;
for my $key (keys %debug) { for my $key (keys %debug) {
eval "\${dbg_$key} = '$debug{$key}';" eval "\${dbg_$key} = '$debug{$key}';"
} }
@ -1307,8 +1306,12 @@ sub process {
if ($line=~/^[^\+]/) {next;} if ($line=~/^[^\+]/) {next;}
# TEST: allow direct testing of the type matcher. # TEST: allow direct testing of the type matcher.
if ($tst_type && $line =~ /^.$Declare$/) { if ($dbg_type) {
ERROR("TEST: is type $Declare\n" . $herecurr); if ($line =~ /^.\s*$Declare\s*$/) {
ERROR("TEST: is type\n" . $herecurr);
} elsif ($dbg_type > 1 && $line =~ /^.+($Declare)/) {
ERROR("TEST: is not type ($1 is)\n". $herecurr);
}
next; next;
} }