blob: 7cff755dde07a266dd9eeaf4aa05b123465b6439 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
#!/usr/bin/perl -w
undef $/;
for $f (grep /\.(cc|h)$/, split /\n/, `git ls-files`)
{
open F, "<", $f or die "Can't read $f\n";
my $old = $_ = <F>;
close F;
# Aaaw, due to the support code, this beautiful one-liner is one no longer :(
# Should have told you to:
# for x in *.cc *.h;do unbrace <"$x" >aa && mv aa "$x";done
# like I always did before...
# Eliminate braces around one-line blocks.
s&^( +(?:if|while|for|do|else)\b[^\n]*)\n +{\n( *[^/ }][^\n]*)\n +}$&$1\n$2&msg;
# return is not a function, eliminate totally enclosing parentheses.
# This part handles parenthese-less payloads.
while (/^( *)return \(([^()]+)\);/sm)
{
# Done this roundabout way to properly unindent multiline blocks.
my $prev = "$`$1return ";
my $next = ";$'";
my $cur = $2;
$cur =~ s/\n /\n/sg;
$_ = "$prev$cur$next";
}
# return (x) where x contains parentheses.
# Looks like no one told Larry Wall properties of regular expression,
# including the part where they can't do arbitrarily nested parentheses.
while (/^(\s*)return\s+
\((
(?: [^()]*+
(\( (?: [^()]++ | (?3) )* \))
)+
[^()]*+
)\);/sxm)
{
my $prev = "$`$1return ";
my $next = ";$'";
my $cur = "$2";
$cur =~ s/\n /\n/sg;
$_ = "$prev$cur$next";
}
if ($old ne $_)
{
print "$f\n";
open F, ">", $f or die "Can't write $f\n";
print F;
close F;
}
}
|
