VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-05-20 07:19:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small improvments to the += / for logic.

Browse Source
This commit is contained in:
Dave Halter
2015-10-15 03:24:21 +02:00
parent 4b85d342ea
commit e947124d83
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/__init__.py
+6 -6
View File
@@ -134,7 +134,8 @@ class Evaluator(object):
:param stmt: A `tree.ExprStmt`. :param stmt: A `tree.ExprStmt`.
""" """
debug.dbg('eval_statement %s (%s)', stmt, seek_name) debug.dbg('eval_statement %s (%s)', stmt, seek_name)
types = self.eval_element(stmt.get_rhs()) rhs = stmt.get_rhs()
types = self.eval_element(rhs)
if seek_name: if seek_name:
types = finder.check_tuple_assignments(types, seek_name) types = finder.check_tuple_assignments(types, seek_name)
@@ -150,8 +151,7 @@ class Evaluator(object):
for_stmt = stmt.get_parent_until(tree.ForStmt) for_stmt = stmt.get_parent_until(tree.ForStmt)
if isinstance(for_stmt, tree.ForStmt) and types \ if isinstance(for_stmt, tree.ForStmt) and types \
and isinstance(for_stmt.children[1], tree.Name) \ and isinstance(for_stmt.children[1], tree.Name):
and self.predefined_if_name_dict_dict.get(for_stmt) is None:
# Iterate through result and add the values, that's possible # Iterate through result and add the values, that's possible
# only in for loops without clutter, because they are # only in for loops without clutter, because they are
# predictable. Also only do it, if the variable is not a tuple. # predictable. Also only do it, if the variable is not a tuple.
@@ -159,9 +159,9 @@ class Evaluator(object):
ordered = iterable.ordered_elements_of_iterable(self, for_iterable, types) ordered = iterable.ordered_elements_of_iterable(self, for_iterable, types)
for index_types in ordered: for index_types in ordered:
dct = {for_stmt.children[1]: index_types} dct = {str(for_stmt.children[1]): index_types}
self.predefined_if_name_dict_dict[for_stmt] = dct self.predefined_if_name_dict_dict[for_stmt] = dct
t = self.eval_statement(stmt) t = self.eval_element(rhs)
left = precedence.calculate(self, left, operator, t) left = precedence.calculate(self, left, operator, t)
types = left types = left
del self.predefined_if_name_dict_dict[for_stmt] del self.predefined_if_name_dict_dict[for_stmt]
@@ -176,7 +176,7 @@ class Evaluator(object):
elif isinstance(element, iterable.MergedNodes): elif isinstance(element, iterable.MergedNodes):
return set(iterable.unite(self.eval_element(e) for e in element)) return set(iterable.unite(self.eval_element(e) for e in element))
parent = element.get_parent_until((tree.IfStmt, tree.IsScope)) parent = element.get_parent_until((tree.IfStmt, tree.ForStmt, tree.IsScope))
predefined_if_name_dict = self.predefined_if_name_dict_dict.get(parent) predefined_if_name_dict = self.predefined_if_name_dict_dict.get(parent)
if not predefined_if_name_dict and isinstance(parent, tree.IfStmt): if not predefined_if_name_dict and isinstance(parent, tree.IfStmt):
if_stmt = parent.children[1] if_stmt = parent.children[1]