|
@@ -2825,8 +2825,8 @@ sub process {
|
|
|
|
|
|
# function brace can't be on same line, except for #defines of do while,
|
|
|
# or if closed on same line
|
|
|
- if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
|
|
|
- !($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) {
|
|
|
+ if (($line=~/$Type\s*$Ident\(.*\).*\s\{/) and
|
|
|
+ !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
|
|
|
ERROR("OPEN_BRACE",
|
|
|
"open brace '{' following function declarations go on the next line\n" . $herecurr);
|
|
|
}
|
|
@@ -3259,8 +3259,8 @@ sub process {
|
|
|
## }
|
|
|
|
|
|
#need space before brace following if, while, etc
|
|
|
- if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
|
|
|
- $line =~ /do{/) {
|
|
|
+ if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\){/) ||
|
|
|
+ $line =~ /do\{/) {
|
|
|
if (ERROR("SPACING",
|
|
|
"space required before the open brace '{'\n" . $herecurr) &&
|
|
|
$fix) {
|
|
@@ -3633,7 +3633,7 @@ sub process {
|
|
|
$dstat !~ /^for\s*$Constant$/ && # for (...)
|
|
|
$dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ && # for (...) bar()
|
|
|
$dstat !~ /^do\s*{/ && # do {...
|
|
|
- $dstat !~ /^\({/ && # ({...
|
|
|
+ $dstat !~ /^\(\{/ && # ({...
|
|
|
$ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
|
|
|
{
|
|
|
$ctx =~ s/\n*$//;
|