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

CheckUninitVar: Small logical fixes in conditions handling.

This commit is contained in:
Daniel Marjamäki 2015-11-21 08:32:25 +01:00
parent 12af125fd3
commit d301cf28ec
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/checkuninitvar.cpp
View File

@ -248,14 +248,9 @@ static void conditionAlwaysTrueOrFalse(const Token *tok, const std::map<unsigned
conditionAlwaysTrueOrFalse(tok->astOperand1(), variableValue, &t1, &f1); conditionAlwaysTrueOrFalse(tok->astOperand1(), variableValue, &t1, &f1);
bool t2=false, f2=false; bool t2=false, f2=false;
if (!t1) if (!t1)
conditionAlwaysTrueOrFalse(tok->astOperand1(), variableValue, &t2, &f2); conditionAlwaysTrueOrFalse(tok->astOperand2(), variableValue, &t2, &f2);
if (t1 || t2) { *alwaysTrue = (t1 || t2);
*alwaysTrue = true; *alwaysFalse = (f1 && f2);
*alwaysFalse = false;
} else if (f1 && f2) {
*alwaysTrue = false;
*alwaysFalse = true;
}
} }
else if (tok->str() == "&&") { else if (tok->str() == "&&") {
@ -263,14 +258,9 @@ static void conditionAlwaysTrueOrFalse(const Token *tok, const std::map<unsigned
conditionAlwaysTrueOrFalse(tok->astOperand1(), variableValue, &t1, &f1); conditionAlwaysTrueOrFalse(tok->astOperand1(), variableValue, &t1, &f1);
bool t2=false, f2=false; bool t2=false, f2=false;
if (!f1) if (!f1)
conditionAlwaysTrueOrFalse(tok->astOperand1(), variableValue, &t2, &f2); conditionAlwaysTrueOrFalse(tok->astOperand2(), variableValue, &t2, &f2);
if (t1 && t2) { *alwaysTrue = (t1 && t2);
*alwaysTrue = true; *alwaysFalse = (f1 || f2);
*alwaysFalse = false;
} else if (f1 && f2) {
*alwaysTrue = false;
*alwaysFalse = true;
}
} }
} }