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

astyle formatting 

[ci skip]
This commit is contained in:
Daniel Marjamäki 2018-11-14 19:10:52 +01:00
parent 69f6100d83
commit 39c04b650d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/token.cpp
View File

@ -1682,7 +1682,7 @@ bool Token::addValue(const ValueFlow::Value &value)
ValueFlow::Value v(value);
if (v.varId == 0)
v.varId = mVarId;
if(v.isKnown() && v.isIntValue())
if (v.isKnown() && v.isIntValue())
mValues->push_front(v);
else
mValues->push_back(v);

8
lib/valueflow.cpp
View File

@ -1136,7 +1136,7 @@ static void valueFlowTerminatingCondition(TokenList *tokenlist, SymbolDatabase*
const Variable * var = tok2->variable();
if (!var)
continue;
if(!var->scope())
if (!var->scope())
continue;
const Token * endToken = var->scope()->bodyEnd;
if (!var->isLocal() && !var->isConst() && !var->isArgument()) {
@ -2493,7 +2493,7 @@ static void valueFlowForwardLifetime(Token * tok, TokenList *tokenlist, ErrorLog
if (!assignTok->astOperand2() || assignTok->astOperand2()->values().empty())
return;
if(astIsPointer(assignTok->astOperand2()) && !var->isPointer() && !(var->valueType() && var->valueType()->isIntegral()))
if (astIsPointer(assignTok->astOperand2()) && !var->isPointer() && !(var->valueType() && var->valueType()->isIntegral()))
return;
std::list<ValueFlow::Value> values = assignTok->astOperand2()->values();
@ -2863,11 +2863,11 @@ static void valueFlowAfterAssign(TokenList *tokenlist, SymbolDatabase* symboldat
continue;
std::list<ValueFlow::Value> values = tok->astOperand2()->values();
if(std::any_of(values.begin(), values.end(), std::mem_fn(&ValueFlow::Value::isLifetimeValue))) {
if (std::any_of(values.begin(), values.end(), std::mem_fn(&ValueFlow::Value::isLifetimeValue))) {
valueFlowForwardLifetime(tok, tokenlist, errorLogger, settings);
values.remove_if(std::mem_fn(&ValueFlow::Value::isLifetimeValue));
}
if(!var->isPointer())
if (!var->isPointer())
values.remove_if(std::mem_fn(&ValueFlow::Value::isTokValue));
for (std::list<ValueFlow::Value>::iterator it = values.begin(); it != values.end(); ++it) {
const std::string info = "Assignment '" + tok->expressionString() + "', assigned value is " + it->infoString();