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

Fix error recovery regression due to stack node_count change

Browse source
This commit is contained in:
Max Brunsfeld 2023-08-17 17:21:31 -07:00
parent 70766f5327
commit 9564e1706d
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/src/stack.c
View file

@ -120,6 +120,20 @@ recur:
}
}
/// Get the number of nodes in the subtree, for the purpose of measuring
/// how much progress has been made by a given version of the stack.
static uint32_t stack__subtree_node_count(Subtree subtree) {
uint32_t count = ts_subtree_visible_descendant_count(subtree);
if (ts_subtree_visible(subtree)) count++;
// Count intermediate error nodes even though they are not visible,
// because a stack version's node count is used to check whether it
// has made any progress since the last time it encountered an error.
if (ts_subtree_symbol(subtree) == ts_builtin_sym_error_repeat) count++;
return count;
}
static StackNode *stack_node_new(
StackNode *previous_node,
Subtree subtree,
@ -152,7 +166,7 @@ static StackNode *stack_node_new(
if (subtree.ptr) {
node->error_cost += ts_subtree_error_cost(subtree);
node->position = length_add(node->position, ts_subtree_total_size(subtree));
node->node_count += ts_subtree_node_count(subtree);
node->node_count += stack__subtree_node_count(subtree);
node->dynamic_precedence += ts_subtree_dynamic_precedence(subtree);
}
} else {
@ -239,7 +253,7 @@ static void stack_node_add_link(
if (link.subtree.ptr) {
ts_subtree_retain(link.subtree);
node_count += ts_subtree_node_count(link.subtree);
node_count += stack__subtree_node_count(link.subtree);
dynamic_precedence += ts_subtree_dynamic_precedence(link.subtree);
}

6
lib/src/subtree.h
View file

@ -303,12 +303,6 @@ static inline uint32_t ts_subtree_visible_descendant_count(Subtree self) {
: self.ptr->visible_descendant_count;
}
static inline uint32_t ts_subtree_node_count(Subtree self) {
return
ts_subtree_visible_descendant_count(self) +
(ts_subtree_visible(self) ? 1 : 0);
}
static inline uint32_t ts_subtree_visible_child_count(Subtree self) {
if (ts_subtree_child_count(self) > 0) {
return self.ptr->visible_child_count;