Merge pull request #401 from Dmitry-Me/avoidMutuallyExclusiveChecks

Avoid mutually exclusive checks
This commit is contained in:
PKEuS 2014-08-18 13:46:53 +02:00
commit 5cc2e247bb
1 changed files with 2 additions and 3 deletions

View File

@ -412,13 +412,12 @@ void ExecutionPath::checkScope(const Token *tok, std::list<ExecutionPath *> &che
// parse next "if".. // parse next "if"..
tok = tok->tokAt(2); tok = tok->tokAt(2);
if (tok && tok->str() == "if")
continue;
if (!tok) { if (!tok) {
ExecutionPath::bailOut(newchecks); ExecutionPath::bailOut(newchecks);
return; return;
} }
if (tok->str() == "if")
continue;
// there is no "if".. // there is no "if"..
ExecutionPath::checkScope(tok->next(), checks); ExecutionPath::checkScope(tok->next(), checks);