From 2795078633872dcb6dc946a954fb378258d87a6d Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Sat, 28 Jun 2014 18:37:29 -0700 Subject: [PATCH] Rename type ts_document -> TSDocument --- include/tree_sitter/runtime.h | 20 ++++++++++---------- spec/runtime/language_specs.cc | 2 +- spec/runtime/node_position_spec.cc | 2 +- spec/runtime/parser_spec.cc | 2 +- src/runtime/document.c | 22 +++++++++++----------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/tree_sitter/runtime.h b/include/tree_sitter/runtime.h index 7c768d37..f0b72e26 100644 --- a/include/tree_sitter/runtime.h +++ b/include/tree_sitter/runtime.h @@ -51,16 +51,16 @@ typedef struct { const ts_tree * ts_parser_parse(ts_parser *, ts_input, ts_input_edit *edit); void ts_parser_free(ts_parser *); -typedef struct ts_document ts_document; -ts_document * ts_document_make(); -void ts_document_free(ts_document *doc); -void ts_document_set_parser(ts_document *doc, ts_parser parser); -void ts_document_set_input(ts_document *doc, ts_input input); -void ts_document_set_input_string(ts_document *doc, const char *text); -void ts_document_edit(ts_document *doc, ts_input_edit edit); -const ts_tree * ts_document_tree(const ts_document *doc); -const char * ts_document_string(const ts_document *doc); -const char * ts_document_symbol_name(const ts_document *document, const ts_tree *tree); +typedef struct TSDocument TSDocument; +TSDocument * ts_document_make(); +void ts_document_free(TSDocument *doc); +void ts_document_set_parser(TSDocument *doc, ts_parser parser); +void ts_document_set_input(TSDocument *doc, ts_input input); +void ts_document_set_input_string(TSDocument *doc, const char *text); +void ts_document_edit(TSDocument *doc, ts_input_edit edit); +const ts_tree * ts_document_tree(const TSDocument *doc); +const char * ts_document_string(const TSDocument *doc); +const char * ts_document_symbol_name(const TSDocument *document, const ts_tree *tree); #ifdef __cplusplus } diff --git a/spec/runtime/language_specs.cc b/spec/runtime/language_specs.cc index 8568e390..50712093 100644 --- a/spec/runtime/language_specs.cc +++ b/spec/runtime/language_specs.cc @@ -9,7 +9,7 @@ extern "C" ts_parser ts_parser_golang(); START_TEST describe("Languages", [&]() { - ts_document *doc; + TSDocument *doc; before_each([&]() { doc = ts_document_make(); diff --git a/spec/runtime/node_position_spec.cc b/spec/runtime/node_position_spec.cc index 44bed2d7..f1ba30f1 100644 --- a/spec/runtime/node_position_spec.cc +++ b/spec/runtime/node_position_spec.cc @@ -5,7 +5,7 @@ extern "C" ts_parser ts_parser_json(); START_TEST describe("tracking the positions of AST nodes", []() { - ts_document *doc; + TSDocument *doc; before_each([&]() { doc = ts_document_make(); diff --git a/spec/runtime/parser_spec.cc b/spec/runtime/parser_spec.cc index b67914c7..09a53e36 100644 --- a/spec/runtime/parser_spec.cc +++ b/spec/runtime/parser_spec.cc @@ -6,7 +6,7 @@ extern "C" ts_parser ts_parser_json(); START_TEST describe("incremental parsing", [&]() { - ts_document *doc; + TSDocument *doc; SpyReader *reader; before_each([&]() { diff --git a/src/runtime/document.c b/src/runtime/document.c index e50fb6cf..22648c10 100644 --- a/src/runtime/document.c +++ b/src/runtime/document.c @@ -1,18 +1,18 @@ #include "tree_sitter/runtime.h" #include -struct ts_document { +struct TSDocument { ts_parser parser; const ts_tree *tree; ts_input input; size_t error_count; }; -ts_document * ts_document_make() { - return malloc(sizeof(ts_document)); +TSDocument * ts_document_make() { + return malloc(sizeof(TSDocument)); } -void ts_document_free(ts_document *document) { +void ts_document_free(TSDocument *document) { if (document->parser.free_fn) document->parser.free_fn(document->parser.data); if (document->input.release_fn) @@ -20,28 +20,28 @@ void ts_document_free(ts_document *document) { free(document); } -void ts_document_set_parser(ts_document *document, ts_parser parser) { +void ts_document_set_parser(TSDocument *document, ts_parser parser) { document->parser = parser; } -const ts_tree * ts_document_tree(const ts_document *document) { +const ts_tree * ts_document_tree(const TSDocument *document) { return document->tree; } -const char * ts_document_string(const ts_document *document) { +const char * ts_document_string(const TSDocument *document) { return ts_tree_string(document->tree, document->parser.symbol_names); } -void ts_document_set_input(ts_document *document, ts_input input) { +void ts_document_set_input(TSDocument *document, ts_input input) { document->input = input; document->tree = document->parser.parse_fn(document->parser.data, input, NULL); } -void ts_document_edit(ts_document *document, ts_input_edit edit) { +void ts_document_edit(TSDocument *document, ts_input_edit edit) { document->tree = document->parser.parse_fn(document->parser.data, document->input, &edit); } -const char * ts_document_symbol_name(const ts_document *document, const ts_tree *tree) { +const char * ts_document_symbol_name(const TSDocument *document, const ts_tree *tree) { return document->parser.symbol_names[ts_tree_symbol(tree)]; } @@ -83,6 +83,6 @@ ts_input ts_string_input_make(const char *string) { return input; } -void ts_document_set_input_string(ts_document *document, const char *text) { +void ts_document_set_input_string(TSDocument *document, const char *text) { ts_document_set_input(document, ts_string_input_make(text)); }