make whitespace checker handle non-C too.

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

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

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,6 +37,7 @@ 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 ($C) {
if ($incomment) { if ($incomment) {
if (m!\*/!) { if (m!\*/!) {
s!.*?\*/!!; s!.*?\*/!!;
@ -75,6 +82,7 @@ for $fn (@ARGV) {
} }
} }
} }
}
if (! $lastnil) { if (! $lastnil) {
print " EOL\@EOF:$fn:$.\n"; print " EOL\@EOF:$fn:$.\n";
} }