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

ExprEngine; Improved handling of for loop, loop variable

This commit is contained in:
Daniel Marjamäki 2020-06-28 17:28:40 +02:00
parent c42c751d61
commit d4bd3016da
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/exprengine.cpp
View File

@ -1629,7 +1629,16 @@ static void assignExprValue(const Token *expr, ExprEngine::ValuePtr value, Data
arrayValue->assign(ExprEngine::ValuePtr(), value);
} else {
auto indexValue = calculateArrayIndex(expr, data, *arrayValue);
arrayValue->assign(indexValue, value);
bool loopAssign = false;
if (auto loopValue = std::dynamic_pointer_cast<ExprEngine::IntRange>(indexValue)) {
if (loopValue->loopScope == expr->scope()) {
loopAssign = true;
for (auto i = loopValue->minValue; i <= loopValue->maxValue; ++i)
arrayValue->assign(std::make_shared<ExprEngine::IntRange>(ExprEngine::str(i), i, i), value);
}
}
if (!loopAssign)
arrayValue->assign(indexValue, value);
}
}
} else if (expr->isUnaryOp("*")) {
@ -2355,6 +2364,7 @@ static std::string execute(const Token *start, const Token *end, Data &data)
auto loopValues = std::make_shared<ExprEngine::IntRange>(data.getNewSymbolName(), initValue, lastValue);
data.assignValue(tok, varid, loopValues);
tok = tok->linkAt(1);
loopValues->loopScope = tok->next()->scope();
continue;
}
}

4
lib/exprengine.h
View File

@ -143,7 +143,8 @@ namespace ExprEngine {
IntRange(const std::string &name, int128_t minValue, int128_t maxValue)
: Value(name, ValueType::IntRange)
, minValue(minValue)
, maxValue(maxValue) {
, maxValue(maxValue)
, loopScope(nullptr) {
}
std::string getRange() const OVERRIDE {
if (minValue == maxValue)
@ -156,6 +157,7 @@ namespace ExprEngine {
int128_t minValue;
int128_t maxValue;
const Scope *loopScope;
};
class FloatRange : public Value {

5
test/testexprengine.cpp
View File

@ -490,9 +490,8 @@ private:
" for (int i = 0; i < 10; i++) x[i] = 0;\n"
" x[4] == 67;\n"
"}";
ASSERT_EQUALS("(and (>= $3 (- 2147483648)) (<= $3 2147483647))\n"
"(= $3 67)\n"
"z3::sat\n",
ASSERT_EQUALS("(= 0 67)\n"
"z3::unsat\n",
expr(code, "=="));
}