Remove braces for single lines of conditions

#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <[email protected]>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp
index 5ccd79f9097..3e9d6bdcc15 100644
--- a/src/plugins/cpptools/cppchecksymbols.cpp
+++ b/src/plugins/cpptools/cppchecksymbols.cpp
@@ -665,11 +665,10 @@ bool CheckSymbols::visit(NewExpressionAST *ast)
             int arguments = 0;
             if (ast->new_initializer) {
                 ExpressionListAST *list = 0;
-                if (ExpressionListParenAST *exprListParen = ast->new_initializer->asExpressionListParen()) {
+                if (ExpressionListParenAST *exprListParen = ast->new_initializer->asExpressionListParen())
                     list = exprListParen->expression_list;
-                } else if (BracedInitializerAST *braceInit = ast->new_initializer->asBracedInitializer()) {
+                else if (BracedInitializerAST *braceInit = ast->new_initializer->asBracedInitializer())
                     list = braceInit->expression_list;
-                }
                 for (ExpressionListAST *it = list; it; it = it->next)
                     ++arguments;
             }