From 42f32671a877bd5d0c36dcea5cc58220f1d47a82 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 16 Feb 2014 15:38:01 -0800 Subject: [PATCH] Continue to improve whitespace cleanup helper The more I try the cleanup helper, the more corner cases I find... Signed-off-by: Dirk Hohndel --- scripts/whitespace.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/whitespace.pl b/scripts/whitespace.pl index ad5380442..fa4718649 100644 --- a/scripts/whitespace.pl +++ b/scripts/whitespace.pl @@ -3,7 +3,10 @@ my $input = $ARGV[0]; my $source = `clang-format $input`; $source =~ s/^(.*each.*\(.*\).*)\n\s*{\s*$/$1 {/img; -$source =~ s/^(\s*struct.*)\n\s*{\s*$/$1 {/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; +$source =~ s/^(\s*static\s+union[^()\n]*)\n\s*{\s*$/$1 {/img; $source =~ s/^(\s*class.*)\n\s*{\s*$/$1 {/img; $source =~ s/^(\S*::\S*.*)\n\s*: /$1 : /img; $source =~ s/(?:\G|^)[ ]{6}/\t/mg;