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

ValueFlow: Small cleanups

This commit is contained in:
Daniel Marjamäki 2014-07-15 10:36:13 +02:00
parent b6a9c53826
commit c531749d7a
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/valueflow.cpp
View File

@ -23,25 +23,13 @@
#include "symboldatabase.h" #include "symboldatabase.h"
#include "token.h" #include "token.h"
#include "tokenlist.h" #include "tokenlist.h"
//#include <iostream>
#include <stack> #include <stack>
static void execute(const Token *expr, static void execute(const Token *expr,
std::map<unsigned int, MathLib::bigint> * const programMemory, std::map<unsigned int, MathLib::bigint> * const programMemory,
MathLib::bigint *result, MathLib::bigint *result,
bool *error); bool *error);
//static void printvalues(const Token *tok)
//{
// if (tok->values.empty())
// std::cout << "empty";
// for (std::list<ValueFlow::Value>::const_iterator it = tok->values.begin(); it != tok->values.end(); ++it)
// std::cout << " " << (it->intvalue);
// std::cout << std::endl;
//}
static void bailout(TokenList *tokenlist, ErrorLogger *errorLogger, const Token *tok, const std::string &what) static void bailout(TokenList *tokenlist, ErrorLogger *errorLogger, const Token *tok, const std::string &what)
{ {
std::list<ErrorLogger::ErrorMessage::FileLocation> callstack; std::list<ErrorLogger::ErrorMessage::FileLocation> callstack;
@ -794,13 +782,8 @@ static void valueFlowAfterAssign(TokenList *tokenlist, ErrorLogger *errorLogger,
const Variable *var = tok->astOperand1()->variable(); const Variable *var = tok->astOperand1()->variable();
if (!var || !var->isLocal()) if (!var || !var->isLocal())
continue; continue;
const Token * endToken = 0;
for (const Token *tok2 = var->typeStartToken(); tok2; tok2 = tok2->previous()) { const Token * const endOfVarScope = var->typeStartToken()->scope()->classEnd;
if (tok2->str() == "{") {
endToken = tok2->link();
break;
}
}
// Rhs values.. // Rhs values..
if (!tok->astOperand2() || tok->astOperand2()->values.empty()) if (!tok->astOperand2() || tok->astOperand2()->values.empty())
@ -808,7 +791,7 @@ static void valueFlowAfterAssign(TokenList *tokenlist, ErrorLogger *errorLogger,
std::list<ValueFlow::Value> values = tok->astOperand2()->values; std::list<ValueFlow::Value> values = tok->astOperand2()->values;
const bool constValue = tok->astOperand2()->isNumber(); const bool constValue = tok->astOperand2()->isNumber();
valueFlowForward(tok, endToken, var, varid, values, constValue, tokenlist, errorLogger, settings); valueFlowForward(tok, endOfVarScope, var, varid, values, constValue, tokenlist, errorLogger, settings);
} }
} }