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

Fixed #5084 (False positive: (style) Same expression on both sides of '&&')

This commit is contained in:
Daniel Marjamäki 2013-10-19 18:04:53 +02:00
parent 6aa03efa2f
commit 5d7e0aebf4
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/checkother.cpp
View File

@ -3063,6 +3063,9 @@ void CheckOther::complexDuplicateExpressionCheck(const std::list<const Function*
start = tok1;
break;
}
if (tok1->isExpandedMacro())
break;
}
const Token *end = 0;
level = 0;
@ -3077,8 +3080,13 @@ void CheckOther::complexDuplicateExpressionCheck(const std::list<const Function*
end = tok1;
break;
}
if (tok1->isExpandedMacro())
break;
}
checkExpressionRange(constFunctions, start, end, toCheck);
if (start && end)
checkExpressionRange(constFunctions, start, end, toCheck);
}
}

2
lib/tokenize.cpp
View File

@ -5957,12 +5957,14 @@ void Tokenizer::simplifyIfNotNull()
else if (Token::Match(tok, "%var% != 0")) {
deleteFrom = tok;
tok->isPointerCompare(true);
tok->isExpandedMacro(tok->isExpandedMacro() || tok->tokAt(2)->isExpandedMacro());
}
else if (Token::Match(tok, "%var% .|:: %var% != 0")) {
tok = tok->tokAt(2);
deleteFrom = tok;
tok->isPointerCompare(true);
tok->isExpandedMacro(tok->isExpandedMacro() || tok->tokAt(2)->isExpandedMacro());
}
}

8
test/testother.cpp
View File

@ -126,6 +126,7 @@ private:
TEST_CASE(incorrectLogicOperator1);
TEST_CASE(incorrectLogicOperator2);
TEST_CASE(incorrectLogicOperator3);
TEST_CASE(incorrectLogicOperator4);
TEST_CASE(secondAlwaysTrueFalseWhenFirstTrueError);
TEST_CASE(incorrectLogicOp_condSwapping);
TEST_CASE(sameExpression);
@ -3982,6 +3983,13 @@ private:
"[test.cpp:5]: (warning) Logical conjunction always evaluates to false: x <= 1 && x == 3.\n", errout.str());
}
void incorrectLogicOperator4() {
check("void f(int x) {\n"
" if (x && x != $0) {}\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void secondAlwaysTrueFalseWhenFirstTrueError() {
check("void f(int x) {\n"
" if (x > 5 && x != 1)\n"