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

small parse_stmt refactoring

Browse Source
This commit is contained in:
Dave Halter
2014-02-27 00:43:27 +01:00
parent 6577fa4336
commit 2061fbcacc
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jedi/parser/representation.py
View File

@@ -965,17 +965,17 @@ isinstance(c, (tokenize.Token, Operator)) else unicode(c)
break_on_assignment=False, stmt_class=Statement): break_on_assignment=False, stmt_class=Statement):
token_list = [] token_list = []
level = 1 level = 1
tok = None
first = True first = True
end_pos = None, None end_pos = None, None
for i, tok_temp in token_iterator: tok = None
if isinstance(tok_temp, Base): for i, tok in token_iterator:
# the token is a Name, which has already been parsed end_pos = tok.end_pos
tok = tok_temp
if first: if first:
start_pos = tok.start_pos start_pos = tok.start_pos
first = False first = False
end_pos = tok.end_pos
if isinstance(tok, Base):
# the token is a Name, which has already been parsed
if isinstance(tok, ListComprehension): if isinstance(tok, ListComprehension):
# it's not possible to set it earlier # it's not possible to set it earlier
tok.parent = self tok.parent = self
@@ -1008,16 +1008,8 @@ isinstance(c, (tokenize.Token, Operator)) else unicode(c)
): ):
end_pos = end_pos[0], end_pos[1] - 1 end_pos = end_pos[0], end_pos[1] - 1
break break
else:
tok = tok_temp.string
start_tok_pos = tok_temp.start_pos
last_end_pos = end_pos
end_pos = tok_temp.end_pos
if first:
first = False
start_pos = start_tok_pos
token_list.append(tok_temp) token_list.append(tok)
if not token_list: if not token_list:
return None, tok return None, tok