diff options
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 14 | ||||
| -rw-r--r-- | src/libs/cplusplus/pp-engine.h | 3 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 3643601a85c..659b888327b 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -1048,7 +1048,7 @@ bool Preprocessor::handleIdentifier(PPToken *tk) argRefs); } - if (!handleFunctionLikeMacro(tk, macro, body, allArgTks, baseLine)) { + if (!handleFunctionLikeMacro(macro, body, allArgTks, baseLine)) { if (m_client && !idTk.expanded()) m_client->stopExpandingMacro(idTk.offset, *macro); return false; @@ -1119,8 +1119,7 @@ bool Preprocessor::handleIdentifier(PPToken *tk) return true; } -bool Preprocessor::handleFunctionLikeMacro(PPToken *tk, - const Macro *macro, +bool Preprocessor::handleFunctionLikeMacro(const Macro *macro, QVector<PPToken> &body, const QVector<QVector<PPToken> > &actuals, unsigned baseLine) @@ -1220,9 +1219,6 @@ bool Preprocessor::handleFunctionLikeMacro(PPToken *tk, body = expanded; body.squeeze(); - // Next token to be lexed after the expansion. - pushToken(tk); - return true; } @@ -1479,9 +1475,9 @@ bool Preprocessor::collectActualArguments(PPToken *tk, QVector<QVector<PPToken> actuals->append(tokens); } - if (tk->is(T_RPAREN)) - lex(tk); - //###TODO: else error message + if (!tk->is(T_RPAREN)) { + //###TODO: else error message + } return true; } diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h index 2614c107b15..8781b7ac19b 100644 --- a/src/libs/cplusplus/pp-engine.h +++ b/src/libs/cplusplus/pp-engine.h @@ -205,8 +205,7 @@ private: void lex(PPToken *tk); void skipPreprocesorDirective(PPToken *tk); bool handleIdentifier(PPToken *tk); - bool handleFunctionLikeMacro(PPToken *tk, - const Macro *macro, + bool handleFunctionLikeMacro(const Macro *macro, QVector<PPToken> &body, const QVector<QVector<PPToken> > &actuals, unsigned lineRef); |