VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

More Flow cleanups.

Browse Source
This commit is contained in:
Dave Halter
2017-04-10 10:05:21 +02:00
parent 218e715553
commit 797953df39
3 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jedi/evaluate/flow_analysis.py
View File

@@ -1,3 +1,4 @@
from jedi.parser_utils import get_flow_branch_keyword
class Status(object):
lookup_table = {}
@@ -46,8 +47,8 @@ def reachability_check(context, context_scope, node, origin_scope=None):
branch_matches = True
for flow_scope in origin_flow_scopes:
if flow_scope in node_flow_scopes:
node_keyword = flow_scope.get_branch_keyword(node)
origin_keyword = flow_scope.get_branch_keyword(origin_scope)
node_keyword = get_flow_branch_keyword(flow_scope, node)
origin_keyword = get_flow_branch_keyword(flow_scope, origin_scope)
branch_matches = node_keyword == origin_keyword
if flow_scope.type == 'if_stmt':
if not branch_matches:
@@ -76,8 +77,8 @@ def reachability_check(context, context_scope, node, origin_scope=None):
def _break_check(context, context_scope, flow_scope, node):
reachable = REACHABLE
if flow_scope.type == 'if_stmt':
if flow_scope.node_after_else(node):
for check_node in flow_scope.check_nodes():
if flow_scope.is_node_after_else(node):
for check_node in flow_scope.get_check_nodes():
reachable = _check_if(context, check_node)
if reachable in (REACHABLE, UNSURE):
break