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

move some things from Flow to ForFlow

Browse Source
This commit is contained in:
David Halter
2013-09-03 00:22:09 +04:30
parent 15c9ed573d
commit 1fa5d34878
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
jedi/parsing_representation.py
View File

@@ -556,10 +556,8 @@ class Flow(Scope):
:type inputs: list(Statement) :type inputs: list(Statement)
:param start_pos: Position (line, column) of the Flow statement. :param start_pos: Position (line, column) of the Flow statement.
:type start_pos: tuple(int, int) :type start_pos: tuple(int, int)
:param set_vars: Local variables used in the for loop (only there).
:type set_vars: list
""" """
def __init__(self, module, command, inputs, start_pos, set_vars=None): def __init__(self, module, command, inputs, start_pos):
self.next = None self.next = None
self.command = command self.command = command
super(Flow, self).__init__(module, start_pos) super(Flow, self).__init__(module, start_pos)
@@ -568,13 +566,7 @@ class Flow(Scope):
self.inputs = inputs self.inputs = inputs
for s in inputs: for s in inputs:
s.parent = self.use_as_parent s.parent = self.use_as_parent
if set_vars is None: self.set_vars = []
self.set_vars = []
else:
self.set_vars = set_vars
for s in self.set_vars:
s.parent.parent = self.use_as_parent
s.parent = self.use_as_parent
@property @property
def parent(self): def parent(self):
@@ -639,15 +631,18 @@ class ForFlow(Flow):
""" """
Used for the for loop, because there are two statement parts. Used for the for loop, because there are two statement parts.
""" """
def __init__(self, module, inputs, start_pos, set_stmt, def __init__(self, module, inputs, start_pos, set_stmt, is_list_comp=False):
is_list_comp=False): super(ForFlow, self).__init__(module, 'for', inputs, start_pos)
set_vars = [t for t in set_stmt.token_list if isinstance(t, Name)]
super(ForFlow, self).__init__(module, 'for', inputs, start_pos, set_vars)
self.set_stmt = set_stmt self.set_stmt = set_stmt
set_stmt.parent = self.use_as_parent set_stmt.parent = self.use_as_parent
self.is_list_comp = is_list_comp self.is_list_comp = is_list_comp
self.set_vars = [t for t in set_stmt.token_list if isinstance(t, Name)]
for s in self.set_vars:
s.parent.parent = self.use_as_parent
s.parent = self.use_as_parent
def get_code(self, first_indent=False, indention=" " * 4): def get_code(self, first_indent=False, indention=" " * 4):
vars = ",".join(x.get_code() for x in self.set_vars) vars = ",".join(x.get_code() for x in self.set_vars)
stmts = [] stmts = []