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

work in progress refactoring to make ListComprehension a sublass of ForFlow

Browse Source
This commit is contained in:
Dave Halter
2014-06-12 10:13:49 +02:00
parent 43e54b6173
commit f8b79b3dd0
3 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jedi/evaluate/__init__.py
View File

@@ -192,10 +192,10 @@ class Evaluator(object):
next(call_path, None) # the first one has been used already
return self.follow_path(call_path, r, element.parent)
elif isinstance(element, pr.ListComprehension):
loop = _evaluate_list_comprehension(element)
#lc = element.get_most_inner_lc()
# Caveat: parents are being changed, but this doesn't matter,
# because nothing else uses it.
element.stmt.parent = loop
#element.stmt.parent = loop
return self.eval_statement(element.stmt)
elif isinstance(element, pr.Lambda):
return [er.Function(self, element)]
@@ -377,17 +377,3 @@ def filter_private_variable(scope, call_scope, var_name):
if s != scope.base.base:
return True
return False
def _evaluate_list_comprehension(lc, parent=None):
# create a for loop, which does the same as list comprehensions
input = lc.input
nested_lc = input.expression_list()[0]
if isinstance(nested_lc, pr.ListComprehension):
# is nested LC
input = nested_lc.stmt
loop = iterable.ListComprehensionFlow(lc, input, parent)
if isinstance(nested_lc, pr.ListComprehension):
loop = _evaluate_list_comprehension(nested_lc, loop)
return loop

10
jedi/evaluate/iterable.py
View File

@@ -513,13 +513,3 @@ def create_indexes_or_slices(evaluator, index_array):
return (Slice(evaluator, start, stop, step),)
else:
return tuple(evaluator.process_precedence_element(prec))
class ListComprehensionFlow(pr.ForFlow):
"""Fake implementation to pretend being a ForFlow."""
def __init__(self, list_comprehension, input, parent):
lc = list_comprehension
sup = super(ListComprehensionFlow, self)
sup.__init__(helpers.FakeSubModule, [input], lc.parent.start_pos, lc.middle)
self.parent = parent or lc.get_parent_until(pr.IsScope)
self.list_comprehension = list_comprehension