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

Improve error comparison criteria

Browse source 
Signed-off-by: Nathan Sobo <nathan@github.com>
This commit is contained in:
Max Brunsfeld 2016-09-01 11:39:23 -07:00 • committed by Nathan Sobo
parent e0b0e29a2b
commit c1b6d9f5be
3 changed files with 24 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

5
spec/fixtures/error_corpus/c_errors.txt vendored
View file

@ -122,9 +122,10 @@ int b() {
(identifier) (function_declarator (identifier))
(compound_statement
(declaration
(ERROR (identifier) (identifier))
(identifier)
(init_declarator (identifier) (number_literal)))
(init_declarator
(ERROR (identifier) (identifier))
(identifier) (number_literal)))
(declaration
(ERROR (identifier) (identifier))
(identifier)

14
spec/fixtures/error_corpus/javascript_errors.txt vendored
View file

@ -14,12 +14,9 @@ e f;
(ERROR (identifier))
(identifier)
(statement_block
(expression_statement
(ERROR (identifier))
(identifier))))
(expression_statement
(ERROR (identifier))
(identifier)))
(ERROR (identifier))
(expression_statement (identifier))))
(expression_statement (ERROR (identifier)) (identifier)))
=======================================================
multiple invalid tokens right after the viable prefix
@ -37,9 +34,8 @@ h i j k;
(ERROR (identifier) (identifier))
(identifier)
(statement_block
(expression_statement
(ERROR (identifier) (identifier) (identifier))
(identifier))))
(ERROR (identifier) (identifier) (identifier))
(expression_statement (identifier))))
(expression_statement
(ERROR (identifier) (identifier) (identifier))
(identifier)))

38
src/runtime/error_costs.h
View file

@ -11,34 +11,28 @@ typedef struct {
unsigned push_count;
} ErrorStatus;
static double error_threshold(unsigned push_count) {
return 6 * ERROR_COST_PER_SKIPPED_TREE / (1 + push_count / 2);
static inline unsigned error_status_min_cost(ErrorStatus status) {
return status.cost +
ERROR_COST_PER_SKIPPED_TREE * status.count * status.count;
}
static inline unsigned error_status_max_cost(ErrorStatus status) {
return status.cost +
ERROR_COST_PER_SKIPPED_TREE * status.count * status.count +
(6 * ERROR_COST_PER_SKIPPED_TREE * status.count + 12 * ERROR_COST_PER_SKIPPED_TREE) /
(1 + status.push_count / 2);
}
static inline int error_status_compare(ErrorStatus a, ErrorStatus b) {
// TODO remove
a.cost += ERROR_COST_PER_SKIPPED_TREE * a.count;
b.cost += ERROR_COST_PER_SKIPPED_TREE * b.count;
if ((a.count + 1 < b.count) ||
(a.count < b.count && a.cost <= b.cost)) {
if ((a.count + 1 < b.count) || (a.count < b.count && a.cost <= b.cost))
return -1;
}
if ((b.count + 1 < a.count) ||
(b.count < a.count && b.cost <= a.cost)) {
if ((a.count > b.count + 1) || (b.count < a.count && b.cost <= a.cost))
return 1;
}
if (a.cost == b.cost) {
if (a.cost + error_threshold(a.push_count) < b.cost) {
return -1;
}
if (b.cost + error_threshold(b.push_count) < a.cost) {
return 1;
}
}
if (error_status_max_cost(a) < error_status_min_cost(b))
return -1;
if (error_status_min_cost(a) > error_status_max_cost(b))
return 1;
return 0;
}