* src/sanity/style.test: Check the iface/ tree too.
* iface/gspn/gspn.cc, iface/gspn/ssp.cc: Fix style.
This commit is contained in:
parent
da2d2e19b1
commit
3e968a3c9d
4 changed files with 67 additions and 61 deletions
|
|
@ -21,79 +21,82 @@ export GREP_COLOR
|
|||
|
||||
tmp=incltest.tmp
|
||||
|
||||
find "${INCDIR-..}" \( -name "${1-*}.hh" -o -name "${1-*}.cc" \) \
|
||||
-a -type f -a -print |
|
||||
while read file; do
|
||||
if grep 'GNU Bison' "$file" >/dev/null ||
|
||||
for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do
|
||||
|
||||
find "$dir" \( -name "${1-*}.hh" -o -name "${1-*}.cc" \) \
|
||||
-a -type f -a -print |
|
||||
while read file; do
|
||||
if grep 'GNU Bison' "$file" >/dev/null ||
|
||||
grep 'generated by flex' "$file" >/dev/null ; then
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
|
||||
fail=false
|
||||
fail=false
|
||||
|
||||
sed 's,//.*,,' < $file > $tmp
|
||||
sed 's,//.*,,' < $file > $tmp
|
||||
|
||||
grep '[ ]if(' $tmp &&
|
||||
diag 'Missing space after "if"'
|
||||
grep '[ ]if(' $tmp &&
|
||||
diag 'Missing space after "if"'
|
||||
|
||||
grep '[ ]if (.*).*{' $tmp &&
|
||||
diag 'Opening { should be on its own line.'
|
||||
grep '[ ]if (.*).*{' $tmp &&
|
||||
diag 'Opening { should be on its own line.'
|
||||
|
||||
grep '[ ]if (.*).*;' $tmp &&
|
||||
diag 'if body should be on another line.'
|
||||
grep '[ ]if (.*).*;' $tmp &&
|
||||
diag 'if body should be on another line.'
|
||||
|
||||
grep '[ ]while(' $tmp &&
|
||||
diag 'Missing space after "while"'
|
||||
grep '[ ]while(' $tmp &&
|
||||
diag 'Missing space after "while"'
|
||||
|
||||
grep '[ ]while (.*).*{' $tmp &&
|
||||
diag 'Opening { should be on its own line.'
|
||||
grep '[ ]while (.*).*{' $tmp &&
|
||||
diag 'Opening { should be on its own line.'
|
||||
|
||||
grep '[ ]while (.*).*[^)];' $tmp &&
|
||||
diag 'while body should be on another line.'
|
||||
grep '[ ]while (.*).*[^)];' $tmp &&
|
||||
diag 'while body should be on another line.'
|
||||
|
||||
grep '[ ]for(' $tmp &&
|
||||
diag 'Missing space after "for"'
|
||||
grep '[ ]for(' $tmp &&
|
||||
diag 'Missing space after "for"'
|
||||
|
||||
grep '[ ]for (.*).*{' $tmp &&
|
||||
diag 'Opening { should be on its own line.'
|
||||
grep '[ ]for (.*).*{' $tmp &&
|
||||
diag 'Opening { should be on its own line.'
|
||||
|
||||
grep '[ ]for (.*;.*;.*).*;' $tmp &&
|
||||
diag 'for body should be on another line.'
|
||||
grep '[ ]for (.*;.*;.*).*;' $tmp &&
|
||||
diag 'for body should be on another line.'
|
||||
|
||||
grep '[ ]switch(' $tmp &&
|
||||
diag 'Missing space after "switch"'
|
||||
grep '[ ]switch(' $tmp &&
|
||||
diag 'Missing space after "switch"'
|
||||
|
||||
grep '[ ]switch (.*).*{' $tmp &&
|
||||
diag 'Opening { should be on its own line.'
|
||||
grep '[ ]switch (.*).*{' $tmp &&
|
||||
diag 'Opening { should be on its own line.'
|
||||
|
||||
grep '( ' $tmp &&
|
||||
diag 'No space after opening (.'
|
||||
grep '( ' $tmp &&
|
||||
diag 'No space after opening (.'
|
||||
|
||||
grep ' )' $tmp &&
|
||||
diag 'No space before closing ).'
|
||||
grep ' )' $tmp &&
|
||||
diag 'No space before closing ).'
|
||||
|
||||
grep '! ' $tmp &&
|
||||
diag 'No space after unary operators (!).'
|
||||
grep '! ' $tmp &&
|
||||
diag 'No space after unary operators (!).'
|
||||
|
||||
grep ',[(a-zA-Z+=_!]' $tmp &&
|
||||
diag 'Space after coma.'
|
||||
grep ',[(a-zA-Z+=_!]' $tmp &&
|
||||
diag 'Space after coma.'
|
||||
|
||||
grep '[^ ]&&[^ ]' $tmp &&
|
||||
diag 'Space arround binary operators.'
|
||||
grep '[^ ]&&[^ ]' $tmp &&
|
||||
diag 'Space arround binary operators.'
|
||||
|
||||
grep '[^ ]||[^ ]' $tmp &&
|
||||
diag 'Space arround binary operators.'
|
||||
grep '[^ ]||[^ ]' $tmp &&
|
||||
diag 'Space arround binary operators.'
|
||||
|
||||
grep '[ ]default:[^:].*;' $tmp &&
|
||||
diag 'Label should be on their own line.'
|
||||
grep '[ ]default:[^:].*;' $tmp &&
|
||||
diag 'Label should be on their own line.'
|
||||
|
||||
grep '[ ]case.*:[^:].*;' $tmp &&
|
||||
diag 'Label should be on their own line.'
|
||||
grep '[ ]case.*:[^:].*;' $tmp &&
|
||||
diag 'Label should be on their own line.'
|
||||
|
||||
grep '[ ];' $tmp &&
|
||||
diag 'No space before semicolon.'
|
||||
grep '[ ];' $tmp &&
|
||||
diag 'No space before semicolon.'
|
||||
|
||||
$fail && echo "$file" >>failures
|
||||
$fail && echo "$file" >>failures
|
||||
done
|
||||
done
|
||||
|
||||
if test -f failures; then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue