diff options
| -rw-r--r-- | CMakeLists.txt | 24 | ||||
| -rw-r--r-- | src/gen/gen_char_blob.lua | 29 | ||||
| -rw-r--r-- | src/gen/gen_steps.zig | 3 | ||||
| -rw-r--r-- | src/nvim/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/nvim/lua/executor.c | 29 |
5 files changed, 21 insertions, 73 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 46c0122f85..114d8bf442 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,30 +206,6 @@ mark_as_advanced(LUA_GEN_PRG) message(STATUS "Using Lua interpreter for code generation: ${LUA_GEN_PRG}") option(COMPILE_LUA "Pre-compile Lua sources into bytecode (for sources that are included in the binary)" ON) -if(COMPILE_LUA AND NOT WIN32) - if(PREFER_LUA) - foreach(CURRENT_LUAC_PRG luac5.1 luac) - find_program(_CHECK_LUAC_PRG ${CURRENT_LUAC_PRG}) - if(_CHECK_LUAC_PRG) - # Escape "%" for string.format() (in gen_char_blob.lua). #39271 - string(REPLACE "%" "%%" _LUAC_PRG_ESCAPED "${_CHECK_LUAC_PRG}") - set(LUAC_PRG "${_LUAC_PRG_ESCAPED} -s -o - %q" CACHE STRING "Format for compiling to Lua bytecode") - break() - endif() - endforeach() - elseif(LUA_PRG MATCHES "luajit") - check_lua_module(${LUA_PRG} "jit.bcsave" LUAJIT_HAS_JIT_BCSAVE) - if(LUAJIT_HAS_JIT_BCSAVE) - # Escape "%" for string.format() (in gen_char_blob.lua). #39271 - string(REPLACE "%" "%%" _LUA_PRG_ESCAPED "${LUA_PRG}") - set(LUAC_PRG "${_LUA_PRG_ESCAPED} -b -s %q -" CACHE STRING "Format for compiling to Lua bytecode") - endif() - endif() -endif() -mark_as_advanced(LUAC_PRG) -if(LUAC_PRG) - message(STATUS "Using Lua compiler: ${LUAC_PRG}") -endif() # Lint option(CI_LINT "Abort if lint programs not found" OFF) diff --git a/src/gen/gen_char_blob.lua b/src/gen/gen_char_blob.lua index 230866c35d..16b059aaaa 100644 --- a/src/gen/gen_char_blob.lua +++ b/src/gen/gen_char_blob.lua @@ -12,6 +12,12 @@ end -- -c compile Lua bytecode local options = {} +local ignorelist = { + ['vim._core.editor'] = true, + ['vim._core.options'] = true, + ['vim.keymap'] = true, +} + while true do local opt = string.match(arg[1], '^-(%w)') if not opt then @@ -31,7 +37,6 @@ target:write('#include <stdint.h>\n\n') local index_items = {} -local warn_on_missing_compiler = true local modnames = {} for argi = 2, #arg, 2 do local source_file = arg[argi] @@ -44,22 +49,14 @@ for argi = 2, #arg, 2 do local varname = string.gsub(modname, '%.', '_dot_') .. '_module' target:write(('static const uint8_t %s[] = {\n'):format(varname)) - local output + local source = io.open(source_file, 'r') + or error(string.format("source_file %q doesn't exist", source_file)) + local output = source:read('*a') + source:close() if options.c then - local luac = os.getenv('LUAC_PRG') - if luac and luac ~= '' then - output = io.popen(luac:format(source_file), 'r'):read('*a') - elseif warn_on_missing_compiler then - print('LUAC_PRG is missing, embedding raw source') - warn_on_missing_compiler = false - end - end - - if not output then - local source = io.open(source_file, 'r') - or error(string.format("source_file %q doesn't exist", source_file)) - output = source:read('*a') - source:close() + local prefix = ignorelist[modname] and '' or '@' + local relpath = modname:gsub('%.', '/') + output = string.dump(assert((loadstring or load)(output, prefix .. relpath)), false) end local num_bytes = 0 diff --git a/src/gen/gen_steps.zig b/src/gen/gen_steps.zig index 794beb8df7..9ef57b29a0 100644 --- a/src/gen/gen_steps.zig +++ b/src/gen/gen_steps.zig @@ -64,8 +64,7 @@ pub fn nvim_gen_sources( { const gen_step = b.addRunArtifact(nlua0); gen_step.addFileArg(b.path("src/gen/gen_char_blob.lua")); - // TODO(bfredl): LUAC_PRG is missing. tricky with cross-compiling.. - // gen_step.addArg("-c"); + gen_step.addArg("-c"); _ = gen_header(b, gen_step, "lua/vim_module.generated.h", gen_headers); // NB: vim._init_packages and vim.inspect must be be first and second ones // respectively, otherwise --luamod-dev won't work properly. diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index b8160fea4b..42bd94acd0 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -362,6 +362,11 @@ foreach(core_source ${LUA_CORE_MODULE_SOURCES}) list(APPEND LUA_CORE_COMMAND_ARGS ${core_source} "vim._core.${core_filename}") endforeach() +set(LUA_BLOB_COMPILE_FLAG) +if(COMPILE_LUA AND NOT WIN32) + set(LUA_BLOB_COMPILE_FLAG -c) +endif() + file(GLOB API_HEADERS CONFIGURE_DEPENDS api/*.h) list(REMOVE_ITEM API_HEADERS ${CMAKE_CURRENT_LIST_DIR}/api/ui_events.in.h) file(GLOB MSGPACK_RPC_HEADERS CONFIGURE_DEPENDS msgpack_rpc/*.h) @@ -636,9 +641,7 @@ add_custom_command( add_custom_command( OUTPUT ${VIM_MODULE_FILE} - COMMAND ${CMAKE_COMMAND} -E env - "LUAC_PRG=${LUAC_PRG}" - ${LUA_PRG} ${CHAR_BLOB_GENERATOR} -c ${VIM_MODULE_FILE} + COMMAND ${LUA_PRG} ${CHAR_BLOB_GENERATOR} ${LUA_BLOB_COMPILE_FLAG} ${VIM_MODULE_FILE} # NB: vim._init_packages and vim.inspect must be be first and second ones # respectively, otherwise --luamod-dev won't work properly. ${LUA_INIT_PACKAGES_MODULE_SOURCE} "vim._init_packages" diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c index 3641ec56b5..6893c59e0e 100644 --- a/src/nvim/lua/executor.c +++ b/src/nvim/lua/executor.c @@ -672,13 +672,7 @@ static int nlua_module_preloader(lua_State *lstate) { size_t i = (size_t)lua_tointeger(lstate, lua_upvalueindex(1)); ModuleDef def = builtin_modules[i]; - char name[256]; - name[0] = '@'; - size_t off = xstrlcpy(name + 1, def.name, (sizeof name) - 2); - strchrsub(name + 1, '.', '/'); - xstrlcpy(name + 1 + off, ".lua", (sizeof name) - 2 - off); - - if (luaL_loadbuffer(lstate, (const char *)def.data, def.size - 1, name)) { + if (luaL_loadbuffer(lstate, (const char *)def.data, def.size - 1, NULL)) { return lua_error(lstate); } @@ -2167,15 +2161,6 @@ void nlua_set_sctx(sctx_T *current) lua_State *const lstate = active_lstate; lua_Debug *info = (lua_Debug *)xmalloc(sizeof(lua_Debug)); - // Files where internal wrappers are defined so we can ignore them - // like vim.o/opt etc are defined in _options.lua - char *ignorelist[] = { - "vim/_core/editor.lua", - "vim/_core/options.lua", - "vim/keymap.lua", - }; - int ignorelist_size = sizeof(ignorelist) / sizeof(ignorelist[0]); - for (int level = 1; true; level++) { if (lua_getstack(lstate, level, info) != 1) { goto cleanup; @@ -2183,19 +2168,7 @@ void nlua_set_sctx(sctx_T *current) if (lua_getinfo(lstate, "nSl", info) == 0) { goto cleanup; } - - bool is_ignored = false; if (info->what[0] == 'C' || info->source[0] != '@') { - is_ignored = true; - } else { - for (int i = 0; i < ignorelist_size; i++) { - if (strncmp(ignorelist[i], info->source + 1, strlen(ignorelist[i])) == 0) { - is_ignored = true; - break; - } - } - } - if (is_ignored) { continue; } break; |