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

Fix parser position in parse error messages

Browse source
This commit is contained in:
Max Brunsfeld 2014-01-13 12:57:12 -08:00
parent a21c42ca85
commit 4cacdcba70
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/parser.h
View file

@ -99,6 +99,7 @@ static void TSParserReduce(TSParser *parser, TSSymbol symbol, int child_count) {
static void TSParserError(TSParser *parser, size_t count, const char **expected_inputs) {
TSParseError *error = &parser->result.error;
error->type = TSParseErrorTypeSyntactic;
error->position = parser->position;
error->expected_input_count = count;
error->expected_inputs = expected_inputs;
error->lookahead_sym = TSParserLookaheadSym(parser);
@ -107,6 +108,7 @@ static void TSParserError(TSParser *parser, size_t count, const char **expected_
static void TSParserLexError(TSParser *parser, size_t count, const char **expected_inputs) {
TSParseError *error = &parser->result.error;
error->type = TSParseErrorTypeLexical;
error->position = parser->position;
error->expected_input_count = count;
error->expected_inputs = expected_inputs;
error->lookahead_sym = TSParserLookaheadSym(parser);

2
src/runtime/parse_config.cpp
View file

@ -19,7 +19,7 @@ const char * TSParseErrorToString(const TSParseError *error, const char *input_s
result += "Expected: ";
for (int i = 0; i < error->expected_input_count; i++)
result += string(" '") + error->expected_inputs[i] + "'";
result += error->expected_inputs[i];
char *stuff = (char *)malloc(result.size() * sizeof(char));
strcpy(stuff, result.c_str());