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

Start using the forward move to recover from errors

Browse source 
Some unit tests passing. Corpus tests still failing
This commit is contained in:
Max Brunsfeld 2016-03-02 21:03:55 -08:00
parent b733b0cc81
commit aef7582a2a
8 changed files with 295 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/runtime/stack.c
View file

@ -358,24 +358,22 @@ StackPopResultArray ts_stack_pop(Stack *self, int head_index, int child_count,
}
if (next_path->is_shared) {
next_path->trees = (TreeArray)array_copy(&path->trees);
next_path->trees.size--;
for (size_t j = 0; j < next_path->trees.size; j++)
ts_tree_retain(next_path->trees.contents[j]);
TreeArray trees = path->trees;
trees.size--;
next_path->trees = ts_tree_array_copy(&trees);
next_path->is_shared = false;
}
next_path->node = successor.node;
if (successor.tree->extra && !count_extra)
next_path->goal_tree_count++;
ts_tree_retain(successor.tree);
if (!array_push(&next_path->trees, successor.tree))
goto error;
/*
* Children that are 'extra' do not count towards the total child
* count.
*/
if (successor.tree->extra && !count_extra)
next_path->goal_tree_count++;
next_path->node = successor.node;
if (successor.tree->symbol == ts_builtin_sym_error && !count_extra) {
next_path->goal_tree_count = next_path->trees.size;
}
}
}
}