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 <qthjk@ovi.com>
Showing
- src/libs/3rdparty/cplusplus/Bind.cpp 3 additions, 6 deletionssrc/libs/3rdparty/cplusplus/Bind.cpp
- src/libs/3rdparty/cplusplus/Literals.cpp 1 addition, 2 deletionssrc/libs/3rdparty/cplusplus/Literals.cpp
- src/libs/3rdparty/cplusplus/Parser.cpp 11 additions, 19 deletionssrc/libs/3rdparty/cplusplus/Parser.cpp
- src/libs/3rdparty/cplusplus/Templates.cpp 1 addition, 2 deletionssrc/libs/3rdparty/cplusplus/Templates.cpp
- src/libs/cplusplus/CppDocument.cpp 4 additions, 6 deletionssrc/libs/cplusplus/CppDocument.cpp
- src/libs/cplusplus/CppRewriter.cpp 2 additions, 4 deletionssrc/libs/cplusplus/CppRewriter.cpp
- src/libs/cplusplus/Dumpers.cpp 5 additions, 10 deletionssrc/libs/cplusplus/Dumpers.cpp
- src/libs/cplusplus/ExpressionUnderCursor.cpp 2 additions, 3 deletionssrc/libs/cplusplus/ExpressionUnderCursor.cpp
- src/libs/cplusplus/Icons.cpp 6 additions, 8 deletionssrc/libs/cplusplus/Icons.cpp
- src/libs/cplusplus/LookupContext.cpp 6 additions, 12 deletionssrc/libs/cplusplus/LookupContext.cpp
- src/libs/cplusplus/OverviewModel.cpp 1 addition, 2 deletionssrc/libs/cplusplus/OverviewModel.cpp
- src/libs/cplusplus/ResolveExpression.cpp 1 addition, 2 deletionssrc/libs/cplusplus/ResolveExpression.cpp
- src/libs/cplusplus/pp-engine.cpp 2 additions, 4 deletionssrc/libs/cplusplus/pp-engine.cpp
- src/libs/extensionsystem/optionsparser.cpp 1 addition, 2 deletionssrc/libs/extensionsystem/optionsparser.cpp
- src/libs/extensionsystem/pluginmanager.cpp 7 additions, 12 deletionssrc/libs/extensionsystem/pluginmanager.cpp
- src/libs/extensionsystem/pluginspec.cpp 5 additions, 8 deletionssrc/libs/extensionsystem/pluginspec.cpp
- src/libs/glsl/glslsemantic.cpp 6 additions, 9 deletionssrc/libs/glsl/glslsemantic.cpp
- src/libs/qmldebug/declarativetoolsclient.cpp 3 additions, 4 deletionssrc/libs/qmldebug/declarativetoolsclient.cpp
- src/libs/qmldebug/qmldebugclient.cpp 2 additions, 3 deletionssrc/libs/qmldebug/qmldebugclient.cpp
- src/libs/qmldebug/qmlprofilertraceclient.cpp 2 additions, 4 deletionssrc/libs/qmldebug/qmlprofilertraceclient.cpp
Loading
Please register or sign in to comment