fix: wrong environment used in modules imported by require(...)
This commit is contained in:
@@ -104,6 +104,9 @@ void lua::init_state(State* L, StateType stateType) {
|
||||
pushnil(L);
|
||||
setglobal(L, "io");
|
||||
|
||||
createtable(L, 0, 0);
|
||||
setglobal(L, "__vc__pack_envs");
|
||||
|
||||
const char* removed_os[] {
|
||||
"execute", "exit", "remove", "rename", "setlocale", "tmpname", nullptr};
|
||||
remove_lib_funcs(L, "os", removed_os);
|
||||
|
||||
@@ -181,7 +181,17 @@ std::unique_ptr<Process> scripting::start_coroutine(const io::path& script) {
|
||||
lua::setfield(L, "PACK_ENV");
|
||||
lua::pushstring(L, pack.id);
|
||||
lua::setfield(L, "PACK_ID");
|
||||
|
||||
lua::dump_stack(L);
|
||||
if(!lua::getglobal(L, "__vc__pack_envs")) {
|
||||
lua::createtable(L, 0, 0);
|
||||
lua::setglobal(L, "__vc__pack_envs");
|
||||
lua::pushvalue(L, -1);
|
||||
}
|
||||
lua::pushenv(L, id);
|
||||
lua::setfield(L, pack.id);
|
||||
lua::pop(L);
|
||||
|
||||
return std::shared_ptr<int>(new int(id), [=](int* id) { //-V508
|
||||
lua::remove_environment(L, *id);
|
||||
delete id;
|
||||
|
||||
Reference in New Issue
Block a user