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

Running astyle [ci skip]

This commit is contained in:
orbitcowboy 2020-03-01 20:39:00 +01:00
parent ea742267c6
commit 85a26802e3
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/valueflow.cpp
View File

@ -4560,9 +4560,8 @@ struct MultiValueFlowForwardAnalyzer : ValueFlowForwardAnalyzer {
{} {}
MultiValueFlowForwardAnalyzer(const std::unordered_map<const Variable*, ValueFlow::Value>& args, const TokenList* t) MultiValueFlowForwardAnalyzer(const std::unordered_map<const Variable*, ValueFlow::Value>& args, const TokenList* t)
: ValueFlowForwardAnalyzer(t), values(), vars() : ValueFlowForwardAnalyzer(t), values(), vars() {
{ for (const auto& p:args) {
for(const auto& p:args) {
values[p.first->declarationId()] = p.second; values[p.first->declarationId()] = p.second;
vars[p.first->declarationId()] = p.first; vars[p.first->declarationId()] = p.first;
} }
@ -4590,13 +4589,13 @@ struct MultiValueFlowForwardAnalyzer : ValueFlowForwardAnalyzer {
} }
virtual void makeConditional() OVERRIDE { virtual void makeConditional() OVERRIDE {
for(auto&& p:values) { for (auto&& p:values) {
p.second.conditional = true; p.second.conditional = true;
} }
} }
virtual void addErrorPath(const Token* tok, const std::string& s) OVERRIDE { virtual void addErrorPath(const Token* tok, const std::string& s) OVERRIDE {
for(auto&& p:values) { for (auto&& p:values) {
p.second.errorPath.emplace_back(tok, "Assuming condition is " + s); p.second.errorPath.emplace_back(tok, "Assuming condition is " + s);
} }
} }
@ -4620,7 +4619,7 @@ struct MultiValueFlowForwardAnalyzer : ValueFlowForwardAnalyzer {
} }
virtual bool lowerToPossible() OVERRIDE { virtual bool lowerToPossible() OVERRIDE {
for(auto&& p:values) { for (auto&& p:values) {
if (p.second.isImpossible()) if (p.second.isImpossible())
return false; return false;
p.second.changeKnownToPossible(); p.second.changeKnownToPossible();
@ -4628,7 +4627,7 @@ struct MultiValueFlowForwardAnalyzer : ValueFlowForwardAnalyzer {
return true; return true;
} }
virtual bool lowerToInconclusive() OVERRIDE { virtual bool lowerToInconclusive() OVERRIDE {
for(auto&& p:values) { for (auto&& p:values) {
if (p.second.isImpossible()) if (p.second.isImpossible())
return false; return false;
p.second.setInconclusive(); p.second.setInconclusive();
@ -4637,7 +4636,7 @@ struct MultiValueFlowForwardAnalyzer : ValueFlowForwardAnalyzer {
} }
virtual bool isConditional() const OVERRIDE { virtual bool isConditional() const OVERRIDE {
for(auto&& p:values) { for (auto&& p:values) {
if (p.second.conditional) if (p.second.conditional)
return true; return true;
if (p.second.condition) if (p.second.condition)
@ -4651,7 +4650,7 @@ struct MultiValueFlowForwardAnalyzer : ValueFlowForwardAnalyzer {
if (!scope) if (!scope)
return false; return false;
if (scope->type == Scope::eLambda) { if (scope->type == Scope::eLambda) {
for(const auto& p:values) { for (const auto& p:values) {
if (!p.second.isLifetimeValue()) if (!p.second.isLifetimeValue())
return false; return false;
} }
@ -4686,7 +4685,7 @@ struct MultiValueFlowForwardAnalyzer : ValueFlowForwardAnalyzer {
virtual ProgramState getProgramState() const OVERRIDE { virtual ProgramState getProgramState() const OVERRIDE {
ProgramState ps; ProgramState ps;
for(const auto& p:values) for (const auto& p:values)
ps[p.first] = p.second; ps[p.first] = p.second;
return ps; return ps;
} }
@ -4697,15 +4696,15 @@ static void valueFlowInjectParameter(TokenList* tokenlist, ErrorLogger* errorLog
using Args = std::vector<std::unordered_map<const Variable*, ValueFlow::Value>>; using Args = std::vector<std::unordered_map<const Variable*, ValueFlow::Value>>;
Args args(1); Args args(1);
// Compute cartesian product of all arguments // Compute cartesian product of all arguments
for(const auto& p:vars) { for (const auto& p:vars) {
if (p.second.empty()) if (p.second.empty())
continue; continue;
args.back()[p.first] = p.second.front(); args.back()[p.first] = p.second.front();
} }
for(const auto& p:vars) { for (const auto& p:vars) {
std::for_each(std::next(p.second.begin()), p.second.end(), [&](const ValueFlow::Value& value) { std::for_each(std::next(p.second.begin()), p.second.end(), [&](const ValueFlow::Value& value) {
Args new_args; Args new_args;
for(auto arg:args) { for (auto arg:args) {
arg[p.first] = value; arg[p.first] = value;
new_args.push_back(arg); new_args.push_back(arg);
} }
@ -4713,13 +4712,13 @@ static void valueFlowInjectParameter(TokenList* tokenlist, ErrorLogger* errorLog
}); });
} }
for(const auto& arg:args) { for (const auto& arg:args) {
if (arg.empty()) if (arg.empty())
continue; continue;
bool skip = false; bool skip = false;
// Make sure all arguments are the same path // Make sure all arguments are the same path
MathLib::bigint path = arg.begin()->second.path; MathLib::bigint path = arg.begin()->second.path;
for(const auto& p:arg) { for (const auto& p:arg) {
if (p.second.path != path) { if (p.second.path != path) {
skip = true; skip = true;
break; break;