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

ValueFlow: Cleanup code by using SymbolDatabase provided scope info

This commit is contained in:
Daniel Marjamäki 2014-07-07 16:34:21 +02:00
parent 3169a2d215
commit 26a3bdfe00
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/valueflow.cpp
View File

@ -814,23 +814,11 @@ static void valueFlowAfterAssign(TokenList *tokenlist, ErrorLogger *errorLogger,
static void valueFlowAfterCondition(TokenList *tokenlist, ErrorLogger *errorLogger, const Settings *settings) static void valueFlowAfterCondition(TokenList *tokenlist, ErrorLogger *errorLogger, const Settings *settings)
{ {
std::stack<const Token *> scopeEnd;
for (Token *tok = tokenlist->front(); tok; tok = tok->next()) { for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
const Token *vartok, *numtok; const Token *vartok, *numtok;
if (tok->str() == "{") {
scopeEnd.push(tok->link());
continue;
}
else if (tok->str() == "}" && !scopeEnd.empty()) {
scopeEnd.pop();
continue;
}
// Comparison // Comparison
else if (Token::Match(tok,"==|!=|>=|<=")) { if (Token::Match(tok,"==|!=|>=|<=")) {
if (!tok->astOperand1() || !tok->astOperand2()) if (!tok->astOperand1() || !tok->astOperand2())
continue; continue;
if (tok->astOperand1()->isName()) { if (tok->astOperand1()->isName()) {
@ -917,7 +905,7 @@ static void valueFlowAfterCondition(TokenList *tokenlist, ErrorLogger *errorLogg
ok = valueFlowForward(startToken->next(), startToken->link(), var, varid, values, true, tokenlist, errorLogger, settings); ok = valueFlowForward(startToken->next(), startToken->link(), var, varid, values, true, tokenlist, errorLogger, settings);
// After conditional code.. // After conditional code..
if (ok && !scopeEnd.empty() && Token::simpleMatch(top->link(), ") {")) { if (ok && Token::simpleMatch(top->link(), ") {")) {
Token *after = top->link()->linkAt(1); Token *after = top->link()->linkAt(1);
std::string unknownFunction; std::string unknownFunction;
if (settings->library.isScopeNoReturn(after,&unknownFunction)) { if (settings->library.isScopeNoReturn(after,&unknownFunction)) {
@ -933,7 +921,7 @@ static void valueFlowAfterCondition(TokenList *tokenlist, ErrorLogger *errorLogg
continue; continue;
} }
} }
valueFlowForward(after->next(), scopeEnd.top(), var, varid, values, true, tokenlist, errorLogger, settings); valueFlowForward(after->next(), top->scope()->classEnd, var, varid, values, true, tokenlist, errorLogger, settings);
} }
} }
} }