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

Verification; Better handling of assignment in while

This commit is contained in:
Daniel Marjamäki 2019-12-31 20:31:31 +01:00
parent 446256a503
commit 043634be27
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/exprengine.cpp
View File

@ -1571,7 +1571,7 @@ static void execute(const Token *start, const Token *end, Data &data)
if (changedVariables.find(varid) != changedVariables.end()) if (changedVariables.find(varid) != changedVariables.end())
continue; continue;
changedVariables.insert(varid); changedVariables.insert(varid);
data.assignValue(tok2, varid, createVariableValue(*vartok->variable(), data)); data.assignValue(tok2, varid, getValueRangeFromValueType(data.getNewSymbolName(), vartok->valueType(), *data.settings));
} }
} }
} }

20
test/testexprengine.cpp
View File

@ -318,9 +318,9 @@ private:
" x = x + 34;\n" " x = x + 34;\n"
" x == 340;\n" " x == 340;\n"
"}"; "}";
ASSERT_EQUALS("(declare-fun $2 () Int)\n" ASSERT_EQUALS("(declare-fun $4 () Int)\n"
"(assert (and (>= $2 (- 2147483648)) (<= $2 2147483647)))\n" "(assert (and (>= $4 (- 2147483648)) (<= $4 2147483647)))\n"
"(assert (= (+ $2 34) 340))\n" "(assert (= (+ $4 34) 340))\n"
"z3::sat", "z3::sat",
expr(code, "==")); expr(code, "=="));
} }
@ -446,19 +446,19 @@ private:
void pointer1() { void pointer1() {
const char code[] = "void f(unsigned char *p) { return *p == 7; }"; const char code[] = "void f(unsigned char *p) { return *p == 7; }";
ASSERT_EQUALS("size=$1,[:]=$2,null,->?", getRange(code, "p")); ASSERT_EQUALS("size=$1,[:]=?,null", getRange(code, "p"));
ASSERT_EQUALS("(declare-fun |$2:0| () Int)\n" ASSERT_EQUALS("(declare-fun $3 () Int)\n"
"(assert (and (>= |$2:0| 0) (<= |$2:0| 255)))\n" "(assert (and (>= $3 0) (<= $3 255)))\n"
"(assert (= |$2:0| 7))\n" "(assert (= $3 7))\n"
"z3::sat", "z3::sat",
expr(code, "==")); expr(code, "=="));
} }
void pointer2() { void pointer2() {
const char code[] = "void f(unsigned char *p) { return p[2] == 7; }"; const char code[] = "void f(unsigned char *p) { return p[2] == 7; }";
ASSERT_EQUALS("(declare-fun |$2:2| () Int)\n" ASSERT_EQUALS("(declare-fun $3 () Int)\n"
"(assert (and (>= |$2:2| 0) (<= |$2:2| 255)))\n" "(assert (and (>= $3 0) (<= $3 255)))\n"
"(assert (= |$2:2| 7))\n" "(assert (= $3 7))\n"
"z3::sat", "z3::sat",
expr(code, "==")); expr(code, "=="));
} }