mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add perl function indent_ctor_init_lists to whitespace.pl

Browse source 
whitespace.pl can now do a better job (although surely
still not 100% perfect job) of formatting constructor
member initialization lists according to the rules
described in the current CodingStyle file.

Signed-off-by: K. Heller <pestophagous@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
K. \"pestophagous\" Heller 2015-10-17 17:05:36 -07:00 • committed by Dirk Hohndel
parent efaf697e76
commit 5902a1aace
1 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
scripts/whitespace.pl
View file

@ -38,6 +38,44 @@ $source =~ s/^(#(?:if |)define.*)((?:\\\n.*){4})\n +([^*].*)$/$1$2\n\t$3/mg;
$source =~ s/^(#(?:if |)define.*)((?:\\\n.*){5})\n +([^*].*)$/$1$2\n\t$3/mg;
# don't put line break before the last single term argument of a calculation
$source =~ s/(?:\G|^)(.*[+-])\n\s*(\S*\;)$/$1 $2/mg;
sub indent_ctor_init_lists {
my($content) = @_;
my @not_ctor_words = qw(
\bdo\b
\belse\b
\bfor\b
\bif\b
\bsizeof\b
\bswitch\b
\bwhile\b
\btr\b
\bconnect\b
);
my $regexStr = "(" . join("|", @not_ctor_words) . ")";
my $not_ctor_regex = qr{$regexStr};
my $result = "";
for ( split(/\n/, $content) ) {
if ($_ =~ $not_ctor_regex) {
# probably not a ctor line. leave it be.
$result .= $_ . "\n";
}
else {
$_ =~ s/^\s*(\w*\(.*\),?)$/\t$1/mg;
$result .= $_ . "\n";
}
}
return $result;
}
$source = indent_ctor_init_lists($source);
$quotedinput = $input;
$quotedinput =~ s|/|\\/|g;
open (DIFF, "| diff -u $input - | sed -e 's/--- $quotedinput/--- $quotedinput.old/' | sed -e 's/+++ -/+++ $quotedinput/'");