0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup lua error formatting

Browse source
This commit is contained in:
Chris Beck 2014-11-13 20:29:07 -05:00
parent 51baab8836
commit 59507f3d09
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game_errors.hpp
View file

@ -52,7 +52,7 @@ struct game_error : public error {
*/
struct lua_error : public error {
lua_error(const std::string& msg) : error("lua_error: " + msg) {}
lua_error(const std::string& msg, const std::string& context) : error(context + ": " + msg) {}
lua_error(const std::string& msg, const std::string& context) : error(context + ":\n " + msg) {}
};
/**

18
src/scripting/lua_kernel_base.cpp
View file

@ -487,15 +487,15 @@ bool lua_kernel_base::protected_call(int nArgs, int nRets, error_handler e_h)
std::string context = "When executing, ";
if (errcode == LUA_ERRRUN) {
context += "Lua runtime error: ";
context += "Lua runtime error";
} else if (errcode == LUA_ERRERR) {
context += "Lua error in attached debugger: ";
context += "Lua error in attached debugger";
} else if (errcode == LUA_ERRMEM) {
context += "Lua out of memory error: ";
context += "Lua out of memory error";
} else if (errcode == LUA_ERRGCMM) {
context += "Lua error in garbage collection metamethod: ";
context += "Lua error in garbage collection metamethod";
} else {
context += "unknown lua error: ";
context += "unknown lua error";
}
lua_pop(mState, 1);
@ -517,13 +517,13 @@ bool lua_kernel_base::load_string(char const * prog, error_handler e_h)
std::string context = "When parsing a string to lua, ";
if (errcode == LUA_ERRSYNTAX) {
msg += " a syntax error: ";
context += " a syntax error";
} else if(errcode == LUA_ERRMEM){
msg += " a memory error: ";
context += " a memory error";
} else if(errcode == LUA_ERRGCMM) {
msg += " an error in garbage collection metamethod: ";
context += " an error in garbage collection metamethod";
} else {
msg += " an unknown error: ";
context += " an unknown error";
}
lua_pop(mState, 1);