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

Rename stack_merge function to stack_merge_all

Browse source
This commit is contained in:
Max Brunsfeld 2016-05-28 20:24:08 -07:00
parent e1a3a1daeb
commit e686478ad2
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/runtime/parser.c
View file

@ -1018,7 +1018,7 @@ TSTree *ts_parser_parse(TSParser *self, TSInput input, TSTree *previous_tree) {
}
}
ts_stack_merge(self->stack);
ts_stack_merge_all(self->stack);
ts_tree_release(lookahead);
if (ts_stack_version_count(self->stack) == 0) {

2
src/runtime/stack.c
View file

@ -502,7 +502,7 @@ void ts_stack_merge_new(Stack *self, StackVersion reference_version,
}
}
void ts_stack_merge(Stack *self) {
void ts_stack_merge_all(Stack *self) {
ts_stack_merge_from(self, 0);
}

2
src/runtime/stack.h
View file

@ -105,7 +105,7 @@ StackPopResult ts_stack_pop_all(Stack *, StackVersion);
void ts_stack_merge_from(Stack *, StackVersion);
void ts_stack_merge(Stack *);
void ts_stack_merge_all(Stack *);
void ts_stack_merge_new(Stack *, StackVersion base_version,
StackVersion new_version);