Whitespace cleanup

Minor change to the perl postprocessing script and resulting changes to
the affected source files.

This deals with two issues:
- "foreach"-like structures were not always treated correctly
- some longer calculations that ended on "+ constant" were reformatted in
  a rather unatractive manner

In one source file (divelist.c) I ended up adding braces to the sources...
trying to cascade the indentation further down without having the block
there seemed a lot more trouble than it's worth.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/scripts/whitespace.pl b/scripts/whitespace.pl
index fa4718649..ba97873cf 100644
--- a/scripts/whitespace.pl
+++ b/scripts/whitespace.pl
@@ -2,7 +2,10 @@
 
 my $input = $ARGV[0];
 my $source = `clang-format $input`;
+# for_each_dive (...) and Q_FOREACH and friends...
 $source =~ s/^(.*each.*\(.*\).*)\n\s*{\s*$/$1 {/img;
+$source =~ s/(?:\G|^)(\s+[^#\/*].*each.*\(.*\))\n(\s*)([^{}\s])/$1\n\t$2$3/img;
+
 $source =~ s/^(\s*struct[^()\n]*)\n\s*{\s*$/$1 {/img;
 $source =~ s/^(\s*static\s+struct[^()\n]*)\n\s*{\s*$/$1 {/img;
 $source =~ s/^(\s*union[^()\n]*)\n\s*{\s*$/$1 {/img;
@@ -11,5 +14,8 @@ $source =~ s/^(\s*class.*)\n\s*{\s*$/$1 {/img;
 $source =~ s/^(\S*::\S*.*)\n\s*: /$1 : /img;
 $source =~ s/(?:\G|^)[ ]{6}/\t/mg;
 $source =~ s/(?:\G|^)(\t*)[ ]{4}"/$1\t"/mg;
+# don't put line break before the last single term argument of a
+# calculation
+$source =~ s/(?:\G|^)(.*[+-])\n\s*(\S*\;)$/$1 $2/mg;
 open (DIFF, "| diff -u $input -");
 print DIFF $source ;