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-10 21:30:01 +01:00
parent 4cef2e94e7
commit d5a478d5c5
8 changed files with 108 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/astutils.cpp
View File

@ -138,8 +138,8 @@ const Token * astIsVariableComparison(const Token *tok, const std::string &comp,
static bool hasToken(const Token * startTok, const Token * stopTok, const Token * tok) static bool hasToken(const Token * startTok, const Token * stopTok, const Token * tok)
{ {
for(const Token * tok2 = startTok;tok2 != stopTok;tok2 = tok2->next()) { for (const Token * tok2 = startTok; tok2 != stopTok; tok2 = tok2->next()) {
if(tok2 == tok) if (tok2 == tok)
return true; return true;
} }
return false; return false;
@ -156,9 +156,9 @@ const Token * nextAfterAstRightmostLeaf(const Token * tok)
else else
rightmostLeaf = rightmostLeaf->astOperand1(); rightmostLeaf = rightmostLeaf->astOperand1();
} while (rightmostLeaf->astOperand1()); } while (rightmostLeaf->astOperand1());
while(Token::Match(rightmostLeaf->next(), "]|)") && !hasToken(rightmostLeaf->next()->link(), rightmostLeaf->next(), tok)) while (Token::Match(rightmostLeaf->next(), "]|)") && !hasToken(rightmostLeaf->next()->link(), rightmostLeaf->next(), tok))
rightmostLeaf = rightmostLeaf->next(); rightmostLeaf = rightmostLeaf->next();
if(rightmostLeaf->str() == "{" && rightmostLeaf->link()) if (rightmostLeaf->str() == "{" && rightmostLeaf->link())
rightmostLeaf = rightmostLeaf->link(); rightmostLeaf = rightmostLeaf->link();
return rightmostLeaf->next(); return rightmostLeaf->next();
} }
@ -963,9 +963,9 @@ const Token *findLambdaEndToken(const Token *first)
{ {
if (!first || first->str() != "[") if (!first || first->str() != "[")
return nullptr; return nullptr;
if(!Token::Match(first->link(), "] (|{")) if (!Token::Match(first->link(), "] (|{"))
return nullptr; return nullptr;
if(first->astOperand1() != first->link()->next()) if (first->astOperand1() != first->link()->next())
return nullptr; return nullptr;
const Token * tok = first; const Token * tok = first;

46
lib/checkautovariables.cpp
View File

@ -590,23 +590,23 @@ void CheckAutoVariables::returnReference()
static bool isInScope(const Token * tok, const Scope * scope) static bool isInScope(const Token * tok, const Scope * scope)
{ {
if(!tok) if (!tok)
return false; return false;
if(!scope) if (!scope)
return false; return false;
const Variable * var = tok->variable(); const Variable * var = tok->variable();
if(var && (var->isGlobal() || var->isStatic() || var->isExtern())) if (var && (var->isGlobal() || var->isStatic() || var->isExtern()))
return false; return false;
if(tok->scope() && tok->scope()->isNestedIn(scope)) if (tok->scope() && tok->scope()->isNestedIn(scope))
return true; return true;
if(!var) if (!var)
return false; return false;
if(var->isArgument() && !var->isReference()) { if (var->isArgument() && !var->isReference()) {
const Scope * tokScope = tok->scope(); const Scope * tokScope = tok->scope();
if(!tokScope) if (!tokScope)
return false; return false;
for(const Scope * argScope:tokScope->nestedList) { for (const Scope * argScope:tokScope->nestedList) {
if(argScope && argScope->isNestedIn(scope)) if (argScope && argScope->isNestedIn(scope))
return true; return true;
} }
} }
@ -615,27 +615,27 @@ static bool isInScope(const Token * tok, const Scope * scope)
void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token * end) void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token * end)
{ {
if(!start) if (!start)
return; return;
const Scope * scope = start->scope(); const Scope * scope = start->scope();
if(!scope) if (!scope)
return; return;
// If the scope is not set correctly then skip checking it // If the scope is not set correctly then skip checking it
if(scope->bodyStart != start) if (scope->bodyStart != start)
return; return;
for (const Token *tok = start; tok && tok != end; tok = tok->next()) { for (const Token *tok = start; tok && tok != end; tok = tok->next()) {
// Skip duplicate warning from dangling references // Skip duplicate warning from dangling references
if(Token::Match(tok, "& %var%")) if (Token::Match(tok, "& %var%"))
continue; continue;
if(tok->variable() && tok->variable()->isPointer()) if (tok->variable() && tok->variable()->isPointer())
continue; continue;
if(std::any_of(tok->values().begin(), tok->values().end(), std::mem_fn(&ValueFlow::Value::isTokValue))) if (std::any_of(tok->values().begin(), tok->values().end(), std::mem_fn(&ValueFlow::Value::isTokValue)))
continue; continue;
for(const ValueFlow::Value& val:tok->values()) { for (const ValueFlow::Value& val:tok->values()) {
if(!val.isLifetimeValue()) if (!val.isLifetimeValue())
continue; continue;
if(Token::Match(tok->astParent(), "return|throw")) { if (Token::Match(tok->astParent(), "return|throw")) {
if (isInScope(val.tokvalue, scope)) { if (isInScope(val.tokvalue, scope)) {
errorReturnDanglingLifetime(tok, &val); errorReturnDanglingLifetime(tok, &val);
break; break;
@ -643,7 +643,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
} }
} }
const Token *lambdaEndToken = findLambdaEndToken(tok); const Token *lambdaEndToken = findLambdaEndToken(tok);
if(lambdaEndToken) { if (lambdaEndToken) {
checkVarLifetimeScope(lambdaEndToken->link(), lambdaEndToken); checkVarLifetimeScope(lambdaEndToken->link(), lambdaEndToken);
tok = lambdaEndToken; tok = lambdaEndToken;
} }
@ -669,7 +669,7 @@ void CheckAutoVariables::errorReturnDanglingLifetime(const Token *tok, const Val
const Token *vartok = val->tokvalue; const Token *vartok = val->tokvalue;
ErrorPath errorPath = val->errorPath; ErrorPath errorPath = val->errorPath;
std::string msg = ""; std::string msg = "";
switch(val->lifetimeKind) { switch (val->lifetimeKind) {
case ValueFlow::Value::Object: case ValueFlow::Value::Object:
msg = "Returning object"; msg = "Returning object";
break; break;
@ -680,11 +680,11 @@ void CheckAutoVariables::errorReturnDanglingLifetime(const Token *tok, const Val
msg = "Returning iterator"; msg = "Returning iterator";
break; break;
} }
if(vartok) { if (vartok) {
errorPath.emplace_back(vartok, "Variable created here."); errorPath.emplace_back(vartok, "Variable created here.");
const Variable * var = vartok->variable(); const Variable * var = vartok->variable();
if(var) { if (var) {
switch(val->lifetimeKind) { switch (val->lifetimeKind) {
case ValueFlow::Value::Object: case ValueFlow::Value::Object:
msg += " that points to local variable"; msg += " that points to local variable";
break; break;

14
lib/checkcondition.cpp
View File

@ -53,10 +53,10 @@ namespace {
bool CheckCondition::diag(const Token* tok, bool insert) bool CheckCondition::diag(const Token* tok, bool insert)
{ {
if(!tok) if (!tok)
return false; return false;
if(mCondDiags.find(tok) == mCondDiags.end()) { if (mCondDiags.find(tok) == mCondDiags.end()) {
if(insert) if (insert)
mCondDiags.insert(tok); mCondDiags.insert(tok);
return false; return false;
} }
@ -717,7 +717,7 @@ static std::string innerSmtString(const Token * tok)
void CheckCondition::oppositeInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath) void CheckCondition::oppositeInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath)
{ {
if(diag(tok1) & diag(tok2)) if (diag(tok1) & diag(tok2))
return; return;
const std::string s1(tok1 ? tok1->expressionString() : "x"); const std::string s1(tok1 ? tok1->expressionString() : "x");
const std::string s2(tok2 ? tok2->expressionString() : "!x"); const std::string s2(tok2 ? tok2->expressionString() : "!x");
@ -732,7 +732,7 @@ void CheckCondition::oppositeInnerConditionError(const Token *tok1, const Token*
void CheckCondition::identicalInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath) void CheckCondition::identicalInnerConditionError(const Token *tok1, const Token* tok2, ErrorPath errorPath)
{ {
if(diag(tok1) & diag(tok2)) if (diag(tok1) & diag(tok2))
return; return;
const std::string s1(tok1 ? tok1->expressionString() : "x"); const std::string s1(tok1 ? tok1->expressionString() : "x");
const std::string s2(tok2 ? tok2->expressionString() : "x"); const std::string s2(tok2 ? tok2->expressionString() : "x");
@ -747,7 +747,7 @@ void CheckCondition::identicalInnerConditionError(const Token *tok1, const Token
void CheckCondition::identicalConditionAfterEarlyExitError(const Token *cond1, const Token* cond2, ErrorPath errorPath) void CheckCondition::identicalConditionAfterEarlyExitError(const Token *cond1, const Token* cond2, ErrorPath errorPath)
{ {
if(diag(cond1) & diag(cond2)) if (diag(cond1) & diag(cond2))
return; return;
const std::string cond(cond1 ? cond1->expressionString() : "x"); const std::string cond(cond1 ? cond1->expressionString() : "x");
errorPath.emplace_back(ErrorPathItem(cond1, "first condition")); errorPath.emplace_back(ErrorPathItem(cond1, "first condition"));
@ -1278,7 +1278,7 @@ void CheckCondition::alwaysTrueFalse()
if (!tok->hasKnownIntValue()) if (!tok->hasKnownIntValue())
continue; continue;
// Skip already diagnosed values // Skip already diagnosed values
if(diag(tok, false)) if (diag(tok, false))
continue; continue;
if (Token::Match(tok, "%num%|%bool%|%char%")) if (Token::Match(tok, "%num%|%bool%|%char%"))
continue; continue;

11
lib/symboldatabase.h
View File

@ -959,16 +959,15 @@ public:
return nullptr; return nullptr;
} }
bool isNestedIn(const Scope * outer) const bool isNestedIn(const Scope * outer) const {
{ if (!outer)
if(!outer)
return false; return false;
if(outer == this) if (outer == this)
return true; return true;
const Scope * parent = nestedIn; const Scope * parent = nestedIn;
while(outer != parent && parent) while (outer != parent && parent)
parent = parent->nestedIn; parent = parent->nestedIn;
if(parent && parent == outer) if (parent && parent == outer)
return true; return true;
return false; return false;
} }

93
lib/valueflow.cpp
View File

@ -1115,35 +1115,35 @@ static void valueFlowTerminatingCondition(TokenList *tokenlist, SymbolDatabase*
continue; continue;
const Token * blockTok = condTok->link()->tokAt(1); const Token * blockTok = condTok->link()->tokAt(1);
// Check if the block terminates early // Check if the block terminates early
if(!isEscapeScope(blockTok, tokenlist)) if (!isEscapeScope(blockTok, tokenlist))
continue; continue;
// Check if any variables are modified in scope // Check if any variables are modified in scope
bool bail = false; bool bail = false;
for(const Token * tok2=condTok->next();tok2 != condTok->link();tok2 = tok2->next()) { for (const Token * tok2=condTok->next(); tok2 != condTok->link(); tok2 = tok2->next()) {
const Variable * var = tok2->variable(); const Variable * var = tok2->variable();
if(!var) if (!var)
continue; continue;
const Token * endToken = var->scope()->bodyEnd; const Token * endToken = var->scope()->bodyEnd;
if(!var->isLocal() && !var->isConst() && !var->isArgument()) { if (!var->isLocal() && !var->isConst() && !var->isArgument()) {
bail = true; bail = true;
break; break;
} }
if(var->isStatic() && !var->isConst()) { if (var->isStatic() && !var->isConst()) {
bail = true; bail = true;
break; break;
} }
if(!var->isConst() && var->declEndToken() && isVariableChanged(var->declEndToken()->next(), endToken, tok2->varId(), false, settings, cpp)) { if (!var->isConst() && var->declEndToken() && isVariableChanged(var->declEndToken()->next(), endToken, tok2->varId(), false, settings, cpp)) {
bail = true; bail = true;
break; break;
} }
} }
if(bail) if (bail)
continue; continue;
// TODO: Handle multiple conditions // TODO: Handle multiple conditions
if(Token::Match(condTok->astOperand2(), "%oror%|%or%|&|&&")) if (Token::Match(condTok->astOperand2(), "%oror%|%or%|&|&&"))
continue; continue;
const Scope * condScope = nullptr; const Scope * condScope = nullptr;
for(const Scope * parent = condTok->scope();parent;parent = parent->nestedIn) { for (const Scope * parent = condTok->scope(); parent; parent = parent->nestedIn) {
if (parent->type == Scope::eIf || if (parent->type == Scope::eIf ||
parent->type == Scope::eWhile || parent->type == Scope::eWhile ||
parent->type == Scope::eSwitch) { parent->type == Scope::eSwitch) {
@ -1154,37 +1154,37 @@ static void valueFlowTerminatingCondition(TokenList *tokenlist, SymbolDatabase*
conds.emplace_back(condTok->astOperand2(), condScope); conds.emplace_back(condTok->astOperand2(), condScope);
} }
for(Condition cond:conds) { for (Condition cond:conds) {
if(!cond.first) if (!cond.first)
continue; continue;
for (Token* tok = cond.first->next(); tok != scope->bodyEnd; tok = tok->next()) { for (Token* tok = cond.first->next(); tok != scope->bodyEnd; tok = tok->next()) {
if(tok == cond.first) if (tok == cond.first)
continue; continue;
if (!Token::Match(tok, "%comp%")) if (!Token::Match(tok, "%comp%"))
continue; continue;
// Skip known values // Skip known values
if (tok->hasKnownValue()) if (tok->hasKnownValue())
continue; continue;
if(cond.second) { if (cond.second) {
bool bail = true; bool bail = true;
for(const Scope * parent = tok->scope()->nestedIn;parent;parent = parent->nestedIn) { for (const Scope * parent = tok->scope()->nestedIn; parent; parent = parent->nestedIn) {
if(parent == cond.second) { if (parent == cond.second) {
bail = false; bail = false;
break; break;
} }
} }
if(bail) if (bail)
continue; continue;
} }
ErrorPath errorPath; ErrorPath errorPath;
if(isOppositeCond(true, cpp, tok, cond.first, settings->library, true, &errorPath)) { if (isOppositeCond(true, cpp, tok, cond.first, settings->library, true, &errorPath)) {
ValueFlow::Value val(1); ValueFlow::Value val(1);
val.setKnown(); val.setKnown();
val.condition = cond.first; val.condition = cond.first;
val.errorPath = errorPath; val.errorPath = errorPath;
val.errorPath.emplace_back(cond.first, "Assuming condition '" + cond.first->expressionString() + "' is false"); val.errorPath.emplace_back(cond.first, "Assuming condition '" + cond.first->expressionString() + "' is false");
setTokenValue(tok, val, tokenlist->getSettings()); setTokenValue(tok, val, tokenlist->getSettings());
} else if(isSameExpression(cpp, true, tok, cond.first, settings->library, true, &errorPath)) { } else if (isSameExpression(cpp, true, tok, cond.first, settings->library, true, &errorPath)) {
ValueFlow::Value val(0); ValueFlow::Value val(0);
val.setKnown(); val.setKnown();
val.condition = cond.first; val.condition = cond.first;
@ -2940,15 +2940,15 @@ static void valueFlowForwardLifetime(Token * tok, TokenList *tokenlist, ErrorLog
static const Variable * getLifetimeVariable(const Token * tok, ErrorPath& errorPath) static const Variable * getLifetimeVariable(const Token * tok, ErrorPath& errorPath)
{ {
const Variable * var = tok->variable(); const Variable * var = tok->variable();
if(!var) if (!var)
return nullptr; return nullptr;
if(var->isReference() || var->isRValueReference()) { if (var->isReference() || var->isRValueReference()) {
for(const ValueFlow::Value& v:tok->values()) { for (const ValueFlow::Value& v:tok->values()) {
if(!v.isLifetimeValue() && !v.tokvalue) if (!v.isLifetimeValue() && !v.tokvalue)
continue; continue;
errorPath.insert(errorPath.end(), v.errorPath.begin(), v.errorPath.end()); errorPath.insert(errorPath.end(), v.errorPath.begin(), v.errorPath.end());
const Variable * var2 = getLifetimeVariable(v.tokvalue, errorPath); const Variable * var2 = getLifetimeVariable(v.tokvalue, errorPath);
if(var2) if (var2)
return var2; return var2;
} }
return nullptr; return nullptr;
@ -2956,23 +2956,21 @@ static const Variable * getLifetimeVariable(const Token * tok, ErrorPath& errorP
return var; return var;
} }
struct Lambda struct Lambda {
{
explicit Lambda(const Token * tok) explicit Lambda(const Token * tok)
: capture(nullptr), arguments(nullptr), returnTok(nullptr), bodyTok(nullptr) : capture(nullptr), arguments(nullptr), returnTok(nullptr), bodyTok(nullptr) {
{ if (!Token::simpleMatch(tok, "[") || !tok->link())
if(!Token::simpleMatch(tok, "[") || !tok->link())
return; return;
capture = tok; capture = tok;
if(Token::simpleMatch(capture->link(), "] (")) { if (Token::simpleMatch(capture->link(), "] (")) {
arguments = capture->link()->next(); arguments = capture->link()->next();
} }
const Token * afterArguments = arguments ? arguments->link()->next() : capture->link()->next(); const Token * afterArguments = arguments ? arguments->link()->next() : capture->link()->next();
if(afterArguments && afterArguments->originalName() == "->") { if (afterArguments && afterArguments->originalName() == "->") {
returnTok = afterArguments->next(); returnTok = afterArguments->next();
bodyTok = Token::findsimplematch(returnTok, "{"); bodyTok = Token::findsimplematch(returnTok, "{");
} else if(Token::simpleMatch(afterArguments, "{")) { } else if (Token::simpleMatch(afterArguments, "{")) {
bodyTok = afterArguments; bodyTok = afterArguments;
} }
} }
@ -2982,8 +2980,7 @@ struct Lambda
const Token * returnTok; const Token * returnTok;
const Token * bodyTok; const Token * bodyTok;
bool isLambda() const bool isLambda() const {
{
return capture && bodyTok; return capture && bodyTok;
} }
}; };
@ -2993,7 +2990,7 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* symboldataba
for (Token *tok = tokenlist->front(); tok; tok = tok->next()) { for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
Lambda lam(tok); Lambda lam(tok);
// Lamdas // Lamdas
if(lam.isLambda()) { if (lam.isLambda()) {
const Scope * bodyScope = lam.bodyTok->scope(); const Scope * bodyScope = lam.bodyTok->scope();
std::set<const Scope *> scopes; std::set<const Scope *> scopes;
@ -3002,16 +2999,16 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* symboldataba
bool captureByRef = Token::Match(lam.capture, "[ & ]"); bool captureByRef = Token::Match(lam.capture, "[ & ]");
bool captureByValue = Token::Match(lam.capture, "[ = ]"); bool captureByValue = Token::Match(lam.capture, "[ = ]");
for(const Token * tok2 = lam.bodyTok;tok2 != lam.bodyTok->link();tok2 = tok2->next()) { for (const Token * tok2 = lam.bodyTok; tok2 != lam.bodyTok->link(); tok2 = tok2->next()) {
ErrorPath errorPath; ErrorPath errorPath;
if(captureByRef) { if (captureByRef) {
const Variable * var = getLifetimeVariable(tok2, errorPath); const Variable * var = getLifetimeVariable(tok2, errorPath);
if(!var) if (!var)
continue; continue;
const Scope * scope = var->scope(); const Scope * scope = var->scope();
if(scopes.count(scope) > 0) if (scopes.count(scope) > 0)
continue; continue;
if(scope->isNestedIn(bodyScope)) if (scope->isNestedIn(bodyScope))
continue; continue;
scopes.insert(scope); scopes.insert(scope);
errorPath.emplace_back(tok2, "Lambda captures variable by reference here."); errorPath.emplace_back(tok2, "Lambda captures variable by reference here.");
@ -3024,19 +3021,19 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* symboldataba
setTokenValue(tok, value, tokenlist->getSettings()); setTokenValue(tok, value, tokenlist->getSettings());
valueFlowForwardLifetime(tok, tokenlist, errorLogger, settings); valueFlowForwardLifetime(tok, tokenlist, errorLogger, settings);
} else if(captureByValue) { } else if (captureByValue) {
for(const ValueFlow::Value& v:tok2->values()) { for (const ValueFlow::Value& v:tok2->values()) {
if(!v.isLifetimeValue() && !v.tokvalue) if (!v.isLifetimeValue() && !v.tokvalue)
continue; continue;
const Token * tok3 = v.tokvalue; const Token * tok3 = v.tokvalue;
errorPath = v.errorPath; errorPath = v.errorPath;
const Variable * var = getLifetimeVariable(tok3, errorPath); const Variable * var = getLifetimeVariable(tok3, errorPath);
if(!var) if (!var)
continue; continue;
const Scope * scope = var->scope(); const Scope * scope = var->scope();
if(scopes.count(scope) > 0) if (scopes.count(scope) > 0)
continue; continue;
if(scope->isNestedIn(bodyScope)) if (scope->isNestedIn(bodyScope))
continue; continue;
scopes.insert(scope); scopes.insert(scope);
errorPath.emplace_back(tok2, "Lambda captures variable by value here."); errorPath.emplace_back(tok2, "Lambda captures variable by value here.");
@ -3067,7 +3064,7 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* symboldataba
break; break;
} }
if(!vartok) if (!vartok)
continue; continue;
const Variable * var = getLifetimeVariable(vartok, errorPath); const Variable * var = getLifetimeVariable(vartok, errorPath);
if (!(var && !var->isPointer())) if (!(var && !var->isPointer()))
@ -3087,12 +3084,12 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* symboldataba
else if (tok->variable() && Token::Match(tok, "%var% . begin|cbegin|rbegin|crbegin|end|cend|rend|crend|data|c_str (")) { else if (tok->variable() && Token::Match(tok, "%var% . begin|cbegin|rbegin|crbegin|end|cend|rend|crend|data|c_str (")) {
ErrorPath errorPath; ErrorPath errorPath;
const Library::Container * container = settings->library.detectContainer(tok->variable()->typeStartToken()); const Library::Container * container = settings->library.detectContainer(tok->variable()->typeStartToken());
if(!container) if (!container)
continue; continue;
const Variable * var = tok->variable(); const Variable * var = tok->variable();
bool isIterator = !Token::Match(tok->tokAt(2), "data|c_str"); bool isIterator = !Token::Match(tok->tokAt(2), "data|c_str");
if(isIterator) if (isIterator)
errorPath.emplace_back(tok, "Iterator to container is created here."); errorPath.emplace_back(tok, "Iterator to container is created here.");
else else
errorPath.emplace_back(tok, "Pointer to container is created here."); errorPath.emplace_back(tok, "Pointer to container is created here.");