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

Fixes: Expand the #elif's condition.

Browse Source
This commit is contained in:
Roberto Raggi
2009-01-19 20:06:39 +01:00
committed by Thorbjørn Lindeijer
parent e0a4789081
commit 44ed62c181
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/cplusplus/pp-engine.cpp
View File

@@ -963,7 +963,21 @@ void Preprocessor::processElif(TokenIterator firstToken, TokenIterator lastToken
} else if (iflevel == 0 && !skipping()) {
// std::cerr << "*** WARNING #else without #if" << std::endl;
} else if (!_true_test[iflevel] && !_skipping[iflevel - 1]) {
const Value result = evalExpression(tk.dot(), lastToken, _source);
const char *first = startOfToken(*tk);
const char *last = startOfToken(*lastToken);
MacroExpander expandCondition (env);
QByteArray condition;
condition.reserve(256);
expandCondition(first, last, &condition);
QVector<Token> tokens = tokenize(condition);
const Value result = evalExpression(tokens.constBegin(),
tokens.constEnd() - 1,
condition);
_true_test[iflevel] = ! result.is_zero ();
_skipping[iflevel] = result.is_zero ();
} else {