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

Refactor parser error messages

Browse source 
- move message generation to TSParseError,
  so that Parser doesn’t need to import <string>, and can
  be compiled as plain C.
This commit is contained in:
Max Brunsfeld 2014-01-11 17:59:45 -08:00
parent f342067293
commit 7a3092b765
9 changed files with 91 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/runtime/document.c
View file

@ -4,7 +4,7 @@ struct TSDocument {
TSParseFn *parse_fn;
const char **symbol_names;
const char *text;
const char *error_message;
TSParseError error;
TSTree *tree;
};
@ -22,7 +22,7 @@ void TSDocumentSetText(TSDocument *document, const char *text) {
document->text = text;
TSParseResult result = document->parse_fn(text);
document->tree = result.tree;
document->error_message = result.error.message;
document->error = result.error;
}
TSTree * TSDocumentTree(const TSDocument *document) {
@ -30,10 +30,11 @@ TSTree * TSDocumentTree(const TSDocument *document) {
}
const char * TSDocumentToString(const TSDocument *document) {
if (document->error_message) {
return document->error_message;
} else if (document->tree)
if (document->error.type != TSParseErrorTypeNone) {
return TSParseErrorToString(&document->error, document->text, document->symbol_names);
} else if (document->tree) {
return TSTreeToString(document->tree, document->symbol_names);
else
} else {
return "#<null tree>";
}
}