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

Inline some helper functions for lexer

Browse source
This commit is contained in:
Max Brunsfeld 2014-10-17 15:22:01 -07:00
parent ad9aee30e0
commit 5c600942df
3 changed files with 14 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/runtime/lexer.c
View file

@ -59,7 +59,7 @@ static TSTree *accept(TSLexer *lexer, TSSymbol symbol, int is_hidden) {
ts_length_sub(lexer->token_start_position, lexer->token_end_position);
lexer->token_end_position = lexer->current_position;
return (symbol == ts_builtin_sym_error)
? ts_tree_make_error(size, padding, ts_lexer_lookahead_char(lexer))
? ts_tree_make_error(size, padding, lexer->lookahead)
: ts_tree_make_leaf(symbol, size, padding, is_hidden);
}
@ -91,5 +91,5 @@ void ts_lexer_reset(TSLexer *lexer, TSLength position) {
lexer->current_position = position;
ts_lexer_read_next_chunk(lexer);
ts_lexer_advance(lexer);
lexer->advance_fn(lexer);
}

2
src/runtime/parser.c
View file

@ -253,7 +253,7 @@ static int handle_error(TSParser *parser) {
* just skip it. If the end of input is reached, exit.
*/
if (ts_length_eq(parser->lexer.current_position, prev_position))
if (!ts_lexer_advance(&parser->lexer)) {
if (!parser->lexer.advance_fn(&parser->lexer)) {
DEBUG_PARSE("fail_to_recover");
resize_error(parser, error);