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 2019-10-30 17:58:19 +01:00
parent 816aa7e211
commit 8c591308cb
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/programmemory.cpp
View File

@ -5,11 +5,13 @@
#include "symboldatabase.h"
#include <cassert>
void ProgramMemory::setValue(nonneg int varid, const ValueFlow::Value &value) {
void ProgramMemory::setValue(nonneg int varid, const ValueFlow::Value &value)
{
values[varid] = value;
}
bool ProgramMemory::getIntValue(nonneg int varid, MathLib::bigint* result) const {
bool ProgramMemory::getIntValue(nonneg int varid, MathLib::bigint* result) const
{
const std::map<int, ValueFlow::Value>::const_iterator it = values.find(varid);
const bool found = it != values.end() && it->second.isIntValue();
if (found)
@ -17,11 +19,13 @@ bool ProgramMemory::getIntValue(nonneg int varid, MathLib::bigint* result) const
return found;
}
void ProgramMemory::setIntValue(nonneg int varid, MathLib::bigint value) {
void ProgramMemory::setIntValue(nonneg int varid, MathLib::bigint value)
{
values[varid] = ValueFlow::Value(value);
}
bool ProgramMemory::getTokValue(nonneg int varid, const Token** result) const {
bool ProgramMemory::getTokValue(nonneg int varid, const Token** result) const
{
const std::map<int, ValueFlow::Value>::const_iterator it = values.find(varid);
const bool found = it != values.end() && it->second.isTokValue();
if (found)
@ -29,28 +33,34 @@ bool ProgramMemory::getTokValue(nonneg int varid, const Token** result) const {
return found;
}
bool ProgramMemory::hasValue(nonneg int varid) {
bool ProgramMemory::hasValue(nonneg int varid)
{
return values.find(varid) != values.end();
}
void ProgramMemory::swap(ProgramMemory &pm) {
void ProgramMemory::swap(ProgramMemory &pm)
{
values.swap(pm.values);
}
void ProgramMemory::clear() {
void ProgramMemory::clear()
{
values.clear();
}
bool ProgramMemory::empty() const {
bool ProgramMemory::empty() const
{
return values.empty();
}
void ProgramMemory::replace(const ProgramMemory &pm) {
void ProgramMemory::replace(const ProgramMemory &pm)
{
for (auto&& p:pm.values)
values[p.first] = p.second;
}
void ProgramMemory::insert(const ProgramMemory &pm) {
void ProgramMemory::insert(const ProgramMemory &pm)
{
for (auto&& p:pm.values)
values.insert(p);
}
@ -220,9 +230,9 @@ ProgramMemory getProgramMemory(const Token *tok, nonneg int varid, const ValueFl
}
void execute(const Token *expr,
ProgramMemory * const programMemory,
MathLib::bigint *result,
bool *error)
ProgramMemory * const programMemory,
MathLib::bigint *result,
bool *error)
{
if (!expr)
*error = true;

6
lib/programmemory.h
View File

@ -30,9 +30,9 @@ struct ProgramMemory {
};
void execute(const Token *expr,
ProgramMemory * const programMemory,
MathLib::bigint *result,
bool *error);
ProgramMemory * const programMemory,
MathLib::bigint *result,
bool *error);
/**
* Is condition always false when variable has given value?

2
test/testtokenize.cpp
View File

@ -7620,7 +7620,7 @@ private:
" a=b;\n"
" }\n"
"}"));
// daca@home hang
ASSERT_EQUALS("a{([= 0return b{([= fori0=i10!=i++;;(",
testAst("a = [&]() -> std::pair<int, int> { return 0; };\n"