Add Client::getEnv() and remove some unnecessary wrappers

[minetest.git] / src / script.cpp

diff --git a/src/script.cpp b/src/script.cpp
index 8b1b7013e9ff7210854c9fefde58ca57f1b4b701..1925ea701554ffdcc0f5ed86fc2de8ad2af3d767 100644 (file)
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -35,13 +35,19 @@ LuaError::LuaError(lua_State *L, const std::string &s)
 {
        m_s = "LuaError: ";
        m_s += s + "\n";
+       m_s += script_get_backtrace(L);
+}
+
+std::string script_get_backtrace(lua_State *L)
+{
+       std::string s;
        lua_getfield(L, LUA_GLOBALSINDEX, "debug");
        if(lua_istable(L, -1)){
                lua_getfield(L, -1, "traceback");
                if(lua_isfunction(L, -1)){
                        lua_call(L, 0, 1);
                        if(lua_isstring(L, -1)){
-                               m_s += lua_tostring(L, -1);
+                               s += lua_tostring(L, -1);
                        }
                        lua_pop(L, 1);
                }
@@ -50,6 +56,7 @@ LuaError::LuaError(lua_State *L, const std::string &s)
                }
        }
        lua_pop(L, 1);
+       return s;
 }
 
 void script_error(lua_State *L, const char *fmt, ...)
@@ -82,7 +89,7 @@ int luaErrorHandler(lua_State *L) {
 
 bool script_load(lua_State *L, const char *path)
 {
-       infostream<<"Loading and running script from "<<path<<std::endl;
+       verbosestream<<"Loading and running script from "<<path<<std::endl;
 
        lua_pushcfunction(L, luaErrorHandler);
        int errorhandler = lua_gettop(L);
@@ -94,8 +101,10 @@ bool script_load(lua_State *L, const char *path)
                errorstream<<"[LUA] "<<lua_tostring(L, -1)<<std::endl;
                errorstream<<"[LUA] "<<std::endl;
                lua_pop(L, 1); // Pop error message from stack
+               lua_pop(L, 1); // Pop the error handler from stack
                return false;
        }
+       lua_pop(L, 1); // Pop the error handler from stack
        return true;
 }