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

Rename error_size -> error_cost

Browse source
This commit is contained in:
Max Brunsfeld 2016-08-30 10:58:25 -07:00
parent 52ccebbf80
commit 1d0f6c3cc0
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/runtime/parser.c
View file

@ -201,7 +201,7 @@ static bool parser__can_reuse(Parser *self, TSStateId state, TSTree *tree,
return false;
if (!table_entry->depends_on_lookahead)
return true;
return tree->child_count > 1 && tree->error_size == 0;
return tree->child_count > 1 && tree->error_cost == 0;
}
static bool parser__condense_stack(Parser *self) {
@ -335,12 +335,12 @@ static bool parser__select_tree(Parser *self, TSTree *left, TSTree *right) {
return true;
if (!right)
return false;
if (right->error_size < left->error_size) {
if (right->error_cost < left->error_cost) {
LOG("select_smaller_error symbol:%s, over_symbol:%s",
SYM_NAME(right->symbol), SYM_NAME(left->symbol));
return true;
}
if (left->error_size < right->error_size) {
if (left->error_cost < right->error_cost) {
LOG("select_smaller_error symbol:%s, over_symbol:%s",
SYM_NAME(left->symbol), SYM_NAME(right->symbol));
return false;
@ -367,7 +367,7 @@ static bool parser__select_tree(Parser *self, TSTree *left, TSTree *right) {
static bool parser__better_version_exists(Parser *self, StackVersion version,
unsigned my_error_count,
unsigned my_error_cost) {
if (self->finished_tree && self->finished_tree->error_size <= my_error_cost)
if (self->finished_tree && self->finished_tree->error_cost <= my_error_cost)
return true;
for (StackVersion i = 0, n = ts_stack_version_count(self->stack); i < n; i++) {
@ -432,7 +432,7 @@ static bool parser__switch_children(Parser *self, TSTree *tree,
if (parser__select_tree(self, tree, &self->scratch_tree)) {
tree->size = self->scratch_tree.size;
tree->padding = self->scratch_tree.padding;
tree->error_size = self->scratch_tree.error_size;
tree->error_cost = self->scratch_tree.error_cost;
tree->children = self->scratch_tree.children;
tree->child_count = self->scratch_tree.child_count;
tree->named_child_count = self->scratch_tree.named_child_count;
@ -762,7 +762,7 @@ static RepairResult parser__repair_error(Parser *self, StackSlice slice,
return RepairNoneFound;
} else {
LOG("repair_found sym:%s, child_count:%lu, skipped:%lu", SYM_NAME(symbol),
repair.count, parent->error_size);
repair.count, parent->error_cost);
return RepairSucceeded;
}

2
src/runtime/stack.c
View file

@ -117,7 +117,7 @@ static StackNode *stack_node_new(StackNode *next, TSTree *tree, bool is_pending,
node->error_cost += 1 + tree->padding.rows + tree->size.rows;
}
} else {
node->error_cost += tree->error_size;
node->error_cost += tree->error_cost;
}
} else {
node->error_cost++;

8
src/runtime/tree.c
View file

@ -120,7 +120,7 @@ void ts_tree_set_children(TSTree *self, size_t child_count, TSTree **children) {
self->child_count = child_count;
self->named_child_count = 0;
self->visible_child_count = 0;
self->error_size = 0;
self->error_cost = 0;
for (size_t i = 0; i < child_count; i++) {
TSTree *child = children[i];
@ -132,7 +132,7 @@ void ts_tree_set_children(TSTree *self, size_t child_count, TSTree **children) {
self->size = ts_length_add(self->size, ts_tree_total_size(child));
}
self->error_size += child->error_size;
self->error_cost += child->error_cost;
if (child->visible) {
self->visible_child_count++;
@ -150,10 +150,10 @@ void ts_tree_set_children(TSTree *self, size_t child_count, TSTree **children) {
}
if (self->symbol == ts_builtin_sym_error) {
self->error_size = self->size.rows;
self->error_cost = self->size.rows;
for (size_t i = 0; i < child_count; i++)
if (!self->children[i]->extra)
self->error_size++;
self->error_cost++;
}
if (child_count > 0) {

2
src/runtime/tree.h
View file

@ -33,7 +33,7 @@ typedef struct TSTree {
TSSymbol symbol;
TSStateId parse_state;
size_t error_size;
size_t error_cost;
struct {
TSSymbol symbol;