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

ExprEngine: Rename Data::conditions => Data::constraints

This commit is contained in:
Daniel Marjamäki 2019-10-03 08:48:05 +02:00
parent d916379f9f
commit b79283306f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/exprengine.cpp
View File

@ -121,7 +121,7 @@ namespace {
int * const symbolValueIndex; int * const symbolValueIndex;
const Tokenizer * const tokenizer; const Tokenizer * const tokenizer;
const std::vector<ExprEngine::Callback> &callbacks; const std::vector<ExprEngine::Callback> &callbacks;
std::vector<ExprEngine::ValuePtr> conditions; std::vector<ExprEngine::ValuePtr> constraints;
void assignValue(const Token *tok, unsigned int varId, ExprEngine::ValuePtr value) { void assignValue(const Token *tok, unsigned int varId, ExprEngine::ValuePtr value) {
mTrackExecution->symbolRange(tok, value); mTrackExecution->symbolRange(tok, value);
@ -217,11 +217,11 @@ namespace {
return std::make_shared<ExprEngine::BinOpResult>("==", v, zero); return std::make_shared<ExprEngine::BinOpResult>("==", v, zero);
} }
void addCondition(ExprEngine::ValuePtr condValue, bool trueCond) { void addConstraint(ExprEngine::ValuePtr condValue, bool trueCond) {
if (trueCond) if (trueCond)
conditions.push_back(condValue); constraints.push_back(condValue);
else else
conditions.push_back(notValue(condValue)); constraints.push_back(notValue(condValue));
} }
private: private:
TrackExecution * const mTrackExecution; TrackExecution * const mTrackExecution;
@ -564,8 +564,8 @@ bool ExprEngine::BinOpResult::isIntValueInRange(ExprEngine::DataBase *dataBase,
z3::solver solver(exprData.c); z3::solver solver(exprData.c);
z3::expr e = ::getExpr(this, exprData); z3::expr e = ::getExpr(this, exprData);
exprData.addAssertions(solver); exprData.addAssertions(solver);
for (auto condition : dynamic_cast<const Data *>(dataBase)->conditions) for (auto constraint : dynamic_cast<const Data *>(dataBase)->constraints)
solver.add(::getExpr(condition, exprData)); solver.add(::getExpr(constraint, exprData));
solver.add(e == value); solver.add(e == value);
return solver.check() == z3::sat; return solver.check() == z3::sat;
#else #else
@ -582,8 +582,8 @@ std::string ExprEngine::BinOpResult::getExpr(ExprEngine::DataBase *dataBase) con
z3::solver solver(exprData.c); z3::solver solver(exprData.c);
z3::expr e = ::getExpr(this, exprData); z3::expr e = ::getExpr(this, exprData);
exprData.addAssertions(solver); exprData.addAssertions(solver);
for (auto condition : dynamic_cast<const Data *>(dataBase)->conditions) for (auto constraint : dynamic_cast<const Data *>(dataBase)->constraints)
solver.add(::getExpr(condition, exprData)); solver.add(::getExpr(constraint, exprData));
solver.add(e); solver.add(e);
std::ostringstream os; std::ostringstream os;
os << solver; os << solver;
@ -1027,8 +1027,8 @@ static void execute(const Token *start, const Token *end, Data &data)
const ExprEngine::ValuePtr condValue = executeExpression(cond, data); const ExprEngine::ValuePtr condValue = executeExpression(cond, data);
Data ifData(data); Data ifData(data);
Data elseData(data); Data elseData(data);
ifData.addCondition(condValue, true); ifData.addConstraint(condValue, true);
elseData.addCondition(condValue, false); elseData.addConstraint(condValue, false);
const Token *thenStart = tok->linkAt(1)->next(); const Token *thenStart = tok->linkAt(1)->next();
const Token *thenEnd = thenStart->link(); const Token *thenEnd = thenStart->link();