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

Fix returned stack version when popping halts at an error

Browse source
This commit is contained in:
Max Brunsfeld 2016-04-18 09:55:54 -07:00
parent f63fcffe95
commit 73c99e9926
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/runtime/stack.c
View file

@ -384,12 +384,15 @@ StackPopResult ts_stack_pop_count(Stack *self, StackVersion version,
StackPopResult pop = stack__iter(self, version, pop_count_callback, &session);
if (pop.status && session.found_error) {
pop.status = StackPopStoppedAtError;
array_reverse(&pop.slices);
while (pop.slices.size > 1) {
StackSlice slice = array_pop(&pop.slices);
StackSlice stopped_slice = array_pop(&pop.slices);
for (size_t i = 0; i < pop.slices.size; i++) {
StackSlice slice = pop.slices.contents[i];
ts_tree_array_delete(&slice.trees);
ts_stack_remove_version(self, slice.version);
stopped_slice.version--;
}
pop.slices.size = 1;
pop.slices.contents[0] = stopped_slice;
}
return pop;
}