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

Remove ts_stack_force_merge function

Browse source
This commit is contained in:
Max Brunsfeld 2018-04-02 11:57:26 -07:00
parent 1d9d6f37ad
commit 0ec7e5ce42
3 changed files with 29 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/runtime/parser.c
View file

@ -845,7 +845,7 @@ static void parser__handle_error(Parser *self, StackVersion version, TSSymbol lo
}
for (unsigned i = previous_version_count; i < version_count; i++) {
ts_stack_force_merge(self->stack, version, previous_version_count);
assert(ts_stack_merge(self->stack, version, previous_version_count));
}
ts_stack_record_summary(self->stack, version, MAX_SUMMARY_DEPTH);
@ -1099,7 +1099,6 @@ static unsigned parser__condense_stack(Parser *self) {
for (StackVersion j = 0; j < i; j++) {
ErrorStatus status_j = parser__version_status(self, j);
bool can_merge = ts_stack_can_merge(self->stack, j, i);
switch (parser__compare_versions(self, status_j, status_i)) {
case ErrorComparisonTakeLeft:
made_changes = true;
@ -1109,20 +1108,19 @@ static unsigned parser__condense_stack(Parser *self) {
break;
case ErrorComparisonPreferLeft:
case ErrorComparisonNone:
if (can_merge) {
if (ts_stack_merge(self->stack, j, i)) {
made_changes = true;
ts_stack_force_merge(self->stack, j, i);
i--;
j = i;
}
break;
case ErrorComparisonPreferRight:
made_changes = true;
ts_stack_swap_versions(self->stack, i, j);
if (can_merge) {
ts_stack_force_merge(self->stack, j, i);
if (ts_stack_merge(self->stack, j, i)) {
i--;
j = i;
} else {
ts_stack_swap_versions(self->stack, i, j);
}
break;
case ErrorComparisonTakeRight: