mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 23:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

treesitter: refactor some things

Browse Source
This commit is contained in:
Thomas Vigouroux
2020-11-10 16:39:53 +01:00
parent 029b5d036d
commit 9ff6760b2d
1 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/nvim/lua/treesitter.c
View File

@@ -22,6 +22,13 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#define TS_META_PARSER "treesitter_parser"
#define TS_META_TREE "treesitter_tree"
#define TS_META_NODE "treesitter_node"
#define TS_META_QUERY "treesitter_query"
#define TS_META_QUERYCURSOR "treesitter_querycursor"
#define TS_META_TREECURSOR "treesitter_treecursor"
typedef struct { typedef struct {
TSQueryCursor *cursor; TSQueryCursor *cursor;
int predicated_match; int predicated_match;
@@ -115,12 +122,12 @@ void tslua_init(lua_State *L)
langs = pmap_new(cstr_t)(); langs = pmap_new(cstr_t)();
// type metatables // type metatables
build_meta(L, "treesitter_parser", parser_meta); build_meta(L, TS_META_PARSER, parser_meta);
build_meta(L, "treesitter_tree", tree_meta); build_meta(L, TS_META_TREE, tree_meta);
build_meta(L, "treesitter_node", node_meta); build_meta(L, TS_META_NODE, node_meta);
build_meta(L, "treesitter_query", query_meta); build_meta(L, TS_META_QUERY, query_meta);
build_meta(L, "treesitter_querycursor", querycursor_meta); build_meta(L, TS_META_QUERYCURSOR, querycursor_meta);
build_meta(L, "treesitter_treecursor", treecursor_meta); build_meta(L, TS_META_TREECURSOR, treecursor_meta);
} }
int tslua_has_language(lua_State *L) int tslua_has_language(lua_State *L)
@@ -132,12 +139,8 @@ int tslua_has_language(lua_State *L)
int tslua_add_language(lua_State *L) int tslua_add_language(lua_State *L)
{ {
if (lua_gettop(L) < 2 || !lua_isstring(L, 1) || !lua_isstring(L, 2)) { const char *path = luaL_checkstring(L, 1);
return luaL_error(L, "string expected"); const char *lang_name = luaL_checkstring(L, 2);
}
const char *path = lua_tostring(L, 1);
const char *lang_name = lua_tostring(L, 2);
if (pmap_has(cstr_t)(langs, lang_name)) { if (pmap_has(cstr_t)(langs, lang_name)) {
return 0; return 0;
@@ -176,8 +179,8 @@ int tslua_add_language(lua_State *L)
|| lang_version > TREE_SITTER_LANGUAGE_VERSION) { || lang_version > TREE_SITTER_LANGUAGE_VERSION) {
return luaL_error( return luaL_error(
L, L,
"ABI version mismatch : expected %d, found %d", "ABI version mismatch : supported between %d and %d, found %d",
TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION, lang_version); TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION, TREE_SITTER_LANGUAGE_VERSION, lang_version);
} }
pmap_put(cstr_t)(langs, xstrdup(lang_name), lang); pmap_put(cstr_t)(langs, xstrdup(lang_name), lang);
@@ -188,10 +191,7 @@ int tslua_add_language(lua_State *L)
int tslua_inspect_lang(lua_State *L) int tslua_inspect_lang(lua_State *L)
{ {
if (lua_gettop(L) < 1 || !lua_isstring(L, 1)) { const char *lang_name = luaL_checkstring(L, 1);
return luaL_error(L, "string expected");
}
const char *lang_name = lua_tostring(L, 1);
TSLanguage *lang = pmap_get(cstr_t)(langs, lang_name); TSLanguage *lang = pmap_get(cstr_t)(langs, lang_name);
if (!lang) { if (!lang) {
@@ -232,11 +232,9 @@ int tslua_inspect_lang(lua_State *L)
int tslua_push_parser(lua_State *L) int tslua_push_parser(lua_State *L)
{ {
// Gather language // Gather language name
if (lua_gettop(L) < 1 || !lua_isstring(L, 1)) { const char *lang_name = luaL_checkstring(L, 1);
return luaL_error(L, "string expected");
}
const char *lang_name = lua_tostring(L, 1);
TSLanguage *lang = pmap_get(cstr_t)(langs, lang_name); TSLanguage *lang = pmap_get(cstr_t)(langs, lang_name);
if (!lang) { if (!lang) {
return luaL_error(L, "no such language: %s", lang_name); return luaL_error(L, "no such language: %s", lang_name);
@@ -250,14 +248,14 @@ int tslua_push_parser(lua_State *L)
return luaL_error(L, "Failed to load language : %s", lang_name); return luaL_error(L, "Failed to load language : %s", lang_name);
} }
lua_getfield(L, LUA_REGISTRYINDEX, "treesitter_parser"); // [udata, meta] lua_getfield(L, LUA_REGISTRYINDEX, TS_META_PARSER); // [udata, meta]
lua_setmetatable(L, -2); // [udata] lua_setmetatable(L, -2); // [udata]
return 1; return 1;
} }
static TSParser ** parser_check(lua_State *L, uint16_t index) static TSParser ** parser_check(lua_State *L, uint16_t index)
{ {
return luaL_checkudata(L, index, "treesitter_parser"); return luaL_checkudata(L, index, TS_META_PARSER);
} }
static int parser_gc(lua_State *L) static int parser_gc(lua_State *L)
@@ -388,7 +386,7 @@ static int parser_parse(lua_State *L)
TSRange *changed = old_tree ? ts_tree_get_changed_ranges( TSRange *changed = old_tree ? ts_tree_get_changed_ranges(
old_tree, new_tree, &n_ranges) : NULL; old_tree, new_tree, &n_ranges) : NULL;
tslua_push_tree(L, new_tree, false); // [tree] push_tree(L, new_tree, false); // [tree]
push_ranges(L, changed, n_ranges); // [tree, ranges] push_ranges(L, changed, n_ranges); // [tree, ranges]
@@ -403,7 +401,7 @@ static int tree_copy(lua_State *L)
return 0; return 0;
} }
tslua_push_tree(L, *tree, true); // [tree] push_tree(L, *tree, true); // [tree]
return 1; return 1;
} }
@@ -506,7 +504,7 @@ static int parser_get_ranges(lua_State *L)
/// push tree interface on lua stack. /// push tree interface on lua stack.
/// ///
/// This makes a copy of the tree, so ownership of the argument is unaffected. /// This makes a copy of the tree, so ownership of the argument is unaffected.
void tslua_push_tree(lua_State *L, TSTree *tree, bool do_copy) void push_tree(lua_State *L, TSTree *tree, bool do_copy)
{ {
if (tree == NULL) { if (tree == NULL) {
lua_pushnil(L); lua_pushnil(L);
@@ -520,7 +518,7 @@ void tslua_push_tree(lua_State *L, TSTree *tree, bool do_copy)
*ud = tree; *ud = tree;
} }
lua_getfield(L, LUA_REGISTRYINDEX, "treesitter_tree"); // [udata, meta] lua_getfield(L, LUA_REGISTRYINDEX, TS_META_TREE); // [udata, meta]
lua_setmetatable(L, -2); // [udata] lua_setmetatable(L, -2); // [udata]
// table used for node wrappers to keep a reference to tree wrapper // table used for node wrappers to keep a reference to tree wrapper
@@ -534,7 +532,7 @@ void tslua_push_tree(lua_State *L, TSTree *tree, bool do_copy)
static TSTree **tree_check(lua_State *L, uint16_t index) static TSTree **tree_check(lua_State *L, uint16_t index)
{ {
TSTree **ud = luaL_checkudata(L, index, "treesitter_tree"); TSTree **ud = luaL_checkudata(L, index, TS_META_TREE);
return ud; return ud;
} }
@@ -582,7 +580,7 @@ static void push_node(lua_State *L, TSNode node, int uindex)
} }
TSNode *ud = lua_newuserdata(L, sizeof(TSNode)); // [udata] TSNode *ud = lua_newuserdata(L, sizeof(TSNode)); // [udata]
*ud = node; *ud = node;
lua_getfield(L, LUA_REGISTRYINDEX, "treesitter_node"); // [udata, meta] lua_getfield(L, LUA_REGISTRYINDEX, TS_META_NODE); // [udata, meta]
lua_setmetatable(L, -2); // [udata] lua_setmetatable(L, -2); // [udata]
lua_getfenv(L, uindex); // [udata, reftable] lua_getfenv(L, uindex); // [udata, reftable]
lua_setfenv(L, -2); // [udata] lua_setfenv(L, -2); // [udata]
@@ -590,7 +588,7 @@ static void push_node(lua_State *L, TSNode node, int uindex)
static bool node_check(lua_State *L, int index, TSNode *res) static bool node_check(lua_State *L, int index, TSNode *res)
{ {
TSNode *ud = luaL_checkudata(L, index, "treesitter_node"); TSNode *ud = luaL_checkudata(L, index, TS_META_NODE);
if (ud) { if (ud) {
*res = *ud; *res = *ud;
return true; return true;
@@ -618,13 +616,12 @@ static int node_eq(lua_State *L)
if (!node_check(L, 1, &node)) { if (!node_check(L, 1, &node)) {
return 0; return 0;
} }
// This should only be called if both x and y in "x == y" has the
// treesitter_node metatable. So it is ok to error out otherwise. TSNode node2;
TSNode *ud = luaL_checkudata(L, 2, "treesitter_node"); if (!node_check(L, 2, &node2)) {
if (!ud) {
return 0; return 0;
} }
TSNode node2 = *ud;
lua_pushboolean(L, ts_node_eq(node, node2)); lua_pushboolean(L, ts_node_eq(node, node2));
return 1; return 1;
} }
@@ -859,7 +856,7 @@ static int node_named_descendant_for_range(lua_State *L)
static int node_next_child(lua_State *L) static int node_next_child(lua_State *L)
{ {
TSTreeCursor *ud = luaL_checkudata( TSTreeCursor *ud = luaL_checkudata(
L, lua_upvalueindex(1), "treesitter_treecursor"); L, lua_upvalueindex(1), TS_META_TREECURSOR);
if (!ud) { if (!ud) {
return 0; return 0;
} }
@@ -909,7 +906,7 @@ static int node_iter_children(lua_State *L)
TSTreeCursor *ud = lua_newuserdata(L, sizeof(TSTreeCursor)); // [udata] TSTreeCursor *ud = lua_newuserdata(L, sizeof(TSTreeCursor)); // [udata]
*ud = ts_tree_cursor_new(source); *ud = ts_tree_cursor_new(source);
lua_getfield(L, LUA_REGISTRYINDEX, "treesitter_treecursor"); // [udata, mt] lua_getfield(L, LUA_REGISTRYINDEX, TS_META_TREECURSOR); // [udata, mt]
lua_setmetatable(L, -2); // [udata] lua_setmetatable(L, -2); // [udata]
lua_pushvalue(L, 1); // [udata, source_node] lua_pushvalue(L, 1); // [udata, source_node]
lua_pushcclosure(L, node_next_child, 2); lua_pushcclosure(L, node_next_child, 2);
@@ -919,7 +916,7 @@ static int node_iter_children(lua_State *L)
static int treecursor_gc(lua_State *L) static int treecursor_gc(lua_State *L)
{ {
TSTreeCursor *ud = luaL_checkudata(L, 1, "treesitter_treecursor"); TSTreeCursor *ud = luaL_checkudata(L, 1, TS_META_TREECURSOR);
ts_tree_cursor_delete(ud); ts_tree_cursor_delete(ud);
return 0; return 0;
} }
@@ -1031,7 +1028,7 @@ static int node_rawquery(lua_State *L)
ud->cursor = cursor; ud->cursor = cursor;
ud->predicated_match = -1; ud->predicated_match = -1;
lua_getfield(L, LUA_REGISTRYINDEX, "treesitter_querycursor"); lua_getfield(L, LUA_REGISTRYINDEX, TS_META_QUERYCURSOR);
lua_setmetatable(L, -2); // [udata] lua_setmetatable(L, -2); // [udata]
lua_pushvalue(L, 1); // [udata, node] lua_pushvalue(L, 1); // [udata, node]
@@ -1051,7 +1048,7 @@ static int node_rawquery(lua_State *L)
static int querycursor_gc(lua_State *L) static int querycursor_gc(lua_State *L)
{ {
TSLua_cursor *ud = luaL_checkudata(L, 1, "treesitter_querycursor"); TSLua_cursor *ud = luaL_checkudata(L, 1, TS_META_QUERYCURSOR);
ts_query_cursor_delete(ud->cursor); ts_query_cursor_delete(ud->cursor);
return 0; return 0;
} }
@@ -1084,7 +1081,7 @@ int ts_lua_parse_query(lua_State *L)
TSQuery **ud = lua_newuserdata(L, sizeof(TSQuery *)); // [udata] TSQuery **ud = lua_newuserdata(L, sizeof(TSQuery *)); // [udata]
*ud = query; *ud = query;
lua_getfield(L, LUA_REGISTRYINDEX, "treesitter_query"); // [udata, meta] lua_getfield(L, LUA_REGISTRYINDEX, TS_META_QUERY); // [udata, meta]
lua_setmetatable(L, -2); // [udata] lua_setmetatable(L, -2); // [udata]
return 1; return 1;
} }
@@ -1102,7 +1099,7 @@ static const char *query_err_string(TSQueryError err) {
static TSQuery *query_check(lua_State *L, int index) static TSQuery *query_check(lua_State *L, int index)
{ {
TSQuery **ud = luaL_checkudata(L, index, "treesitter_query"); TSQuery **ud = luaL_checkudata(L, index, TS_META_QUERY);
return *ud; return *ud;
} }