diff --git a/include/tree_sitter/parser.h b/include/tree_sitter/parser.h index c34396f1..a1dd95dc 100644 --- a/include/tree_sitter/parser.h +++ b/include/tree_sitter/parser.h @@ -72,7 +72,7 @@ ts_lexer_start_token(lexer); SYMBOL_NAMES; -static const TSTree * ts_parse(void *data, TSInput input, ts_input_edit *edit) { +static const TSTree * ts_parse(void *data, TSInput input, TSInputEdit *edit) { ts_lr_parser *parser = (ts_lr_parser *)data; ts_lr_parser_initialize(parser, input, edit); for (;;) { diff --git a/include/tree_sitter/parser/lr_parser.h b/include/tree_sitter/parser/lr_parser.h index be98c27e..1f7f7462 100644 --- a/include/tree_sitter/parser/lr_parser.h +++ b/include/tree_sitter/parser/lr_parser.h @@ -59,7 +59,7 @@ ts_lr_parser * ts_lr_parser_make(size_t symbol_count, TSTree * (* lex_fn)(ts_lexer *, TSStateId), const int *hidden_symbol_flags); void ts_lr_parser_free(void *data); -void ts_lr_parser_initialize(ts_lr_parser *parser, TSInput input, ts_input_edit *edit); +void ts_lr_parser_initialize(ts_lr_parser *parser, TSInput input, TSInputEdit *edit); TSTree * ts_lr_parser_parse(ts_lr_parser *parser, const char **symbol_names); #ifdef __cplusplus diff --git a/include/tree_sitter/runtime.h b/include/tree_sitter/runtime.h index 563e3f22..e7f00f1b 100644 --- a/include/tree_sitter/runtime.h +++ b/include/tree_sitter/runtime.h @@ -39,16 +39,16 @@ typedef struct { size_t position; size_t bytes_inserted; size_t bytes_removed; -} ts_input_edit; +} TSInputEdit; typedef struct { - const TSTree * (* parse_fn)(void *data, TSInput input, ts_input_edit *edit); + const TSTree * (* parse_fn)(void *data, TSInput input, TSInputEdit *edit); void (* free_fn)(void *data); const char **symbol_names; void *data; } ts_parser; -const TSTree * ts_parser_parse(ts_parser *, TSInput, ts_input_edit *edit); +const TSTree * ts_parser_parse(ts_parser *, TSInput, TSInputEdit *edit); void ts_parser_free(ts_parser *); typedef struct TSDocument TSDocument; @@ -57,7 +57,7 @@ void ts_document_free(TSDocument *doc); void ts_document_set_parser(TSDocument *doc, ts_parser parser); void ts_document_set_input(TSDocument *doc, TSInput input); void ts_document_set_input_string(TSDocument *doc, const char *text); -void ts_document_edit(TSDocument *doc, ts_input_edit edit); +void ts_document_edit(TSDocument *doc, TSInputEdit edit); const TSTree * ts_document_tree(const TSDocument *doc); const char * ts_document_string(const TSDocument *doc); const char * ts_document_symbol_name(const TSDocument *document, const TSTree *tree); diff --git a/src/runtime/document.c b/src/runtime/document.c index fc6eb0e8..d0ad679b 100644 --- a/src/runtime/document.c +++ b/src/runtime/document.c @@ -37,7 +37,7 @@ void ts_document_set_input(TSDocument *document, TSInput input) { document->tree = document->parser.parse_fn(document->parser.data, input, NULL); } -void ts_document_edit(TSDocument *document, ts_input_edit edit) { +void ts_document_edit(TSDocument *document, TSInputEdit edit) { document->tree = document->parser.parse_fn(document->parser.data, document->input, &edit); } diff --git a/src/runtime/lr_parser.c b/src/runtime/lr_parser.c index 52c6416c..bbd4dacd 100644 --- a/src/runtime/lr_parser.c +++ b/src/runtime/lr_parser.c @@ -25,7 +25,7 @@ void reduce(ts_lr_parser *parser, TSSymbol symbol, size_t child_count) { 1); } -static size_t breakdown_stack(ts_lr_parser *parser, ts_input_edit *edit) { +static size_t breakdown_stack(ts_lr_parser *parser, TSInputEdit *edit) { if (!edit) return 0; ts_stack *stack = &parser->stack; @@ -186,7 +186,7 @@ void ts_lr_parser_free(void *data) { free(parser); } -void ts_lr_parser_initialize(ts_lr_parser *parser, TSInput input, ts_input_edit *edit) { +void ts_lr_parser_initialize(ts_lr_parser *parser, TSInput input, TSInputEdit *edit) { if (!edit) ts_stack_shrink(&parser->stack, 0); parser->lookahead = NULL; parser->next_lookahead = NULL;