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

ValueFlow: set values for false/true

This commit is contained in:
Daniel Marjamäki 2015-07-14 18:02:26 +02:00
parent fa03a93f89
commit 405a1fba11
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/valueflow.cpp
View File

@ -455,6 +455,13 @@ static void valueFlowNumber(TokenList *tokenlist)
if (tok->isNumber() && MathLib::isInt(tok->str())) if (tok->isNumber() && MathLib::isInt(tok->str()))
setTokenValue(tok, ValueFlow::Value(MathLib::toLongNumber(tok->str()))); setTokenValue(tok, ValueFlow::Value(MathLib::toLongNumber(tok->str())));
} }
if (tokenlist->isCPP()) {
for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
if (tok->isName() && !tok->varId() && Token::Match(tok, "false|true"))
setTokenValue(tok, ValueFlow::Value(tok->str() == "true"));
}
}
} }
static void valueFlowString(TokenList *tokenlist) static void valueFlowString(TokenList *tokenlist)

9
test/testvalueflow.cpp
View File

@ -151,12 +151,9 @@ private:
} }
void valueFlowNumber() { void valueFlowNumber() {
const char *code; ASSERT_EQUALS(123, valueOfTok("x=123;", "123").intvalue);
ASSERT_EQUALS(0, valueOfTok("x=false;", "false").intvalue);
code = "void f() {\n" ASSERT_EQUALS(1, valueOfTok("x=true;", "true").intvalue);
" x = 123;\n"
"}";
ASSERT_EQUALS(123, valueOfTok(code, "123").intvalue);
} }
void valueFlowString() { void valueFlowString() {