mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 18:00:33 +01:00
Code Issues Projects Releases Wiki Activity

make whitespace checker handle non-C too.

Browse Source 
svn:r4412
This commit is contained in:
Nick Mathewson 2005-06-11 18:52:37 +00:00
parent 232861ba42
commit 787dfac69b
2 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -51,7 +51,7 @@ doxygen:
# Avoid strlcpy.c, strlcat.c, tree.h # Avoid strlcpy.c, strlcat.c, tree.h
check-spaces: check-spaces:
./contrib/checkSpace.pl \ ./contrib/checkSpace.pl -C \
src/common/*.h \ src/common/*.h \
src/common/[^s]*.c \ src/common/[^s]*.c \
src/or/[^t]*.[ch] src/or/t*.c src/or/[^t]*.[ch] src/or/t*.c

96
contrib/checkSpace.pl
View File

@ -1,5 +1,11 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
if ($ARGV[0] =~ /^-/) {
$lang = shift @ARGV;
$C = ($lang eq '-C');
# $TXT = ($lang eq '-txt');
}
for $fn (@ARGV) { for $fn (@ARGV) {
open(F, "$fn"); open(F, "$fn");
$lastnil = 0; $lastnil = 0;
@ -18,7 +24,7 @@ for $fn (@ARGV) {
print "Space\@EOL:$fn:$.\n"; print "Space\@EOL:$fn:$.\n";
} }
## Warn about control keywords without following space. ## Warn about control keywords without following space.
if (/\s(?:if|while|for|switch)\(/) { if ($C && /\s(?:if|while|for|switch)\(/) {
print " KW(:$fn:$.\n"; print " KW(:$fn:$.\n";
} }
## Warn about multiple empty lines. ## Warn about multiple empty lines.
@ -31,49 +37,51 @@ for $fn (@ARGV) {
} }
### Juju to skip over comments and strings, since the tests ### Juju to skip over comments and strings, since the tests
### we're about to do are okay there. ### we're about to do are okay there.
if ($incomment) { if ($C) {
if (m!\*/!) { if ($incomment) {
s!.*?\*/!!; if (m!\*/!) {
$incomment = 0; s!.*?\*/!!;
} else { $incomment = 0;
next; } else {
} next;
} }
if (m!/\*.*?\*/!) { }
s!\s*/\*.*?\*/!!; if (m!/\*.*?\*/!) {
} elsif (m!/\*!) { s!\s*/\*.*?\*/!!;
s!\s*/\*!!; } elsif (m!/\*!) {
$incomment = 1; s!\s*/\*!!;
next; $incomment = 1;
} next;
s!"(?:[^\"]+|\\.)*"!"X"!g; }
next if /^\#/; s!"(?:[^\"]+|\\.)*"!"X"!g;
## Warn about C++-style comments. next if /^\#/;
if (m!//!) { ## Warn about C++-style comments.
# print " //:$fn:$.\n"; if (m!//!) {
s!//.*!!; # print " //:$fn:$.\n";
} s!//.*!!;
## Warn about braces preceded by non-space. }
if (/([^\s])\{/) { ## Warn about braces preceded by non-space.
print " $1\{:$fn:$.\n"; if (/([^\s])\{/) {
} print " $1\{:$fn:$.\n";
## Warn about multiple internal spaces. }
#if (/[^\s,:]\s{2,}[^\s\\=]/) { ## Warn about multiple internal spaces.
# print " X X:$fn:$.\n"; #if (/[^\s,:]\s{2,}[^\s\\=]/) {
#} # print " X X:$fn:$.\n";
## Warn about { with stuff after. #}
#s/\s+$//; ## Warn about { with stuff after.
#if (/\{[^\}\\]+$/) { #s/\s+$//;
# print " {X:$fn:$.\n"; #if (/\{[^\}\\]+$/) {
#} # print " {X:$fn:$.\n";
## Warn about function calls with space before parens. #}
if (/(\w+)\s\(/) { ## Warn about function calls with space before parens.
if ($1 ne "if" and $1 ne "while" and $1 ne "for" and if (/(\w+)\s\(/) {
$1 ne "switch" and $1 ne "return" and $1 ne "int" and if ($1 ne "if" and $1 ne "while" and $1 ne "for" and
$1 ne "void" and $1 ne "__attribute__") { $1 ne "switch" and $1 ne "return" and $1 ne "int" and
print " fn ():$fn:$.\n"; $1 ne "void" and $1 ne "__attribute__") {
} print " fn ():$fn:$.\n";
} }
}
}
} }
if (! $lastnil) { if (! $lastnil) {
print " EOL\@EOF:$fn:$.\n"; print " EOL\@EOF:$fn:$.\n";