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

actually use the new types in the parser

Browse Source
This commit is contained in:
David Halter
2013-09-05 22:29:24 +04:30
parent 7383e5dc53
commit fc5fdf929a
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jedi/parsing_representation.py
View File

@@ -1052,15 +1052,11 @@ class Statement(Simple):
is_literal = token_type in [tokenize.STRING, tokenize.NUMBER] is_literal = token_type in [tokenize.STRING, tokenize.NUMBER]
if isinstance(tok, Name) or is_literal: if isinstance(tok, Name) or is_literal:
c_type = Call.NAME cls = Call
if is_literal: if is_literal:
tok = literal_eval(tok) cls = String if token_type == tokenize.STRING else Number
if token_type == tokenize.STRING:
c_type = Call.STRING
elif token_type == tokenize.NUMBER:
c_type = Call.NUMBER
call = Call(self._sub_module, tok, c_type, start_pos, end_pos, self) call = cls(self._sub_module, tok, start_pos, end_pos, self)
if is_chain: if is_chain:
result[-1].set_next(call) result[-1].set_next(call)
else: else:
@@ -1210,10 +1206,10 @@ class Literal(StatementElement):
def __init__(self, module, literal, start_pos, end_pos, parent=None): def __init__(self, module, literal, start_pos, end_pos, parent=None):
super(type(self), self).__init__(module, start_pos, end_pos, parent) super(type(self), self).__init__(module, start_pos, end_pos, parent)
self.literal = literal self.literal = literal
self.value = literal_eval(literal)
def get_code(self): def get_code(self):
s = '' if self.literal is None else repr(self.literal) return self.literal + super(Call, self).get_code()
return s + super(Call, self).get_code()
def __repr__(self): def __repr__(self):
return "<%s: %s>" % (type(self).__name__, self.literal) return "<%s: %s>" % (type(self).__name__, self.literal)