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

Merge all versions created in a given reduce operation

Browse source
This commit is contained in:
Max Brunsfeld 2016-04-24 00:55:19 -07:00
parent fe74c6fb34
commit e99a3925e0
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/runtime/stack.c
View file

@ -401,10 +401,10 @@ void ts_stack_renumber_version(Stack *self, StackVersion v1, StackVersion v2) {
array_erase(&self->heads, v1);
}
void ts_stack_merge(Stack *self) {
for (size_t i = 0; i < self->heads.size; i++) {
void ts_stack_merge_from(Stack *self, StackVersion start_version) {
for (size_t i = start_version + 1; i < self->heads.size; i++) {
StackNode *node = self->heads.contents[i];
for (size_t j = 0; j < i; j++) {
for (size_t j = start_version; j < i; j++) {
StackNode *prior_node = self->heads.contents[j];
if (prior_node->state == node->state &&
prior_node->position.chars == node->position.chars) {
@ -419,6 +419,10 @@ void ts_stack_merge(Stack *self) {
}
}
void ts_stack_merge(Stack *self) {
ts_stack_merge_from(self, 0);
}
void ts_stack_clear(Stack *self) {
stack_node_retain(self->base_node);
for (size_t i = 0; i < self->heads.size; i++)