VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2025-12-19 10:51:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use pgen_grammar more consequent.

Browse Source
This commit is contained in:
Dave Halter
2017-05-21 17:35:06 -04:00
parent c734df407b
commit 4ca92861c6
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
parso/python/diff.py
View File

@@ -34,24 +34,24 @@ def _ends_with_newline(leaf, suffix=''):
return typ == 'newline' or suffix.endswith('\n') return typ == 'newline' or suffix.endswith('\n')
def _flows_finished(grammar, stack): def _flows_finished(pgen_grammar, stack):
""" """
if, while, for and try might not be finished, because another part might if, while, for and try might not be finished, because another part might
still be parsed. still be parsed.
""" """
for dfa, newstate, (symbol_number, nodes) in stack: for dfa, newstate, (symbol_number, nodes) in stack:
if grammar.number2symbol[symbol_number] in ('if_stmt', 'while_stmt', if pgen_grammar.number2symbol[symbol_number] in ('if_stmt', 'while_stmt',
'for_stmt', 'try_stmt'): 'for_stmt', 'try_stmt'):
return False return False
return True return True
def suite_or_file_input_is_valid(grammar, stack): def suite_or_file_input_is_valid(pgen_grammar, stack):
if not _flows_finished(grammar, stack): if not _flows_finished(pgen_grammar, stack):
return False return False
for dfa, newstate, (symbol_number, nodes) in reversed(stack): for dfa, newstate, (symbol_number, nodes) in reversed(stack):
if grammar.number2symbol[symbol_number] == 'suite': if pgen_grammar.number2symbol[symbol_number] == 'suite':
# If only newline is in the suite, the suite is not valid, yet. # If only newline is in the suite, the suite is not valid, yet.
return len(nodes) > 1 return len(nodes) > 1
# Not reaching a suite means that we're dealing with file_input levels # Not reaching a suite means that we're dealing with file_input levels
@@ -89,8 +89,8 @@ class DiffParser(object):
An advanced form of parsing a file faster. Unfortunately comes with huge An advanced form of parsing a file faster. Unfortunately comes with huge
side effects. It changes the given module. side effects. It changes the given module.
""" """
def __init__(self, grammar, module): def __init__(self, pgen_grammar, module):
self._grammar = grammar self._pgen_grammar = pgen_grammar
self._module = module self._module = module
def _reset(self): def _reset(self):
@@ -299,7 +299,7 @@ class DiffParser(object):
line_offset=parsed_until_line line_offset=parsed_until_line
) )
self._active_parser = Parser( self._active_parser = Parser(
self._grammar, self._pgen_grammar,
error_recovery=True error_recovery=True
) )
return self._active_parser.parse(tokens=tokens) return self._active_parser.parse(tokens=tokens)
@@ -338,7 +338,7 @@ class DiffParser(object):
elif typ == NEWLINE and start_pos[0] >= until_line: elif typ == NEWLINE and start_pos[0] >= until_line:
yield TokenInfo(typ, string, start_pos, prefix) yield TokenInfo(typ, string, start_pos, prefix)
# Check if the parser is actually in a valid suite state. # Check if the parser is actually in a valid suite state.
if suite_or_file_input_is_valid(self._grammar, stack): if suite_or_file_input_is_valid(self._pgen_grammar, stack):
start_pos = start_pos[0] + 1, 0 start_pos = start_pos[0] + 1, 0
while len(indents) > int(omitted_first_indent): while len(indents) > int(omitted_first_indent):
indents.pop() indents.pop()