Rename generated language functions to e.g. tree_sitter_python
They used to be called e.g. `ts_language_python`. Now that there are APIs that deal with the `TSLanguage` objects themselves, such as `ts_language_symbol_count`, the old names were a little confusing.
This commit is contained in:
parent
d853b6504d
commit
60f6998485
5 changed files with 22 additions and 21 deletions
|
|
@ -4,21 +4,21 @@ enum {
|
|||
COMMENT,
|
||||
};
|
||||
|
||||
void *ts_language_extra_external_tokens_external_scanner_create() {
|
||||
void *tree_sitter_extra_external_tokens_external_scanner_create() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void ts_language_extra_external_tokens_external_scanner_reset(void *payload) {
|
||||
void tree_sitter_extra_external_tokens_external_scanner_reset(void *payload) {
|
||||
}
|
||||
|
||||
bool ts_language_extra_external_tokens_external_scanner_serialize(void *payload, TSExternalTokenState state) {
|
||||
bool tree_sitter_extra_external_tokens_external_scanner_serialize(void *payload, TSExternalTokenState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void ts_language_extra_external_tokens_external_scanner_deserialize(void *payload, TSExternalTokenState state) {
|
||||
void tree_sitter_extra_external_tokens_external_scanner_deserialize(void *payload, TSExternalTokenState state) {
|
||||
}
|
||||
|
||||
bool ts_language_extra_external_tokens_external_scanner_scan(
|
||||
bool tree_sitter_extra_external_tokens_external_scanner_scan(
|
||||
void *payload, TSLexer *lexer, const bool *whitelist) {
|
||||
|
||||
while (lexer->lookahead == ' ') {
|
||||
|
|
@ -38,5 +38,5 @@ bool ts_language_extra_external_tokens_external_scanner_scan(
|
|||
return false;
|
||||
}
|
||||
|
||||
void ts_language_extra_external_tokens_external_scanner_destroy(void *payload) {
|
||||
void tree_sitter_extra_external_tokens_external_scanner_destroy(void *payload) {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ typedef struct {
|
|||
uint32_t depth;
|
||||
} Scanner;
|
||||
|
||||
void *ts_language_external_scanner_example_external_scanner_create() {
|
||||
void *tree_sitter_external_scanner_example_external_scanner_create() {
|
||||
Scanner *scanner = malloc(sizeof(Scanner));
|
||||
*scanner = (Scanner){
|
||||
.open_delimiter = 0,
|
||||
|
|
@ -23,7 +23,7 @@ void *ts_language_external_scanner_example_external_scanner_create() {
|
|||
return scanner;
|
||||
}
|
||||
|
||||
bool ts_language_external_scanner_example_external_scanner_scan(
|
||||
bool tree_sitter_external_scanner_example_external_scanner_scan(
|
||||
void *payload, TSLexer *lexer, const bool *whitelist) {
|
||||
Scanner *scanner = payload;
|
||||
|
||||
|
|
@ -103,16 +103,16 @@ bool ts_language_external_scanner_example_external_scanner_scan(
|
|||
return false;
|
||||
}
|
||||
|
||||
void ts_language_external_scanner_example_external_scanner_reset(void *payload) {
|
||||
void tree_sitter_external_scanner_example_external_scanner_reset(void *payload) {
|
||||
}
|
||||
|
||||
bool ts_language_external_scanner_example_external_scanner_serialize(void *payload, TSExternalTokenState state) {
|
||||
bool tree_sitter_external_scanner_example_external_scanner_serialize(void *payload, TSExternalTokenState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void ts_language_external_scanner_example_external_scanner_deserialize(void *payload, TSExternalTokenState state) {
|
||||
void tree_sitter_external_scanner_example_external_scanner_deserialize(void *payload, TSExternalTokenState state) {
|
||||
}
|
||||
|
||||
void ts_language_external_scanner_example_external_scanner_destroy(void *payload) {
|
||||
void tree_sitter_external_scanner_example_external_scanner_destroy(void *payload) {
|
||||
free(payload);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,21 +6,21 @@ enum {
|
|||
LINE_BREAK
|
||||
};
|
||||
|
||||
void *ts_language_shared_external_tokens_external_scanner_create() {
|
||||
void *tree_sitter_shared_external_tokens_external_scanner_create() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void ts_language_shared_external_tokens_external_scanner_reset(void *payload) {
|
||||
void tree_sitter_shared_external_tokens_external_scanner_reset(void *payload) {
|
||||
}
|
||||
|
||||
bool ts_language_shared_external_tokens_external_scanner_serialize(void *payload, TSExternalTokenState state) {
|
||||
bool tree_sitter_shared_external_tokens_external_scanner_serialize(void *payload, TSExternalTokenState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void ts_language_shared_external_tokens_external_scanner_deserialize(void *payload, TSExternalTokenState state) {
|
||||
void tree_sitter_shared_external_tokens_external_scanner_deserialize(void *payload, TSExternalTokenState state) {
|
||||
}
|
||||
|
||||
bool ts_language_shared_external_tokens_external_scanner_scan(
|
||||
bool tree_sitter_shared_external_tokens_external_scanner_scan(
|
||||
void *payload, TSLexer *lexer, const bool *whitelist) {
|
||||
|
||||
// If a line-break is a valid lookahead token, only skip spaces.
|
||||
|
|
@ -59,5 +59,5 @@ bool ts_language_shared_external_tokens_external_scanner_scan(
|
|||
return false;
|
||||
}
|
||||
|
||||
void ts_language_shared_external_tokens_external_scanner_destroy(void *payload) {
|
||||
void tree_sitter_shared_external_tokens_external_scanner_destroy(void *payload) {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ const TSLanguage *load_language(const string &source_filename,
|
|||
const string &lib_filename,
|
||||
const string &language_name,
|
||||
string external_scanner_filename = "") {
|
||||
string language_function_name = "ts_language_" + language_name;
|
||||
string language_function_name = "tree_sitter_" + language_name;
|
||||
string header_dir = getenv("PWD") + string("/include");
|
||||
int source_mtime = get_modified_time(source_filename);
|
||||
int header_mtime = get_modified_time(header_dir + "/tree_sitter/parser.h");
|
||||
|
|
|
|||
|
|
@ -355,7 +355,8 @@ class CCodeGenerator {
|
|||
}
|
||||
|
||||
void add_parser_export() {
|
||||
string external_scanner_name = "ts_language_" + name + "_external_scanner";
|
||||
string language_function_name = "tree_sitter_" + name;
|
||||
string external_scanner_name = language_function_name + "_external_scanner";
|
||||
|
||||
if (!syntax_grammar.external_tokens.empty()) {
|
||||
line("void *" + external_scanner_name + "_create();");
|
||||
|
|
@ -367,7 +368,7 @@ class CCodeGenerator {
|
|||
line();
|
||||
}
|
||||
|
||||
line("const TSLanguage *ts_language_" + name + "() {");
|
||||
line("const TSLanguage *" + language_function_name + "() {");
|
||||
indent([&]() {
|
||||
line("GET_LANGUAGE(");
|
||||
if (syntax_grammar.external_tokens.empty()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue