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 2021-04-04 18:20:32 +02:00
parent 6397e29f84
commit 44f914eaee
4 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/token.cpp
View File

@ -2030,11 +2030,15 @@ static ValueIterator removeAdjacentValues(std::list<ValueFlow::Value>& values, V
{
if (!isAdjacent(*x, **start))
return std::next(x);
auto it = std::adjacent_find(start, last, [](ValueIterator x, ValueIterator y) { return !isAdjacent(*x, *y); });
auto it = std::adjacent_find(start, last, [](ValueIterator x, ValueIterator y) {
return !isAdjacent(*x, *y);
});
if (it == last)
it--;
(*it)->bound = x->bound;
std::for_each(start, it, [&](ValueIterator y) { values.erase(y); });
std::for_each(start, it, [&](ValueIterator y) {
values.erase(y);
});
return values.erase(x);
}

20
lib/valueflow.cpp
View File

@ -374,7 +374,9 @@ static bool isZero(T x)
template <class R, class T>
static R calculate(const std::string& s, const T& x, const T& y)
{
auto wrap = [](T z) { return R{z}; };
auto wrap = [](T z) {
return R{z};
};
switch (MathLib::encodeMultiChar(s)) {
case '+':
return wrap(x + y);
@ -383,9 +385,11 @@ static R calculate(const std::string& s, const T& x, const T& y)
case '*':
return wrap(x * y);
case '/':
return isZero(y) ? R{} : wrap(x / y);
return isZero(y) ? R{} :
wrap(x / y);
case '%':
return isZero(y) ? R{} : wrap(MathLib::bigint(x) % MathLib::bigint(y));
return isZero(y) ? R{} :
wrap(MathLib::bigint(x) % MathLib::bigint(y));
case '&':
return wrap(MathLib::bigint(x) & MathLib::bigint(y));
case '|':
@ -397,9 +401,11 @@ static R calculate(const std::string& s, const T& x, const T& y)
case '<':
return wrap(x < y);
case '<<':
return (y >= sizeof(MathLib::bigint) * 8) ? R{} : wrap(MathLib::bigint(x) << MathLib::bigint(y));
return (y >= sizeof(MathLib::bigint) * 8) ? R{} :
wrap(MathLib::bigint(x) << MathLib::bigint(y));
case '>>':
return (y >= sizeof(MathLib::bigint) * 8) ? R{} : wrap(MathLib::bigint(x) >> MathLib::bigint(y));
return (y >= sizeof(MathLib::bigint) * 8) ? R{} :
wrap(MathLib::bigint(x) >> MathLib::bigint(y));
case '&&':
return wrap(!isZero(x) && !isZero(y));
case '||':
@ -4729,8 +4735,8 @@ ValueFlow::Value inferCondition(const std::string& op, const Token* varTok, Math
if (varTok->hasKnownIntValue())
return ValueFlow::Value{};
if (std::none_of(varTok->values().begin(), varTok->values().end(), [](const ValueFlow::Value& v) {
return v.isImpossible() && v.valueType == ValueFlow::Value::ValueType::INT;
})) {
return v.isImpossible() && v.valueType == ValueFlow::Value::ValueType::INT;
})) {
return ValueFlow::Value{};
}
const ValueFlow::Value* result = nullptr;

15
lib/valueflow.h
View File

@ -57,16 +57,14 @@ namespace ValueFlow {
struct less {
template <class T, class U>
bool operator()(const T& x, const U& y) const
{
bool operator()(const T& x, const U& y) const {
return x < y;
}
};
struct adjacent {
template <class T, class U>
bool operator()(const T& x, const U& y) const
{
bool operator()(const T& x, const U& y) const {
return std::abs(x - y) == 1;
}
};
@ -163,22 +161,19 @@ namespace ValueFlow {
struct compareVisitor {
struct innerVisitor {
template <class Compare, class T, class U>
void operator()(bool& result, Compare compare, T x, U y) const
{
void operator()(bool& result, Compare compare, T x, U y) const {
result = compare(x, y);
}
};
template <class Compare, class T>
void operator()(bool& result, const Value& rhs, Compare compare, T x) const
{
void operator()(bool& result, const Value& rhs, Compare compare, T x) const {
visitValue(rhs,
std::bind(innerVisitor{}, std::ref(result), std::move(compare), x, std::placeholders::_1));
}
};
template <class Compare>
bool compareValue(const Value& rhs, Compare compare) const
{
bool compareValue(const Value& rhs, Compare compare) const {
bool result = false;
visitValue(
*this,

4
test/testvalueflow.cpp
View File

@ -5225,7 +5225,9 @@ private:
" return x + 0;\n"
"}";
values = tokenValues(code, "+", &s);
values.remove_if([](const ValueFlow::Value& v) { return v.isImpossible(); });
values.remove_if([](const ValueFlow::Value& v) {
return v.isImpossible();
});
ASSERT_EQUALS(2, values.size());
ASSERT_EQUALS(0, values.front().intvalue);
ASSERT_EQUALS(100, values.back().intvalue);