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

simplify evaluator.execute, because now everything is using py__call__

Browse Source
This commit is contained in:
Dave Halter
2014-07-30 15:40:10 +02:00
parent 373ff2c45a
commit e58dc0a3d9
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
jedi/evaluate/__init__.py
View File

@@ -312,7 +312,7 @@ class Evaluator(object):
return self.follow_path(path, result, scope) return self.follow_path(path, result, scope)
@debug.increase_indent @debug.increase_indent
def execute(self, obj, params=(), evaluate_generator=False): def execute(self, obj, params=()):
if obj.isinstance(er.Function): if obj.isinstance(er.Function):
obj = obj.get_decorated_func() obj = obj.get_decorated_func()
@@ -324,28 +324,15 @@ class Evaluator(object):
except stdlib.NotInStdLib: except stdlib.NotInStdLib:
pass pass
if isinstance(obj, iterable.GeneratorMethod): try:
return obj.py__call__(self, params) func = obj.py__call__
elif obj.isinstance(compiled.CompiledObject): except AttributeError:
return obj.py__call__(self, params) debug.warning("no execution possible %s", obj)
elif obj.isinstance(er.Class): return []
# There maybe executions of executions.
return obj.py__call__(self, params)
else: else:
stmts = [] types = func(self, params)
if obj.isinstance(er.Function): debug.dbg('execute result: %s in %s', types, obj)
return obj.py__call__(self, params, evaluate_generator) return types
else:
try:
func = obj.py__call__
except AttributeError:
debug.warning("no execution possible %s", obj)
return []
else:
return func(self, params)
debug.dbg('execute result: %s in %s', stmts, obj)
return imports.follow_imports(self, stmts)
def goto(self, stmt, call_path): def goto(self, stmt, call_path):
scope = stmt.get_parent_until(pr.IsScope) scope = stmt.get_parent_until(pr.IsScope)

2
jedi/evaluate/iterable.py
View File

@@ -62,7 +62,7 @@ class Generator(use_metaclass(CachedMetaClass, pr.Base)):
def iter_content(self): def iter_content(self):
""" returns the content of __iter__ """ """ returns the content of __iter__ """
return self._evaluator.execute(self.func, self.var_args, True) return self.func.py__call__(self._evaluator, self.var_args, True)
def get_index_types(self, index_array): def get_index_types(self, index_array):
#debug.warning('Tried to get array access on a generator: %s', self) #debug.warning('Tried to get array access on a generator: %s', self)