LoweBowe
/
LumixEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better lua error reporting

This commit is contained in:
Mikulas Florek 2023-10-16 00:02:33 +02:00
parent c89841bb83
commit da79ebf048
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lua_script/editor/lua_script_plugins.cpp
View File

@ -649,7 +649,7 @@ struct EditorWindow : AssetEditorWindow {
#endif
};
static bool gatherRequires(Span<const u8> src, Lumix::Array<Path>& dependencies) {
static bool gatherRequires(Span<const u8> src, Lumix::Array<Path>& dependencies, const Path& path) {
lua_State* L = luaL_newstate();
auto reg_dep = [](lua_State* L) -> int {
@ -692,8 +692,10 @@ static bool gatherRequires(Span<const u8> src, Lumix::Array<Path>& dependencies)
lua_insert(L, -2); // new_g, meta
lua_setmetatable(L, -2); //new_g
bool errors = LuaWrapper::luaL_loadbuffer(L, (const char*)src.m_begin, src.length(), "gather_requires"); // new_g, fn
bool errors = LuaWrapper::luaL_loadbuffer(L, (const char*)src.m_begin, src.length(), path.c_str()); // new_g, fn
if (errors) {
const char* msg = lua_tostring(L, -1);
logError(msg);
lua_close(L);
return false;
}
@ -724,7 +726,7 @@ struct AssetPlugin : AssetBrowser::IPlugin, AssetCompiler::IPlugin {
if (!fs.getContentSync(src, src_data)) return false;
Array<Path> deps(m_app.getAllocator());
if (!gatherRequires(src_data, deps)) return false;
if (!gatherRequires(src_data, deps, src)) return false;
OutputMemoryStream out(m_app.getAllocator());
out.write(deps.size());

6
src/lua_script/lua_script_system.cpp
View File

@ -2408,11 +2408,7 @@ public:
lua_pushvalue(L, -3); // [lua_event, environment, func, lua_event]
if (lua_pcall(L, 1, 0, 0) != 0)// [lua_event, environment]
{
logError(lua_tostring(L, -1));
lua_pop(L, 1); // []
}
LuaWrapper::pcall(L, 1, 0); // [lua_event, environment]
lua_pop(L, 2); // []
}