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

Clarify expressions with parentheses

This commit is contained in:
Dmitry-Me 2017-10-18 23:40:43 +03:00
parent e356ccca22
commit 8709490903
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/valueflow.cpp
View File

@ -481,9 +481,9 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value, const Setti
if (!f && !value1->isIntValue() && !value2->isIntValue()) if (!f && !value1->isIntValue() && !value2->isIntValue())
break; break;
if (parent->str() == ">") if (parent->str() == ">")
result.intvalue = f ? floatValue1 > floatValue2 : value1->intvalue > value2->intvalue; result.intvalue = f ? (floatValue1 > floatValue2) : (value1->intvalue > value2->intvalue);
else if (parent->str() == ">=") else if (parent->str() == ">=")
result.intvalue = f ? floatValue1 >= floatValue2 : value1->intvalue >= value2->intvalue; result.intvalue = f ? (floatValue1 >= floatValue2) : (value1->intvalue >= value2->intvalue);
else if (!f && parent->str() == ">>" && value1->intvalue >= 0 && value2->intvalue >= 0 && value2->intvalue < 64) else if (!f && parent->str() == ">>" && value1->intvalue >= 0 && value2->intvalue >= 0 && value2->intvalue < 64)
result.intvalue = value1->intvalue >> value2->intvalue; result.intvalue = value1->intvalue >> value2->intvalue;
else else
@ -496,9 +496,9 @@ static void setTokenValue(Token* tok, const ValueFlow::Value &value, const Setti
if (!f && !value1->isIntValue() && !value2->isIntValue()) if (!f && !value1->isIntValue() && !value2->isIntValue())
break; break;
if (parent->str() == "<") if (parent->str() == "<")
result.intvalue = f ? floatValue1 < floatValue2 : value1->intvalue < value2->intvalue; result.intvalue = f ? (floatValue1 < floatValue2) : (value1->intvalue < value2->intvalue);
else if (parent->str() == "<=") else if (parent->str() == "<=")
result.intvalue = f ? floatValue1 <= floatValue2 : value1->intvalue <= value2->intvalue; result.intvalue = f ? (floatValue1 <= floatValue2) : (value1->intvalue <= value2->intvalue);
else if (!f && parent->str() == "<<" && value1->intvalue >= 0 && value2->intvalue >= 0 && value2->intvalue < 64) else if (!f && parent->str() == "<<" && value1->intvalue >= 0 && value2->intvalue >= 0 && value2->intvalue < 64)
result.intvalue = value1->intvalue << value2->intvalue; result.intvalue = value1->intvalue << value2->intvalue;
else else