VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-09 15:24:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make Generator tuple assignments work.

Browse Source
This commit is contained in:
Dave Halter
2014-11-12 13:48:08 +01:00
parent 65c18f143c
commit 13c2279fea
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
jedi/evaluate/iterable.py
View File

@@ -58,6 +58,19 @@ class GeneratorMixin(object):
def scope_names_generator(self, position=None): def scope_names_generator(self, position=None):
yield self, self._get_defined_names() yield self, self._get_defined_names()
def get_index_types(self, evaluator, index_array):
#debug.warning('Tried to get array access on a generator: %s', self)
analysis.add(self._evaluator, 'type-error-generator', index_array)
return []
def get_exact_index_types(self, index):
"""
Exact lookups are used for tuple lookups, which are perfectly fine if
used with generators.
"""
return [self.iter_content()[index]]
class Generator(use_metaclass(CachedMetaClass, IterableWrapper, GeneratorMixin)): class Generator(use_metaclass(CachedMetaClass, IterableWrapper, GeneratorMixin)):
"""Handling of `yield` functions.""" """Handling of `yield` functions."""
@@ -74,18 +87,6 @@ class Generator(use_metaclass(CachedMetaClass, IterableWrapper, GeneratorMixin))
from jedi.evaluate.representation import FunctionExecution from jedi.evaluate.representation import FunctionExecution
return FunctionExecution(self._evaluator, self.func, self.var_args).get_return_types() return FunctionExecution(self._evaluator, self.func, self.var_args).get_return_types()
def get_index_types(self, index_array):
#debug.warning('Tried to get array access on a generator: %s', self)
analysis.add(self._evaluator, 'type-error-generator', index_array)
return []
def get_exact_index_types(self, index):
"""
Exact lookups are used for tuple lookups, which are perfectly fine if
used with generators.
"""
return [self.iter_content()[index]]
def __getattr__(self, name): def __getattr__(self, name):
if name not in ['start_pos', 'end_pos', 'parent', 'get_imports', if name not in ['start_pos', 'end_pos', 'parent', 'get_imports',
'asserts', 'doc', 'docstr', 'get_parent_until', 'asserts', 'doc', 'docstr', 'get_parent_until',
@@ -157,7 +158,7 @@ class ListComprehension(Comprehension):
class GeneratorComprehension(Comprehension, GeneratorMixin): class GeneratorComprehension(Comprehension, GeneratorMixin):
def iter_content(self): def iter_content(self):
return self._evaluator.eval_statement_element(self.comprehension) return self._evaluator.eval_element(self.eval_node())
class Array(IterableWrapper): class Array(IterableWrapper):