feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

minor speedup of message()/warning()/error()

Browse Source 
properly identify the function in the dispatcher, to save an additional
string comparison later.

Change-Id: I6bb88bf620f5f47416d8f58cf00050913fc3aa4b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-07-31 15:11:39 +02:00
parent 5249053473
commit 986c953ac6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -85,7 +85,7 @@ enum TestFunc {
T_INVALID = 0, T_REQUIRES, T_GREATERTHAN, T_LESSTHAN, T_EQUALS, T_INVALID = 0, T_REQUIRES, T_GREATERTHAN, T_LESSTHAN, T_EQUALS,
T_EXISTS, T_EXPORT, T_CLEAR, T_UNSET, T_EVAL, T_CONFIG, T_SYSTEM, T_EXISTS, T_EXPORT, T_CLEAR, T_UNSET, T_EVAL, T_CONFIG, T_SYSTEM,
T_RETURN, T_BREAK, T_NEXT, T_DEFINED, T_CONTAINS, T_INFILE, T_RETURN, T_BREAK, T_NEXT, T_DEFINED, T_CONTAINS, T_INFILE,
T_COUNT, T_ISEMPTY, T_INCLUDE, T_LOAD, T_DEBUG, T_MESSAGE, T_IF T_COUNT, T_ISEMPTY, T_INCLUDE, T_LOAD, T_DEBUG, T_MESSAGE, T_WARNING, T_ERROR, T_IF
}; };
void QMakeEvaluator::initFunctionStatics() void QMakeEvaluator::initFunctionStatics()
@@ -167,8 +167,8 @@ void QMakeEvaluator::initFunctionStatics()
{ "include", T_INCLUDE }, { "include", T_INCLUDE },
{ "debug", T_DEBUG }, { "debug", T_DEBUG },
{ "message", T_MESSAGE }, { "message", T_MESSAGE },
{ "warning", T_MESSAGE }, { "warning", T_WARNING },
{ "error", T_MESSAGE }, { "error", T_ERROR },
}; };
for (unsigned i = 0; i < sizeof(testInits)/sizeof(testInits[0]); ++i) for (unsigned i = 0; i < sizeof(testInits)/sizeof(testInits[0]); ++i)
statics.functions.insert(ProString(testInits[i].name), testInits[i].func); statics.functions.insert(ProString(testInits[i].name), testInits[i].func);
@@ -1284,6 +1284,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
case T_DEBUG: case T_DEBUG:
// Yup - do nothing. Nothing is going to enable debug output anyway. // Yup - do nothing. Nothing is going to enable debug output anyway.
return ReturnFalse; return ReturnFalse;
case T_ERROR:
case T_WARNING:
case T_MESSAGE: { case T_MESSAGE: {
if (args.count() != 1) { if (args.count() != 1) {
evalError(fL1S("%1(message) requires one argument.") evalError(fL1S("%1(message) requires one argument.")
@@ -1295,7 +1297,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConditionalFunction(
m_handler->fileMessage(fL1S("Project %1: %2") m_handler->fileMessage(fL1S("Project %1: %2")
.arg(function.toQString(m_tmp1).toUpper(), msg)); .arg(function.toQString(m_tmp1).toUpper(), msg));
// ### Consider real termination in non-cumulative mode // ### Consider real termination in non-cumulative mode
return returnBool(function != QLatin1String("error")); return returnBool(func_t != T_ERROR);
} }
#ifdef PROEVALUATOR_FULL #ifdef PROEVALUATOR_FULL
case T_SYSTEM: { case T_SYSTEM: {