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

C++: Also expand first token after macro define

Browse Source 
It was previously beeing skipped.

Change-Id: Iadd9b03acbcf0ee0fb4db537b8597661cb93af3f
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Leandro Melo
2012-05-29 15:27:56 +02:00
committed by hjk
parent 809a4ed91a
commit d90264d6c2
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1257,16 +1257,22 @@ void Preprocessor::handleDefineDirective(PPToken *tk)
QVector<PPToken> bodyTokens;
PPToken firstBodyToken = *tk;
while (isValidToken(*tk)) {
tk->f.generated = true;
bodyTokens.push_back(*tk);
lex(tk);
if (eagerExpansion)
if (eagerExpansion) {
PPToken idTk = *tk;
while (tk->is(T_IDENTIFIER)
&& (!tk->newline() || tk->joined())
&& !isQtReservedWord(tk->asByteArrayRef())
&& handleIdentifier(tk)) {
lex(tk);
if (tk->asByteArrayRef() == macroName) {
*tk = idTk;
break;
}
}
}
tk->f.generated = true;
bodyTokens.push_back(*tk);
lex(tk);
}
if (isQtReservedWord(ByteArrayRef(&macroName))) {