danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Improve clause resolution in while loops

Browse Source
This commit is contained in:
Matthew Brown 2017-01-31 01:30:11 -05:00
parent 965a79251d
commit 7f8a3d798e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Psalm/Checker/Statements/Block/WhileChecker.php
View File

@ -29,12 +29,18 @@ class WhileChecker
return false;
}
$while_types = AssertionFinder::getAssertions(
$while_clauses = TypeChecker::getFormula(
$stmt->cond,
$statements_checker->getFQCLN(),
$context->self,
$statements_checker
);
$while_context->clauses = TypeChecker::simplifyCNF(array_merge($context->clauses, $while_clauses));
$negated_clauses = TypeChecker::negateFormula($while_clauses);
$reconcilable_while_types = TypeChecker::getTruthsFromFormula($while_context->clauses);
// if the while has an or as the main component, we cannot safely reason about it
if ($stmt->cond instanceof PhpParser\Node\Expr\BinaryOp &&
$stmt->cond instanceof PhpParser\Node\Expr\BinaryOp\BooleanOr
@ -44,7 +50,7 @@ class WhileChecker
$changed_vars = [];
$while_vars_in_scope_reconciled = TypeChecker::reconcileKeyedTypes(
$while_types,
$reconcilable_while_types,
$while_context->vars_in_scope,
$changed_vars,
$statements_checker->getFileChecker(),