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

Call handle_error even when error occurs exactly where expected

Browse source 
Previously, if an error happened right at the beginning of an error
production, the error node would be immediately shifted onto the stack
without calling the error handling function.
This commit is contained in:
Max Brunsfeld 2014-08-27 18:41:48 -07:00
parent e0a53b9f14
commit b91f48ced2
2 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/runtime/languages/json/errors.txt
View file

@ -3,7 +3,7 @@ recovers from top-level errors
==========================================
[}
---
(ERROR '}') (ERROR '}')
(ERROR '}')
==========================================
recovers from unexpected tokens

38
src/runtime/parser.c
View file

@ -135,6 +135,21 @@ static int handle_error(TSParser *parser) {
for (;;) {
/*
* If there is no state in the stack for which we can recover with the
* current lookahead token, advance to the next token. If no characters
* were consumed, advance the lexer to the next character.
*/
size_t prev_position = ts_lexer_position(&parser->lexer);
lex(parser, ts_lex_state_error);
if (ts_lexer_position(&parser->lexer) == prev_position)
if (!ts_lexer_advance(&parser->lexer)) {
DEBUG_PARSE("FAIL TO RECOVER");
ts_stack_push(&parser->stack, 0, error);
ts_tree_release(error);
return 0;
}
/*
* Unwind the parse stack until a state is found in which an error is
* expected and the current lookahead token is expected afterwards.
@ -158,20 +173,6 @@ static int handle_error(TSParser *parser) {
}
}
}
/*
* If there is no state in the stack for which we can recover with the
* current lookahead token, advance to the next token. If no characters
* were consumed, advance the lexer to the next character.
*/
size_t prev_position = ts_lexer_position(&parser->lexer);
lex(parser, ts_lex_state_error);
if (ts_lexer_position(&parser->lexer) == prev_position)
if (!ts_lexer_advance(&parser->lexer)) {
ts_stack_push(&parser->stack, 0, error);
ts_tree_release(error);
return 0;
}
}
}
@ -227,8 +228,13 @@ const TSTree *ts_parser_parse(TSParser *parser, TSInput input,
switch (action.type) {
case TSParseActionTypeShift:
DEBUG_PARSE("SHIFT %d", action.data.to_state);
shift(parser, action.data.to_state);
if (parser->lookahead->symbol == ts_builtin_sym_error) {
if (!handle_error(parser))
return get_root(parser);
} else {
DEBUG_PARSE("SHIFT %d", action.data.to_state);
shift(parser, action.data.to_state);
}
break;
case TSParseActionTypeShiftExtra: