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

Don't remove mergeable stack versions so aggressively during condense

Browse source
This commit is contained in:
Max Brunsfeld 2018-03-05 10:40:05 -08:00
parent daf2c01d8b
commit f96969738b
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/runtime/parser.c
View file

@ -245,13 +245,6 @@ static unsigned parser__condense_stack(Parser *self) {
j = i;
break;
case ErrorComparisonPreferLeft:
if (can_merge) {
made_changes = true;
ts_stack_remove_version(self->stack, i);
i--;
j = i;
}
break;
case ErrorComparisonNone:
if (can_merge) {
made_changes = true;
@ -262,12 +255,10 @@ static unsigned parser__condense_stack(Parser *self) {
break;
case ErrorComparisonPreferRight:
made_changes = true;
ts_stack_swap_versions(self->stack, i, j);
if (can_merge) {
ts_stack_remove_version(self->stack, j);
ts_stack_force_merge(self->stack, j, i);
i--;
j--;
} else {
ts_stack_swap_versions(self->stack, i, j);
j = i;
}
break;