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

fixed some more array tests

Browse Source
This commit is contained in:
David Halter
2013-02-09 02:17:29 +01:00
parent 25b2239f6a
commit 9540025a02
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jedi/evaluate.py
View File

@@ -558,7 +558,6 @@ def follow_call_list(call_list, follow_array=False):
It is used to evaluate a two dimensional object, that has calls, arrays and It is used to evaluate a two dimensional object, that has calls, arrays and
operators in it. operators in it.
""" """
# TODO remove follow_array?!
def evaluate_list_comprehension(lc, parent=None): def evaluate_list_comprehension(lc, parent=None):
input = lc.input input = lc.input
nested_lc = lc.input.token_list[0] nested_lc = lc.input.token_list[0]
@@ -585,8 +584,12 @@ def follow_call_list(call_list, follow_array=False):
calls_iterator = iter(call_list) calls_iterator = iter(call_list)
for call in calls_iterator: for call in calls_iterator:
if pr.Array.is_type(call, pr.Array.NOARRAY): if pr.Array.is_type(call, pr.Array.NOARRAY):
result += itertools.chain.from_iterable(follow_statement(s) r = list(itertools.chain.from_iterable(follow_statement(s)
for s in call) for s in call))
call_path = call.generate_call_path()
next(call_path, None) # the first one has been used already
result += follow_paths(call_path, r, call.parent,
position=call.start_pos)
elif isinstance(call, pr.ListComprehension): elif isinstance(call, pr.ListComprehension):
loop = evaluate_list_comprehension(call) loop = evaluate_list_comprehension(call)
stmt = copy.copy(call.stmt) stmt = copy.copy(call.stmt)
@@ -623,14 +626,6 @@ def follow_call_list(call_list, follow_array=False):
and str(r.name) == 'str']: and str(r.name) == 'str']:
# if it is an iterable, ignore * operations # if it is an iterable, ignore * operations
next(calls_iterator) next(calls_iterator)
if follow_array and isinstance(call_list, pr.Array):
# call_list can also be a two dimensional array
call_path = call_list.generate_call_path()
next(call_path, None) # the first one has been used already
call_scope = call_list.parent_stmt
position = call_list.start_pos
result = follow_paths(call_path, result, call_scope, position=position)
return set(result) return set(result)

8
jedi/parsing_representation.py
View File

@@ -773,17 +773,20 @@ class Statement(Simple):
maybe_dict = array_type == Array.SET maybe_dict = array_type == Array.SET
break_tok = None break_tok = None
is_array = None
while True: while True:
stmt, break_tok = parse_array_el(token_iterator, maybe_dict, stmt, break_tok = parse_array_el(token_iterator, maybe_dict,
break_on_assignment=bool(add_el)) break_on_assignment=bool(add_el))
if stmt is None: if stmt is None:
break break
else: else:
if break_tok == ',':
is_array = True
is_key = maybe_dict and break_tok == ':' is_key = maybe_dict and break_tok == ':'
arr.add_statement(stmt, is_key) arr.add_statement(stmt, is_key)
if break_tok in closing_brackets or is_assignment(break_tok): if break_tok in closing_brackets or is_assignment(break_tok):
break break
if arr.type == Array.TUPLE and len(arr) == 1 and break_tok != ',': if arr.type == Array.TUPLE and len(arr) == 1 and not is_array:
arr.type = Array.NOARRAY arr.type = Array.NOARRAY
if not arr.values and maybe_dict: if not arr.values and maybe_dict:
# this is a really special case - empty brackets {} are # this is a really special case - empty brackets {} are
@@ -1088,7 +1091,8 @@ class Array(Call):
s += key.get_code(new_line=False) + ': ' s += key.get_code(new_line=False) + ': '
s += stmt.get_code(new_line=False) s += stmt.get_code(new_line=False)
inner.append(s) inner.append(s)
s = map[self.type] % ', '.join(inner) add = ',' if self.type == self.TUPLE and len(self) == 1 else ''
s = map[self.type] % (', '.join(inner) + add)
return s + super(Array, self).get_code() return s + super(Array, self).get_code()
def __repr__(self): def __repr__(self):