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

repr corrections for Array/Statement/Call

Browse Source
This commit is contained in:
David Halter
2013-02-09 01:54:48 +01:00
parent ffaaa68f56
commit 25b2239f6a
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
jedi/parsing_representation.py
View File

@@ -793,7 +793,7 @@ class Statement(Simple):
k, v = arr.keys, arr.values k, v = arr.keys, arr.values
latest = (v[-1] if v else k[-1] if k else None) latest = (v[-1] if v else k[-1] if k else None)
end_pos = latest.end_pos if latest is not None \ end_pos = latest.end_pos if latest is not None \
else start_pos[0], start_pos[1] + 1 else (start_pos[0], start_pos[1] + 1)
arr.end_pos = end_pos[0], end_pos[1] + (len(break_tok) if break_tok arr.end_pos = end_pos[0], end_pos[1] + (len(break_tok) if break_tok
else 0) else 0)
return arr, break_tok return arr, break_tok
@@ -848,14 +848,13 @@ class Statement(Simple):
token_iterator = enumerate(self.token_list) token_iterator = enumerate(self.token_list)
for i, tok_temp in token_iterator: for i, tok_temp in token_iterator:
#print 'tok', tok_temp, result #print 'tok', tok_temp, result
try: if isinstance(tok_temp, Base):
token_type, tok, start_pos = tok_temp
except TypeError:
# the token is a Name, which has already been parsed # the token is a Name, which has already been parsed
tok = tok_temp tok = tok_temp
token_type = None token_type = None
start_pos = tok.start_pos start_pos = tok.start_pos
else: else:
token_type, tok, start_pos = tok_temp
if is_assignment(tok): if is_assignment(tok):
# This means, there is an assignment here. # This means, there is an assignment here.
# Add assignments, which can be more than one # Add assignments, which can be more than one
@@ -1003,9 +1002,9 @@ class Call(Simple):
if self.type == Call.NAME: if self.type == Call.NAME:
s = self.name.get_code() s = self.name.get_code()
else: else:
s = repr(self.name) s = '' if self.name is None else repr(self.name)
if self.execution is not None: if self.execution is not None:
s += '(%s)' % self.execution.get_code() s += self.execution.get_code()
if self.next is not None: if self.next is not None:
s += self.next.get_code() s += self.next.get_code()
return s return s
@@ -1022,8 +1021,8 @@ class Array(Call):
http://docs.python.org/py3k/reference/grammar.html http://docs.python.org/py3k/reference/grammar.html
Array saves sub-arrays as well as normal operators and calls to methods. Array saves sub-arrays as well as normal operators and calls to methods.
:param array_type: The type of an array, which can be one of the constants\ :param array_type: The type of an array, which can be one of the constants
below. below.
:type array_type: int :type array_type: int
""" """
NOARRAY = None # just brackets, like `1 * (3 + 2)` NOARRAY = None # just brackets, like `1 * (3 + 2)`
@@ -1052,7 +1051,6 @@ class Array(Call):
""" """
This is not only used for calls on the actual object, but for This is not only used for calls on the actual object, but for
ducktyping, to invoke this function with anything as `self`. ducktyping, to invoke this function with anything as `self`.
TODO remove?
""" """
if isinstance(instance, Array): if isinstance(instance, Array):
if instance.type in types: if instance.type in types:
@@ -1073,7 +1071,7 @@ class Array(Call):
return iter(self.values) return iter(self.values)
def get_code(self): def get_code(self):
map = {self.NOARRAY: '%s', map = {self.NOARRAY: '(%s)',
self.TUPLE: '(%s)', self.TUPLE: '(%s)',
self.LIST: '[%s]', self.LIST: '[%s]',
self.DICT: '{%s}', self.DICT: '{%s}',
@@ -1090,7 +1088,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)
return map[self.type] % ', '.join(inner) s = map[self.type] % ', '.join(inner)
return s + super(Array, self).get_code()
def __repr__(self): def __repr__(self):
if self.type == self.NOARRAY: if self.type == self.NOARRAY: