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

Fix #include MACRO_NAME.

Browse Source 
Change-Id: Id1c4046d028ad26d17b28feb53a832f3b48363f1
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
This commit is contained in:
Erik Verbruggen
2012-03-29 17:14:42 +02:00
parent 47fea30557
commit 2a74097b54
2 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1113,16 +1113,16 @@ void Preprocessor::handleIncludeDirective(PPToken *tk)
m_state.m_lexer->setScanAngleStringLiteralTokens(true);
lex(tk); // consume "include" token
m_state.m_lexer->setScanAngleStringLiteralTokens(false);
const unsigned line = tk->lineno;
QByteArray included;
if (tk->is(T_STRING_LITERAL) || tk->is(T_ANGLE_STRING_LITERAL)) {
included = tk->asByteArrayRef().toByteArray();
lex(tk); // consume string token
} else {
included = expand(tk);
}
included = included.trimmed();
const unsigned line = tk->lineno;
lex(tk); // consume string token
// qDebug("include [[%s]]", included.toUtf8().constData());
Client::IncludeType mode;
@@ -1249,7 +1249,8 @@ QByteArray Preprocessor::expand(PPToken *tk, PPToken *lastConditionToken)
const ByteArrayRef s = tk->asByteArrayRef();
condition.append(s.start(), s.length());
condition += ' ';
*lastConditionToken = *tk;
if (lastConditionToken)
*lastConditionToken = *tk;
lex(tk);
}
// qDebug("*** Condition before: [%s]", condition.constData());