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

Pretty-print unexpected EOF errors properly

Browse source
This commit is contained in:
Max Brunsfeld 2016-09-03 22:45:02 -07:00
parent b6e2bed761
commit 820cbece20
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/runtime/tree.c
View file

@ -369,6 +369,15 @@ void ts_tree_edit(TSTree *self, TSInputEdit edit) {
}
}
static size_t ts_tree__write_char_to_string(char *s, size_t n, int32_t c) {
if (c == 0)
return snprintf(s, n, "EOF");
else if (c < 128)
return snprintf(s, n, "'%c'", c);
else
return snprintf(s, n, "%d", c);
}
static size_t ts_tree__write_to_string(const TSTree *self,
const TSLanguage *language, char *string,
size_t limit, bool is_root,
@ -386,8 +395,8 @@ static size_t ts_tree__write_to_string(const TSTree *self,
if (visible) {
if (self->symbol == ts_builtin_sym_error && self->child_count == 0 &&
self->size.chars > 0) {
cursor +=
snprintf(*writer, limit, "(UNEXPECTED '%c'", self->lookahead_char);
cursor += snprintf(*writer, limit, "(UNEXPECTED ");
cursor += ts_tree__write_char_to_string(*writer, limit, self->lookahead_char);
} else {
cursor += snprintf(*writer, limit, "(%s",
ts_language_symbol_name(language, self->symbol));