mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Allow require to return not a table in Lua

Browse Source
This commit is contained in:
Petr Mikheev 2022-02-12 11:59:39 +01:00
parent 2a7d28712f
commit 6876851766
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/lua/luastate.cpp
View File

@ -162,26 +162,27 @@ namespace LuaUtil
std::string envName = namePrefix + "[" + path + "]:"; std::string envName = namePrefix + "[" + path + "]:";
env["print"] = mLua["printGen"](envName); env["print"] = mLua["printGen"](envName);
auto maybeRunLoader = [&hiddenData](const sol::object& package) -> sol::object
{
if (package.is<sol::function>())
return call(package.as<sol::function>(), hiddenData);
else
return package;
};
sol::table loaded(mLua, sol::create); sol::table loaded(mLua, sol::create);
for (const auto& [key, value] : mCommonPackages) for (const auto& [key, value] : mCommonPackages)
loaded[key] = value; loaded[key] = maybeRunLoader(value);
for (const auto& [key, value] : packages) for (const auto& [key, value] : packages)
loaded[key] = value; loaded[key] = maybeRunLoader(value);
env["require"] = [this, env, loaded, hiddenData](std::string_view packageName) env["require"] = [this, env, loaded, hiddenData](std::string_view packageName) mutable
{ {
sol::table packages = loaded; sol::object package = loaded[packageName];
sol::object package = packages[packageName]; if (package != sol::nil)
if (package == sol::nil) return package;
{ sol::protected_function packageLoader = loadScriptAndCache(packageNameToVfsPath(packageName, mVFS));
sol::protected_function packageLoader = loadScriptAndCache(packageNameToVfsPath(packageName, mVFS)); sol::set_environment(env, packageLoader);
sol::set_environment(env, packageLoader); package = call(packageLoader, packageName);
package = call(packageLoader, packageName); loaded[packageName] = package;
if (!package.is<sol::table>())
throw std::runtime_error("Lua package must return a table.");
packages[packageName] = package;
}
else if (package.is<sol::function>())
package = packages[packageName] = call(package.as<sol::protected_function>(), hiddenData);
return package; return package;
}; };