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

Remove duplicated stack head-merging logic

Browse source
This commit is contained in:
Max Brunsfeld 2015-05-25 20:27:51 -07:00
parent 9e57f2b881
commit d793eda5b5
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/runtime/parse_stack.c
View file

@ -53,19 +53,13 @@ static void stack_node_retain(ParseStackNode *);
static bool stack_node_release(ParseStackNode *);
static void stack_node_add_successor(ParseStackNode *, ParseStackNode *);
static void parse_stack_remove_head(ParseStack *, int);
static bool parse_stack_merge_head(ParseStack *, int, TSStateId, TSTree *);
bool ts_parse_stack_shift(ParseStack *this, int head_index, TSStateId state, TSTree *tree) {
assert(head_index < this->head_count);
for (int i = 0; i < head_index; i++) {
ParseStackNode *head = this->heads[i];
if (head->state == state && ts_tree_eq(head->tree, tree)) {
stack_node_add_successor(head, this->heads[head_index]);
parse_stack_remove_head(this, head_index);
return true;
}
}
ParseStackNode *new_head = stack_node_new(this->heads[head_index], state, tree);
this->heads[head_index] = new_head;
if (parse_stack_merge_head(this, head_index, state, tree))
return true;
this->heads[head_index] = stack_node_new(this->heads[head_index], state, tree);
return false;
}
@ -96,15 +90,9 @@ bool ts_parse_stack_reduce(ParseStack *this, int head_index, TSStateId state,
}
TSTree *parent = ts_tree_make_node(symbol, child_count, children, false);
for (int i = 0; i < head_index; i++) {
ParseStackNode *head = this->heads[i];
if (head->state == state && ts_tree_eq(head->tree, parent)) {
stack_node_add_successor(head, this->heads[head_index]);
ts_tree_release(parent);
parse_stack_remove_head(this, head_index);
return true;
}
if (parse_stack_merge_head(this, head_index, state, parent)) {
ts_tree_release(parent);
return true;
}
stack_node_retain(next_node);
@ -168,6 +156,18 @@ static void stack_node_add_successor(ParseStackNode *this, ParseStackNode *succe
this->successor_count++;
}
static bool parse_stack_merge_head(ParseStack *this, int head_index, TSStateId state, TSTree *tree) {
for (int i = 0; i < head_index; i++) {
ParseStackNode *head = this->heads[i];
if (head->state == state && ts_tree_eq(head->tree, tree)) {
stack_node_add_successor(head, this->heads[head_index]);
parse_stack_remove_head(this, head_index);
return true;
}
}
return false;
}
static void parse_stack_remove_head(ParseStack *this, int head_index) {
stack_node_release(this->heads[head_index]);
for (int i = head_index; i < this->head_count - 1; i++) {