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

remove some recursion

Browse Source
This commit is contained in:
Dave Halter
2014-01-07 11:28:01 +01:00
parent 546a7bbad9
commit 821d2b9220
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/finder.py
+10 -9
View File
@@ -155,11 +155,14 @@ class NameFinder(object):
flow_scope = flow_scope.parent flow_scope = flow_scope.parent
for name in names: for name in names:
types += self._remove_statements(name.parent, resolve_decorator) typ = name.parent
if typ.isinstance(pr.ForFlow):
types += self._handle_for_loops(typ)
else:
types += self._remove_statements(typ, resolve_decorator)
return types return types
def _remove_statements(self, r, resolve_decorator=True): def _remove_statements(self, r, resolve_decorator=False):
""" """
This is the part where statements are being stripped. This is the part where statements are being stripped.
@@ -237,8 +240,7 @@ class NameFinder(object):
#if r.docstr: #if r.docstr:
#res_new.append(r) #res_new.append(r)
for scope in evaluator.eval_statement(r, seek_name=self.name_str): add += evaluator.eval_statement(r, seek_name=self.name_str)
add += self._remove_statements(scope)
if check_instance is not None: if check_instance is not None:
# class renames # class renames
@@ -246,16 +248,15 @@ class NameFinder(object):
if isinstance(a, (er.Function, pr.Function)) if isinstance(a, (er.Function, pr.Function))
else a for a in add] else a for a in add]
res_new += add res_new += add
elif r.isinstance(pr.ForFlow):
res_new += self._handle_for_loops(r)
else: else:
if isinstance(r, pr.Class): if isinstance(r, pr.Class):
r = er.Class(evaluator, r) r = er.Class(self._evaluator, r)
elif isinstance(r, pr.Function): elif isinstance(r, pr.Function):
r = er.Function(evaluator, r) r = er.Function(self._evaluator, r)
if r.isinstance(er.Function) and resolve_decorator: if r.isinstance(er.Function) and resolve_decorator:
r = r.get_decorated_func() r = r.get_decorated_func()
res_new.append(r) res_new.append(r)
return res_new return res_new
def _handle_for_loops(self, loop): def _handle_for_loops(self, loop):