VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2025-12-13 16:11:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make some more things faster

Browse Source
This commit is contained in:
Dave Halter
2018-06-24 16:43:01 +02:00
parent e958b241c7
commit c5d141bf60
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
parso/pgen2/parse.py
View File

@@ -192,7 +192,6 @@ class PgenParser(object):
# creating a new node. We still create expr_stmt and # creating a new node. We still create expr_stmt and
# file_input though, because a lot of Jedi depends on its # file_input though, because a lot of Jedi depends on its
# logic. # logic.
print(tos.nodes)
if len(tos.nodes) == 1: if len(tos.nodes) == 1:
new_node = tos.nodes[0] new_node = tos.nodes[0]
else: else:

15
parso/python/parser.py
View File

@@ -4,6 +4,11 @@ from parso.parser import BaseParser
from parso.pgen2.parse import token_to_ilabel from parso.pgen2.parse import token_to_ilabel
NAME = PythonTokenTypes.NAME
INDENT = PythonTokenTypes.INDENT
DEDENT = PythonTokenTypes.DEDENT
class Parser(BaseParser): class Parser(BaseParser):
""" """
This class is used to parse a Python file, it then divides them into a This class is used to parse a Python file, it then divides them into a
@@ -125,7 +130,7 @@ class Parser(BaseParser):
def convert_leaf(self, pgen_grammar, type, value, prefix, start_pos): def convert_leaf(self, pgen_grammar, type, value, prefix, start_pos):
# print('leaf', repr(value), token.tok_name[type]) # print('leaf', repr(value), token.tok_name[type])
if type == PythonTokenTypes.NAME: if type == NAME:
if value in pgen_grammar.reserved_syntax_strings: if value in pgen_grammar.reserved_syntax_strings:
return tree.Keyword(value, start_pos, prefix) return tree.Keyword(value, start_pos, prefix)
else: else:
@@ -143,7 +148,7 @@ class Parser(BaseParser):
if self._start_nonterminal == 'file_input' and \ if self._start_nonterminal == 'file_input' and \
(typ == PythonTokenTypes.ENDMARKER or (typ == PythonTokenTypes.ENDMARKER or
typ == PythonTokenTypes.DEDENT and '\n' not in last_leaf.value): typ == DEDENT and '\n' not in last_leaf.value):
def reduce_stack(states, newstate): def reduce_stack(states, newstate):
# reduce # reduce
state = newstate state = newstate
@@ -199,7 +204,7 @@ class Parser(BaseParser):
if self._stack_removal(stack, until_index + 1): if self._stack_removal(stack, until_index + 1):
add_token_callback(typ, value, start_pos, prefix) add_token_callback(typ, value, start_pos, prefix)
else: else:
if typ == PythonTokenTypes.INDENT: if typ == INDENT:
# For every deleted INDENT we have to delete a DEDENT as well. # For every deleted INDENT we have to delete a DEDENT as well.
# Otherwise the parser will get into trouble and DEDENT too early. # Otherwise the parser will get into trouble and DEDENT too early.
self._omit_dedent_list.append(self._indent_counter) self._omit_dedent_list.append(self._indent_counter)
@@ -230,7 +235,7 @@ class Parser(BaseParser):
def _recovery_tokenize(self, tokens): def _recovery_tokenize(self, tokens):
for typ, value, start_pos, prefix in tokens: for typ, value, start_pos, prefix in tokens:
# print(tok_name[typ], repr(value), start_pos, repr(prefix)) # print(tok_name[typ], repr(value), start_pos, repr(prefix))
if typ == PythonTokenTypes.DEDENT: if typ == DEDENT:
# We need to count indents, because if we just omit any DEDENT, # We need to count indents, because if we just omit any DEDENT,
# we might omit them in the wrong place. # we might omit them in the wrong place.
o = self._omit_dedent_list o = self._omit_dedent_list
@@ -239,6 +244,6 @@ class Parser(BaseParser):
continue continue
self._indent_counter -= 1 self._indent_counter -= 1
elif typ == PythonTokenTypes.INDENT: elif typ == INDENT:
self._indent_counter += 1 self._indent_counter += 1
yield typ, value, start_pos, prefix yield typ, value, start_pos, prefix