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

Fix infinite loop in certain cases w/ unterminated tokens

Browse source
This commit is contained in:
Max Brunsfeld 2014-09-03 00:38:44 -07:00
parent 7d81126df3
commit 77529ace3d
2 changed files with 47 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/tree_sitter/parser.h
View file

@ -47,10 +47,6 @@ static inline TSTree *ts_lexer_accept(TSLexer *lexer, TSSymbol symbol,
return lexer->accept_fn(lexer, symbol, is_hidden);
}
static inline int ts_lexer_is_done(const TSLexer *lexer) {
return lexer->chunk_size == 0 && lexer->position_in_chunk > 0;
}
typedef unsigned short TSStateId;
typedef enum {
@ -111,11 +107,10 @@ struct TSLanguage {
#define ADVANCE(state_index) \
{ \
DEBUG_LEX("ADVANCE %d", state_index); \
if (ts_lexer_is_done(lexer)) { \
if (!ts_lexer_advance(lexer)) { \
DEBUG_LEX("END"); \
return ts_lexer_accept(lexer, ts_builtin_sym_error, 0); \
return ts_lexer_accept(lexer, ts_builtin_sym_end, 0); \
} \
ts_lexer_advance(lexer); \
lex_state = state_index; \
goto next_state; \
}