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

Handle rename symbols in ts_language APIs

Browse source
This commit is contained in:
Max Brunsfeld 2017-07-18 12:01:52 -07:00
parent 20b664969e
commit afb499bf2e
6 changed files with 84 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/compiler/generate_code/c_code.cc
View file

@ -147,13 +147,16 @@ class CCodeGenerator {
max_rename_sequence_length = rename_sequence.size();
}
for (const string &name_replacement : rename_sequence) {
unique_replacement_names.insert(name_replacement);
if (!name_replacement.empty()) {
unique_replacement_names.insert(name_replacement);
}
}
}
line("#define LANGUAGE_VERSION " + to_string(TREE_SITTER_LANGUAGE_VERSION));
line("#define STATE_COUNT " + to_string(parse_table.states.size()));
line("#define SYMBOL_COUNT " + to_string(parse_table.symbols.size()));
line("#define RENAME_SYMBOL_COUNT " + to_string(unique_replacement_names.size()));
line("#define TOKEN_COUNT " + to_string(token_count));
line("#define EXTERNAL_TOKEN_COUNT " + to_string(syntax_grammar.external_tokens.size()));
line("#define MAX_RENAME_SEQUENCE_LENGTH " + to_string(max_rename_sequence_length));
@ -229,7 +232,7 @@ class CCodeGenerator {
}
void add_symbol_metadata_list() {
line("static const TSSymbolMetadata ts_symbol_metadata[SYMBOL_COUNT] = {");
line("static const TSSymbolMetadata ts_symbol_metadata[] = {");
indent([&]() {
for (const auto &entry : parse_table.symbols) {
const Symbol &symbol = entry.first;
@ -260,6 +263,17 @@ class CCodeGenerator {
line("},");
}
for (const string &replacement_name : unique_replacement_names) {
line("[" + rename_id(replacement_name) + "] = {");
indent([&]() {
line(".visible = true,");
line(".named = true,");
line(".structural = true,");
line(".extra = true,");
});
line("},");
}
});
line("};");
line();

12
src/runtime/language.c
View file

@ -32,7 +32,7 @@ void ts_language_table_entry(const TSLanguage *self, TSStateId state,
}
uint32_t ts_language_symbol_count(const TSLanguage *language) {
return language->symbol_count;
return language->symbol_count + language->rename_symbol_count;
}
uint32_t ts_language_version(const TSLanguage *language) {
@ -41,19 +41,21 @@ uint32_t ts_language_version(const TSLanguage *language) {
TSSymbolMetadata ts_language_symbol_metadata(const TSLanguage *language,
TSSymbol symbol) {
if (symbol == ts_builtin_sym_error)
if (symbol == ts_builtin_sym_error) {
return (TSSymbolMetadata){
.visible = true, .named = true, .extra = false, .structural = true,
};
else
} else {
return language->symbol_metadata[symbol];
}
}
const char *ts_language_symbol_name(const TSLanguage *language, TSSymbol symbol) {
if (symbol == ts_builtin_sym_error)
if (symbol == ts_builtin_sym_error) {
return "ERROR";
else
} else {
return language->symbol_names[symbol];
}
}
TSSymbolType ts_language_symbol_type(const TSLanguage *language, TSSymbol symbol) {

7
src/runtime/node.c
View file

@ -264,7 +264,8 @@ TSPoint ts_node_end_point(TSNode self) {
}
TSSymbol ts_node_symbol(TSNode self) {
return ts_node__tree(self)->symbol;
const Tree *tree = ts_node__tree(self);
return tree->context.rename_symbol ? tree->context.rename_symbol : tree->symbol;
}
TSSymbolIterator ts_node_symbols(TSNode self) {
@ -288,9 +289,7 @@ void ts_symbol_iterator_next(TSSymbolIterator *self) {
}
const char *ts_node_type(TSNode self, const TSDocument *document) {
const Tree *tree = ts_node__tree(self);
TSSymbol symbol = tree->context.rename_symbol ? tree->context.rename_symbol : tree->symbol;
return ts_language_symbol_name(document->parser.language, symbol);
return ts_language_symbol_name(document->parser.language, ts_node_symbol(self));
}
char *ts_node_string(TSNode self, const TSDocument *document) {