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

Remove infinite loop on certain lex errors

Browse source
This commit is contained in:
Max Brunsfeld 2014-06-01 17:36:40 -07:00
parent c7266f791e
commit 868a09b0b0
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/tree_sitter/parser/lr_parser.h
View file

@ -157,10 +157,12 @@ ts_lr_parser_handle_error(ts_lr_parser *parser) {
ts_tree_release(parser->lookahead);
size_t position = ts_lexer_position(&parser->lexer);
parser->lookahead = parser->config.lex_fn(&parser->lexer, ts_lex_state_error);
if (ts_lexer_position(&parser->lexer) == position)
ts_lexer_advance(&parser->lexer);
if (ts_tree_symbol(parser->lookahead) == ts_builtin_sym_end) {
int at_end = 0;
if (ts_lexer_position(&parser->lexer) == position)
at_end = !ts_lexer_advance(&parser->lexer);
if (at_end || ts_tree_symbol(parser->lookahead) == ts_builtin_sym_end) {
ts_stack_push(&parser->stack, 0, error);
return 0;
}