VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2025-12-09 06:04:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a lot of the old error recovery

Browse Source
This commit is contained in:
Dave Halter
2018-06-22 09:56:58 +02:00
parent 68eab72229
commit 9e8066c6fd
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
parso/pgen2/parse.py
View File

@@ -192,10 +192,8 @@ class PgenParser(object):
stack[-1].dfa = plan.next_dfa stack[-1].dfa = plan.next_dfa
for push in plan.dfa_pushes: for push in plan.dfa_pushes:
print('insert', push.from_rule)
stack.append(StackNode(push)) stack.append(StackNode(push))
print('set next', plan.next_dfa.from_rule)
leaf = self.convert_leaf(grammar, type_, value, prefix, start_pos) leaf = self.convert_leaf(grammar, type_, value, prefix, start_pos)
stack[-1].nodes.append(leaf) stack[-1].nodes.append(leaf)
@@ -289,7 +287,6 @@ class PgenParser(object):
def _pop(self): def _pop(self):
tos = self.stack.pop() tos = self.stack.pop()
print('pop', tos.nonterminal, tos.nodes)
# If there's exactly one child, return that child instead of # If there's exactly one child, return that child instead of
# 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

40
parso/python/parser.py
View File

@@ -185,24 +185,23 @@ class Parser(BaseParser):
# For now just discard everything that is not a suite or # For now just discard everything that is not a suite or
# file_input, if we detect an error. # file_input, if we detect an error.
one_line_suite = False one_line_suite = False
for index, (nonterminal, nodes) in reversed(list(enumerate(get_nonterminal_and_nodes(stack)))): for until_index, stack_node in reversed(list(enumerate(stack))):
# `suite` can sometimes be only simple_stmt, not stmt. # `suite` can sometimes be only simple_stmt, not stmt.
if one_line_suite: if one_line_suite:
break break
elif nonterminal == 'file_input': elif stack_node.nonterminal == 'file_input':
break break
elif nonterminal == 'suite': elif stack_node.nonterminal == 'suite':
if len(nodes) > 1: if len(stack_node.nodes) > 1:
break break
elif not nodes: elif not stack_node.nodes:
one_line_suite = True one_line_suite = True
# `suite` without an indent are error nodes. # `suite` without an indent are error nodes.
return index, nonterminal, nodes return until_index
index, nonterminal, nodes = current_suite(stack) until_index = current_suite(stack)
# print('err', token.tok_name[typ], repr(value), start_pos, len(stack), index) if self._stack_removal(stack, until_index + 1):
if self._stack_removal(pgen_grammar, stack, arcs, index + 1, value, start_pos):
add_token_callback(typ, value, start_pos, prefix) add_token_callback(typ, value, start_pos, prefix)
else: else:
if typ == INDENT: if typ == INDENT:
@@ -211,9 +210,10 @@ class Parser(BaseParser):
self._omit_dedent_list.append(self._indent_counter) self._omit_dedent_list.append(self._indent_counter)
error_leaf = tree.PythonErrorLeaf(tok_name[typ].lower(), value, start_pos, prefix) error_leaf = tree.PythonErrorLeaf(tok_name[typ].lower(), value, start_pos, prefix)
stack[-1][2][1].append(error_leaf) stack[-1].nodes.append(error_leaf)
if nonterminal == 'suite': tos = stack[-1]
if tos.nonterminal == 'suite':
dfa, state, node = stack[-1] dfa, state, node = stack[-1]
states, first = dfa states, first = dfa
arcs = states[state] arcs = states[state]
@@ -224,21 +224,15 @@ class Parser(BaseParser):
new_state = arcs[0][1] new_state = arcs[0][1]
stack[-1] = dfa, new_state, node stack[-1] = dfa, new_state, node
def _stack_removal(self, pgen_grammar, stack, arcs, start_index, value, start_pos): def _stack_removal(self, stack, start_index):
failed_stack = False
found = False
all_nodes = [] all_nodes = []
for dfa, state, (type_, nodes) in stack[start_index:]: for stack_node in stack[start_index:]:
if nodes: all_nodes += stack_node.nodes
found = True if all_nodes:
if found: stack[start_index - 1].nodes.append(tree.PythonErrorNode(all_nodes))
failed_stack = True
all_nodes += nodes
if failed_stack:
stack[start_index - 1][2][1].append(tree.PythonErrorNode(all_nodes))
stack[start_index:] = [] stack[start_index:] = []
return failed_stack return bool(all_nodes)
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: