From ebac81b784056cd288a5b69f7c341fecdc89d5e5 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 13 Feb 2014 22:08:09 -0800 Subject: [PATCH] Fine tuning of the whitespace / coding style post processing The struct / class regex was way too relaxed. Having the parent class on the same line usually looks better. clang-format appears to do something odd with continuation strings - even with UseTab: Always it indents those with four spaces. Signed-off-by: Dirk Hohndel --- scripts/whitespace.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/whitespace.pl b/scripts/whitespace.pl index 1d6548092..ad5380442 100644 --- a/scripts/whitespace.pl +++ b/scripts/whitespace.pl @@ -3,9 +3,10 @@ my $input = $ARGV[0]; my $source = `clang-format $input`; $source =~ s/^(.*each.*\(.*\).*)\n\s*{\s*$/$1 {/img; -$source =~ s/^(.*struct.*)\n\s*{\s*$/$1 {/img; -$source =~ s/^(.*class.*)\n\s*{\s*$/$1 {/img; -$source =~ s/^(\S*::\S*.*)\n\s*: /$1 :\n\t/img; +$source =~ s/^(\s*struct.*)\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; +$source =~ s/(?:\G|^)(\t*)[ ]{4}"/$1\t"/mg; open (DIFF, "| diff -u $input -"); print DIFF $source ;