diff options
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/cplusplus/PreprocessorClient.h | 3 | ||||
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 11 | ||||
| -rw-r--r-- | src/libs/cplusplus/pp-engine.h | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/libs/cplusplus/PreprocessorClient.h b/src/libs/cplusplus/PreprocessorClient.h index 05727ee5f44..f7e9932dd2d 100644 --- a/src/libs/cplusplus/PreprocessorClient.h +++ b/src/libs/cplusplus/PreprocessorClient.h @@ -68,7 +68,8 @@ class CPLUSPLUS_EXPORT Client public: enum IncludeType { IncludeLocal, - IncludeGlobal + IncludeGlobal, + IncludeNext }; public: diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 551cd6e37ed..4866a8f1006 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -1407,9 +1407,10 @@ void Preprocessor::handlePreprocessorDirective(PPToken *tk) else if (!skipping() && directive == ppUndef) handleUndefDirective(tk); else if (!skipping() && (directive == ppInclude - || directive == ppIncludeNext || directive == ppImport)) - handleIncludeDirective(tk); + handleIncludeDirective(tk, false); + else if (!skipping() && directive == ppIncludeNext) + handleIncludeDirective(tk, true); else if (directive == ppIf) handleIfDirective(tk); else if (directive == ppIfDef) @@ -1428,7 +1429,7 @@ void Preprocessor::handlePreprocessorDirective(PPToken *tk) } -void Preprocessor::handleIncludeDirective(PPToken *tk) +void Preprocessor::handleIncludeDirective(PPToken *tk, bool includeNext) { m_state.m_lexer->setScanAngleStringLiteralTokens(true); lex(tk); // consume "include" token @@ -1451,7 +1452,9 @@ void Preprocessor::handleIncludeDirective(PPToken *tk) // qDebug("include [[%s]]", included.toUtf8().constData()); Client::IncludeType mode; - if (included.at(0) == '"') + if (includeNext) + mode = Client::IncludeNext; + else if (included.at(0) == '"') mode = Client::IncludeLocal; else if (included.at(0) == '<') mode = Client::IncludeGlobal; diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h index a86b2b4f0a5..23ea7b84f9f 100644 --- a/src/libs/cplusplus/pp-engine.h +++ b/src/libs/cplusplus/pp-engine.h @@ -155,7 +155,7 @@ private: void scanActualArgument(PPToken *tk, QVector<PPToken> *tokens); void handlePreprocessorDirective(PPToken *tk); - void handleIncludeDirective(PPToken *tk); + void handleIncludeDirective(PPToken *tk, bool includeNext); void handleDefineDirective(PPToken *tk); QByteArray expand(PPToken *tk, PPToken *lastConditionToken = 0); const Internal::PPToken evalExpression(PPToken *tk, Value &result); |