walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Another patch to temporarily disable the followVariableExpression

This commit is contained in:
Daniel Marjamäki 2018-09-01 11:39:21 +02:00
parent 508e8c234b
commit 3cad3c901f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/astutils.cpp
View File

@ -147,7 +147,6 @@ static bool isInLoopCondition(const Token * tok)
{ {
return Token::Match(tok->astTop()->previous(), "for|while ("); return Token::Match(tok->astTop()->previous(), "for|while (");
} }
*/
/// This takes a token that refers to a variable and it will return the token /// This takes a token that refers to a variable and it will return the token
@ -155,11 +154,6 @@ static bool isInLoopCondition(const Token * tok)
/// make such substitution then it will return the original token. /// make such substitution then it will return the original token.
static const Token * followVariableExpression(const Token * tok, bool cpp) static const Token * followVariableExpression(const Token * tok, bool cpp)
{ {
// DM: followVariableExpression is disabled for now because it cause problems.
// See #8717 and #8722
(void)cpp;
return tok;
/*
if (!tok) if (!tok)
return tok; return tok;
// Skip array access // Skip array access
@ -215,7 +209,6 @@ static const Token * followVariableExpression(const Token * tok, bool cpp)
} }
} }
return varTok; return varTok;
*/
} }
static void followVariableExpressionError(const Token *tok1, const Token *tok2, ErrorPath* errors) static void followVariableExpressionError(const Token *tok1, const Token *tok2, ErrorPath* errors)
@ -231,6 +224,7 @@ static void followVariableExpressionError(const Token *tok1, const Token *tok2,
return; return;
errors->push_back(item); errors->push_back(item);
} }
*/
bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2, const Library& library, bool pure, ErrorPath* errors) bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2, const Library& library, bool pure, ErrorPath* errors)
{ {
@ -252,6 +246,9 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
return isSameExpression(cpp, macro, tok1, tok2->astOperand1()->astOperand1(), library, pure, errors); return isSameExpression(cpp, macro, tok1, tok2->astOperand1()->astOperand1(), library, pure, errors);
} }
// Follow variables if possible // Follow variables if possible
// DM: followVariableExpression is disabled for now because it cause problems.
// See #8717 and #8722
/*
if (tok1->str() != tok2->str() && (Token::Match(tok1, "%var%") || Token::Match(tok2, "%var%"))) { if (tok1->str() != tok2->str() && (Token::Match(tok1, "%var%") || Token::Match(tok2, "%var%"))) {
const Token * varTok1 = followVariableExpression(tok1, cpp); const Token * varTok1 = followVariableExpression(tok1, cpp);
if (varTok1->str() == tok2->str()) { if (varTok1->str() == tok2->str()) {
@ -269,6 +266,7 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
return isSameExpression(cpp, macro, varTok1, varTok2, library, pure, errors); return isSameExpression(cpp, macro, varTok1, varTok2, library, pure, errors);
} }
} }
*/
if (tok1->varId() != tok2->varId() || tok1->str() != tok2->str() || tok1->originalName() != tok2->originalName()) { if (tok1->varId() != tok2->varId() || tok1->str() != tok2->str() || tok1->originalName() != tok2->originalName()) {
if ((Token::Match(tok1,"<|>") && Token::Match(tok2,"<|>")) || if ((Token::Match(tok1,"<|>") && Token::Match(tok2,"<|>")) ||
(Token::Match(tok1,"<=|>=") && Token::Match(tok2,"<=|>="))) { (Token::Match(tok1,"<=|>=") && Token::Match(tok2,"<=|>="))) {