traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #58 from tree-sitter/reduce-error-recovery-branching

Browse source 
Reduce the branching factor of the parse stack during error recovery
This commit is contained in:
Max Brunsfeld 2017-02-18 11:34:09 -08:00 • committed by GitHub
commit 135d8ef4e0
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
spec/fixtures/error_corpus/c_errors.txt vendored
View file

@ -127,5 +127,6 @@ int b() {
(ERROR (identifier) (identifier))
(identifier) (number_literal)))
(declaration
(ERROR (identifier) (identifier))
(identifier)
(init_declarator (ERROR (identifier) (identifier)) (identifier) (number_literal))))))
(init_declarator (identifier) (number_literal))))))

2
src/runtime/parser.c
View file

@ -550,7 +550,7 @@ static StackPopResult parser__reduce(Parser *self, StackVersion version,
// If this pop operation terminated at the end of an error region, then
// create two stack versions: one in which the parent node is interpreted
// normally, and one in which the parent node is skipped.
if (state == ERROR_STATE && allow_skipping) {
if (state == ERROR_STATE && allow_skipping && child_count > 1) {
StackVersion other_version = ts_stack_copy_version(self->stack, slice.version);
ts_stack_push(self->stack, other_version, parent, false, ERROR_STATE);