VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-20 04:21:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement WhiteSpace as well and merge with pytree.

Browse Source
This commit is contained in:
Dave Halter
2014-10-09 10:55:03 +02:00
parent 8236ce18a2
commit c7c222daab
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jedi/parser/pytree.py
View File

@@ -16,6 +16,7 @@ import sys
import os import os
from . import pgen2 from . import pgen2
from . import tokenize
_type_reprs = {} _type_reprs = {}
@@ -44,12 +45,12 @@ python_grammar_no_print_statement = python_grammar.copy()
del python_grammar_no_print_statement.keywords["print"] del python_grammar_no_print_statement.keywords["print"]
from jedi.parser import representation as er from jedi.parser import representation as pr
_ast_mapping = { _ast_mapping = {
#'simple_stmt': ExprStmt, #'simple_stmt': pr.ExprStmt,
'classdef': er.Class, 'classdef': pr.Class,
'funcdef': er.Function, 'funcdef': pr.Function,
'file_input': er.SubModule, 'file_input': pr.SubModule,
} }
ast_mapping = dict((getattr(python_symbols, k), v) for k, v in _ast_mapping.items()) ast_mapping = dict((getattr(python_symbols, k), v) for k, v in _ast_mapping.items())
@@ -229,4 +230,11 @@ def convert(grammar, raw_node):
else: else:
print('leaf', raw_node, type_repr(type)) print('leaf', raw_node, type_repr(type))
prefix, start_pos = context prefix, start_pos = context
return Leaf(type, value, start_pos, prefix) if type == tokenize.NAME:
return pr.Name(value, start_pos, prefix)
elif type in (tokenize.STRING, tokenize.NUMBER):
return pr.Name(value, start_pos, prefix)
elif type in (tokenize.NEWLINE, tokenize.ENDMARKER):
return pr.Whitespace(value, start_pos, prefix)
else:
return pr.Operator(value, start_pos, prefix)

12
jedi/parser/representation.py
View File

@@ -176,11 +176,19 @@ class _Leaf(Base):
self.start_pos = start_pos self.start_pos = start_pos
self.prefix = prefix self.prefix = prefix
@property
def end_pos(self):
return self.start_pos[0], self.start_pos[1] + len(self.value)
def get_code(self): def get_code(self):
return self.prefix + self.value return self.prefix + self.value
def __repr__(self): def __repr__(self):
return "<%s: `%s`>" % (type(self).__name__, self.value) return "<%s: %s>" % (type(self).__name__, repr(self.value))
class Whitespace(_Leaf):
"""Contains NEWLINE and ENDMARKER tokens."""
class Name(_Leaf): class Name(_Leaf):
@@ -199,7 +207,7 @@ class Name(_Leaf):
return self.value return self.value
def __repr__(self): def __repr__(self):
return "<%s: %s@%s,%s>" % (type(self).__name__, self._string, return "<%s: %s@%s,%s>" % (type(self).__name__, self.value,
self.start_pos[0], self.start_pos[1]) self.start_pos[0], self.start_pos[1])
def get_definition(self): def get_definition(self):

2
test/test_new_parser.py
View File

@@ -23,5 +23,5 @@ def test_basic():
print() print()
x = d.parse_string('\na #pass\n') x = d.parse_string('\na #pass\n')
print(repr(x)) print(repr(x))
print(x) print(x.get_code())
assert False assert False