mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-18 00:49:19 +02:00
Prefix error messages
When a Lua code fails to execute and throws an error, the log line now starts from `lua: Runtime error: `.
This commit is contained in:
@@ -57,15 +57,15 @@ std::string lua::get_error() const
|
|||||||
void lua::interpret(const std::string& file) const
|
void lua::interpret(const std::string& file) const
|
||||||
{
|
{
|
||||||
if (luaL_dofile(state, file.c_str())) {
|
if (luaL_dofile(state, file.c_str())) {
|
||||||
const char *str = lua_tostring(state, -1);
|
std::string str = lua_tostring(state, -1);
|
||||||
ErrorLog(std::string(str), logtype::lua);
|
ErrorLog("lua: Runtime error: " + str, logtype::lua);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int lua::atpanic(lua_State *s)
|
int lua::atpanic(lua_State *s)
|
||||||
{
|
{
|
||||||
std::string err = lua_tostring(s, 1);
|
std::string err = lua_tostring(s, -1);
|
||||||
ErrorLog(err, logtype::lua);
|
ErrorLog("lua: Runtime error: " + err, logtype::lua);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2141,7 +2141,7 @@ void lua_event::run_() {
|
|||||||
if (lua_func != LUA_NOREF)
|
if (lua_func != LUA_NOREF)
|
||||||
lua::dispatch_event(lua_state, lua_func, this, m_activator);
|
lua::dispatch_event(lua_state, lua_func, this, m_activator);
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
ErrorLog(simulation::Lua.get_error());
|
ErrorLog("lua: Runtime error: " + simulation::Lua.get_error());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user