1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove braces for single lines of conditions

Browse Source 
#!/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>
(cherry picked from qtcreator/29a93998df8405e8799ad23934a56cd99fb36403)
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
This commit is contained in:
Orgad Shaneh 2013-01-08 03:32:53 +02:00 committed by The Qt Project
parent 2f555cf6b7
commit 601ab660af
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qmake/library/qmakebuiltins.cpp
View File

@ -694,11 +694,10 @@ ProStringList QMakeEvaluator::evaluateBuiltinExpand(
} }
break; break;
case E_EVAL: case E_EVAL:
if (args.count() != 1) { if (args.count() != 1)
evalError(fL1S("eval(variable) requires one argument.")); evalError(fL1S("eval(variable) requires one argument."));
} else { else
ret += values(map(args.at(0))); ret += values(map(args.at(0)));
}
break; break;
case E_LIST: { case E_LIST: {
QString tmp; QString tmp;
@ -1160,9 +1159,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
for (int i = configs.size() - 1; i >= 0; i--) { for (int i = configs.size() - 1; i >= 0; i--) {
for (int mut = 0; mut < mutuals.count(); mut++) { for (int mut = 0; mut < mutuals.count(); mut++) {
if (configs[i] == mutuals[mut].trimmed()) { if (configs[i] == mutuals[mut].trimmed())
return returnBool(configs[i] == args[0]); return returnBool(configs[i] == args[0]);
}
} }
} }
return ReturnFalse; return ReturnFalse;
@ -1426,9 +1424,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
} }
const QString &file = resolvePath(m_option->expandEnvVars(args.at(0).toQString(m_tmp1))); const QString &file = resolvePath(m_option->expandEnvVars(args.at(0).toQString(m_tmp1)));
if (IoUtils::exists(file)) { if (IoUtils::exists(file))
return ReturnTrue; return ReturnTrue;
}
int slsh = file.lastIndexOf(QLatin1Char('/')); int slsh = file.lastIndexOf(QLatin1Char('/'));
QString fn = file.mid(slsh+1); QString fn = file.mid(slsh+1);
if (fn.contains(QLatin1Char('*')) || fn.contains(QLatin1Char('?'))) { if (fn.contains(QLatin1Char('*')) || fn.contains(QLatin1Char('?'))) {

23
qmake/library/qmakeglobals.cpp
View File

@ -164,29 +164,28 @@ QMakeGlobals::ArgumentReturn QMakeGlobals::addCommandLineArguments(
break; break;
default: default:
if (arg.startsWith(QLatin1Char('-'))) { if (arg.startsWith(QLatin1Char('-'))) {
if (arg == QLatin1String("-after")) { if (arg == QLatin1String("-after"))
state.after = true; state.after = true;
} else if (arg == QLatin1String("-config")) { else if (arg == QLatin1String("-config"))
argState = ArgConfig; argState = ArgConfig;
} else if (arg == QLatin1String("-nocache")) { else if (arg == QLatin1String("-nocache"))
do_cache = false; do_cache = false;
} else if (arg == QLatin1String("-cache")) { else if (arg == QLatin1String("-cache"))
argState = ArgCache; argState = ArgCache;
} else if (arg == QLatin1String("-platform") || arg == QLatin1String("-spec")) { else if (arg == QLatin1String("-platform") || arg == QLatin1String("-spec"))
argState = ArgSpec; argState = ArgSpec;
} else if (arg == QLatin1String("-xplatform") || arg == QLatin1String("-xspec")) { else if (arg == QLatin1String("-xplatform") || arg == QLatin1String("-xspec"))
argState = ArgXSpec; argState = ArgXSpec;
} else if (arg == QLatin1String("-template") || arg == QLatin1String("-t")) { else if (arg == QLatin1String("-template") || arg == QLatin1String("-t"))
argState = ArgTmpl; argState = ArgTmpl;
} else if (arg == QLatin1String("-template_prefix") || arg == QLatin1String("-tp")) { else if (arg == QLatin1String("-template_prefix") || arg == QLatin1String("-tp"))
argState = ArgTmplPfx; argState = ArgTmplPfx;
} else if (arg == QLatin1String("-win32")) { else if (arg == QLatin1String("-win32"))
dir_sep = QLatin1Char('\\'); dir_sep = QLatin1Char('\\');
} else if (arg == QLatin1String("-unix")) { else if (arg == QLatin1String("-unix"))
dir_sep = QLatin1Char('/'); dir_sep = QLatin1Char('/');
} else { else
return ArgumentUnknown; return ArgumentUnknown;
}
} else if (arg.contains(QLatin1Char('='))) { } else if (arg.contains(QLatin1Char('='))) {
if (state.after) if (state.after)
state.postcmds << arg; state.postcmds << arg;

5
qmake/library/qmakeparser.cpp
View File

@ -1147,11 +1147,10 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg
uint nlen = uce[1]; uint nlen = uce[1];
if (uce[nlen + 2] == TokFuncTerminator) { if (uce[nlen + 2] == TokFuncTerminator) {
m_tmp.setRawData((QChar *)uce + 2, nlen); m_tmp.setRawData((QChar *)uce + 2, nlen);
if (m_tmp == statics.strhost_build) { if (m_tmp == statics.strhost_build)
m_proFile->setHostBuild(true); m_proFile->setHostBuild(true);
} else { else
parseError(fL1S("Unknown option() %1.").arg(m_tmp)); parseError(fL1S("Unknown option() %1.").arg(m_tmp));
}
return; return;
} }
} }