VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-09-14 00:21:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify parse_array again (closure in statement parser)

Browse Source
This commit is contained in:
Dave Halter
2014-03-05 16:54:21 +01:00
parent 7222d70ecb
commit 387319fde5
1 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/parser/representation.py
+10 -27
View File
@@ -945,8 +945,7 @@ isinstance(c, (tokenize.Token, Operator)) else unicode(c)
return isinstance(tok, Operator) and tok.string.endswith('=') \ return isinstance(tok, Operator) and tok.string.endswith('=') \
and not tok.string in ['>=', '<=', '==', '!='] and not tok.string in ['>=', '<=', '==', '!=']
def parse_array(token_iterator, array_type, start_pos, add_el=None, def parse_array(token_iterator, array_type, start_pos, add_el=None):
added_breaks=()):
arr = Array(self._sub_module, start_pos, array_type, self) arr = Array(self._sub_module, start_pos, array_type, self)
if add_el is not None: if add_el is not None:
arr.add_statement(add_el) arr.add_statement(add_el)
@@ -957,8 +956,7 @@ isinstance(c, (tokenize.Token, Operator)) else unicode(c)
is_array = None is_array = None
while True: while True:
stmt, break_tok = parse_stmt(token_iterator, maybe_dict, stmt, break_tok = parse_stmt(token_iterator, maybe_dict,
break_on_assignment=bool(add_el), break_on_assignment=bool(add_el))
added_breaks=added_breaks)
if stmt is None: if stmt is None:
break break
else: else:
@@ -966,7 +964,6 @@ isinstance(c, (tokenize.Token, Operator)) else unicode(c)
is_array = True is_array = True
arr.add_statement(stmt, is_key=maybe_dict and break_tok == ':') arr.add_statement(stmt, is_key=maybe_dict and break_tok == ':')
if break_tok in closing_brackets \ if break_tok in closing_brackets \
or break_tok in added_breaks \
or is_assignment(break_tok): or is_assignment(break_tok):
break break
old_stmt = stmt old_stmt = stmt
@@ -981,7 +978,8 @@ isinstance(c, (tokenize.Token, Operator)) else unicode(c)
return arr, break_tok return arr, break_tok
def parse_stmt(token_iterator, maybe_dict=False, added_breaks=(), def parse_stmt(token_iterator, maybe_dict=False, added_breaks=(),
break_on_assignment=False, stmt_class=Statement): break_on_assignment=False, stmt_class=Statement,
allow_comma=False):
token_list = [] token_list = []
level = 0 level = 0
first = True first = True
@@ -1014,7 +1012,7 @@ isinstance(c, (tokenize.Token, Operator)) else unicode(c)
level += 1 level += 1
if level == -1 or level == 0 and ( if level == -1 or level == 0 and (
tok == ',' tok == ',' and not allow_comma
or tok in added_breaks or tok in added_breaks
or maybe_dict and tok == ':' or maybe_dict and tok == ':'
or is_assignment(tok) and break_on_assignment): or is_assignment(tok) and break_on_assignment):
@@ -1041,9 +1039,6 @@ isinstance(c, (tokenize.Token, Operator)) else unicode(c)
params.append(param) params.append(param)
if tok == ':': if tok == ':':
break break
# TODO uncomment and run `./run.py func 395 --debug` shouldn't parse all statements.
#print tok, tok.start_pos
#raise NotImplementedError()
if tok != ':': if tok != ':':
return None, tok return None, tok
@@ -1061,26 +1056,14 @@ isinstance(c, (tokenize.Token, Operator)) else unicode(c)
def parse_list_comp(token_iterator, token_list, start_pos, end_pos): def parse_list_comp(token_iterator, token_list, start_pos, end_pos):
def parse_stmt_or_arr(token_iterator, added_breaks=(), def parse_stmt_or_arr(token_iterator, added_breaks=(),
names_are_set_vars=False): names_are_set_vars=False):
stmt, tok = parse_stmt(token_iterator, stmt, tok = parse_stmt(token_iterator, allow_comma=True,
added_breaks=added_breaks) added_breaks=added_breaks)
if not stmt: if not stmt:
return None, tok return None, tok
if tok == ',':
arr, tok = parse_array(token_iterator, Array.TUPLE, for t in stmt._token_list:
stmt.start_pos, stmt, if isinstance(t, Name):
added_breaks=added_breaks) t.parent = stmt
token_list = []
for stmt in arr:
token_list += stmt._token_list
start_pos = arr.start_pos[0], arr.start_pos[1] - 1
stmt = Statement(self._sub_module, token_list,
start_pos, arr.end_pos)
arr.parent = stmt
stmt._expression_list = [arr]
else:
for t in stmt._token_list:
if isinstance(t, Name):
t.parent = stmt
stmt._names_are_set_vars = names_are_set_vars stmt._names_are_set_vars = names_are_set_vars
return stmt, tok return stmt, tok