Remove lua_State parameter from LuaError::LuaError

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 899e1c53668c6c331e19ddd00ecec78e4db8c09f..2898d28ae7a7464d33b57b220585ac49a1dda178 100644 (file)
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -654,7 +654,7 @@ ItemStack read_item(lua_State* L, int index,Server* srv)
        }
        else
        {
-               throw LuaError(NULL, "Expecting itemstack, itemstring, table or nil");
+               throw LuaError("Expecting itemstack, itemstring, table or nil");
        }
 }
 
@@ -941,7 +941,7 @@ std::vector<ItemStack> read_items(lua_State *L, int index, Server *srv)
        while (lua_next(L, index)) {
                s32 key = luaL_checkinteger(L, -2);
                if (key < 1) {
-                       throw LuaError(NULL, "Invalid inventory list index");
+                       throw LuaError("Invalid inventory list index");
                }
                if (items.size() < (u32) key) {
                        items.resize(key);

diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp
index 90846676ffebcecc6d33a1083b25b88927df5846..4263dec90d4e0e1dad6f2b600c24df7e2d9d0c56 100644 (file)
--- a/src/script/common/c_internal.cpp
+++ b/src/script/common/c_internal.cpp
@@ -71,7 +71,7 @@ void script_error(lua_State *L)
 {
        const char *s = lua_tostring(L, -1);
        std::string str(s ? s : "");
-       throw LuaError(NULL, str);
+       throw LuaError(str);
 }
 
 // Push the list of callbacks (a lua table).

diff --git a/src/script/common/c_types.cpp b/src/script/common/c_types.cpp
index 6ffad1cb1eb5a09bfa65cb5539de9e2dc696ed08..e832ff2ab8db54239743985b001ef0558118f7fa 100644 (file)
--- a/src/script/common/c_types.cpp
+++ b/src/script/common/c_types.cpp
@@ -23,13 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common/c_internal.h"
 #include "itemdef.h"
 
-LuaError::LuaError(lua_State *L, const std::string &s) :
-       ServerError(s)
-{
-       if (L) {
-               m_s += '\n' + script_get_backtrace(L);
-       }
-}
 
 struct EnumString es_ItemType[] =
        {

diff --git a/src/script/common/c_types.h b/src/script/common/c_types.h
index 709d4f34b12ea2f2d339cdd9a76d08bd457b2f1d..7064707379a80517636dca095a0df59302b758e5 100644 (file)
--- a/src/script/common/c_types.h
+++ b/src/script/common/c_types.h
@@ -55,14 +55,7 @@ public:
 class LuaError : public ServerError
 {
 public:
-       LuaError(lua_State *L, const std::string &s);
-
-       virtual ~LuaError() throw()
-       {}
-       virtual const char * what() const throw()
-       {
-               return m_s.c_str();
-       }
+       LuaError(const std::string &s) : ServerError(s) {}
 };
 
 

diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp
index e28a34eeed61d3473fd01a845a29363bedb2cc5d..932cc501577f1aa7eac85c87dcc0d4307fef2db4 100644 (file)
--- a/src/script/cpp_api/s_base.cpp
+++ b/src/script/cpp_api/s_base.cpp
@@ -151,13 +151,14 @@ void ScriptApiBase::realityCheck()
        if(top >= 30){
                dstream<<"Stack is over 30:"<<std::endl;
                stackDump(dstream);
-               throw LuaError(m_luastack, "Stack is over 30 (reality check)");
+               std::string traceback = script_get_backtrace(m_luastack);
+               throw LuaError("Stack is over 30 (reality check)\n" + traceback);
        }
 }
 
 void ScriptApiBase::scriptError()
 {
-       throw LuaError(NULL, lua_tostring(m_luastack, -1));
+       throw LuaError(lua_tostring(m_luastack, -1));
 }
 
 void ScriptApiBase::stackDump(std::ostream &o)

diff --git a/src/script/cpp_api/s_inventory.cpp b/src/script/cpp_api/s_inventory.cpp
index db3c13fe00a234fe20dc42f8a4b8842610cb929c..835c0818fe76eae9811e2b437e60a183e48a68a9 100644 (file)
--- a/src/script/cpp_api/s_inventory.cpp
+++ b/src/script/cpp_api/s_inventory.cpp
@@ -54,7 +54,7 @@ int ScriptApiDetached::detached_inventory_AllowMove(
        if(lua_pcall(L, 7, 1, errorhandler))
                scriptError();
        if(!lua_isnumber(L, -1))
-               throw LuaError(NULL, "allow_move should return a number");
+               throw LuaError("allow_move should return a number");
        int ret = luaL_checkinteger(L, -1);
        lua_pop(L, 2); // Pop integer and error handler
        return ret;
@@ -86,7 +86,7 @@ int ScriptApiDetached::detached_inventory_AllowPut(
        if(lua_pcall(L, 5, 1, errorhandler))
                scriptError();
        if(!lua_isnumber(L, -1))
-               throw LuaError(NULL, "allow_put should return a number");
+               throw LuaError("allow_put should return a number");
        int ret = luaL_checkinteger(L, -1);
        lua_pop(L, 2); // Pop integer and error handler
        return ret;
@@ -118,7 +118,7 @@ int ScriptApiDetached::detached_inventory_AllowTake(
        if(lua_pcall(L, 5, 1, errorhandler))
                scriptError();
        if(!lua_isnumber(L, -1))
-               throw LuaError(NULL, "allow_take should return a number");
+               throw LuaError("allow_take should return a number");
        int ret = luaL_checkinteger(L, -1);
        lua_pop(L, 2); // Pop integer and error handler
        return ret;

diff --git a/src/script/cpp_api/s_nodemeta.cpp b/src/script/cpp_api/s_nodemeta.cpp
index e15abd40f34ddbdce91794e174b7298df66f9fb4..2fb68394317b216f0a3de2c8eb681c9d9bbad3f0 100644 (file)
--- a/src/script/cpp_api/s_nodemeta.cpp
+++ b/src/script/cpp_api/s_nodemeta.cpp
@@ -61,7 +61,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowMove(v3s16 p,
                scriptError();
        lua_remove(L, errorhandler); // Remove error handler
        if(!lua_isnumber(L, -1))
-               throw LuaError(NULL, "allow_metadata_inventory_move should"
+               throw LuaError("allow_metadata_inventory_move should"
                                " return a number, guilty node: " + nodename);
        int num = luaL_checkinteger(L, -1);
        lua_pop(L, 1); // Pop integer
@@ -100,7 +100,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowPut(v3s16 p,
                scriptError();
        lua_remove(L, errorhandler); // Remove error handler
        if(!lua_isnumber(L, -1))
-               throw LuaError(NULL, "allow_metadata_inventory_put should"
+               throw LuaError("allow_metadata_inventory_put should"
                                " return a number, guilty node: " + nodename);
        int num = luaL_checkinteger(L, -1);
        lua_pop(L, 1); // Pop integer
@@ -139,7 +139,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowTake(v3s16 p,
                scriptError();
        lua_remove(L, errorhandler); // Remove error handler
        if(!lua_isnumber(L, -1))
-               throw LuaError(NULL, "allow_metadata_inventory_take should"
+               throw LuaError("allow_metadata_inventory_take should"
                                " return a number, guilty node: " + nodename);
        int num = luaL_checkinteger(L, -1);
        lua_pop(L, 1); // Pop integer

diff --git a/src/script/cpp_api/s_server.cpp b/src/script/cpp_api/s_server.cpp
index 98320b5785fcdd919a7ef96bb8cfcb0428678b3b..bffd4d3fa5ee811a260e3343eefd61ba17afec39 100644 (file)
--- a/src/script/cpp_api/s_server.cpp
+++ b/src/script/cpp_api/s_server.cpp
@@ -33,7 +33,7 @@ bool ScriptApiServer::getAuth(const std::string &playername,
        getAuthHandler();
        lua_getfield(L, -1, "get_auth");
        if(lua_type(L, -1) != LUA_TFUNCTION)
-               throw LuaError(NULL, "Authentication handler missing get_auth");
+               throw LuaError("Authentication handler missing get_auth");
        lua_pushstring(L, playername.c_str());
        if(lua_pcall(L, 1, 1, errorhandler))
                scriptError();
@@ -48,13 +48,13 @@ bool ScriptApiServer::getAuth(const std::string &playername,
        std::string password;
        bool found = getstringfield(L, -1, "password", password);
        if(!found)
-               throw LuaError(NULL, "Authentication handler didn't return password");
+               throw LuaError("Authentication handler didn't return password");
        if(dst_password)
                *dst_password = password;
 
        lua_getfield(L, -1, "privileges");
        if(!lua_istable(L, -1))
-               throw LuaError(NULL, "Authentication handler didn't return privilege table");
+               throw LuaError("Authentication handler didn't return privilege table");
        if(dst_privs)
                readPrivileges(-1, *dst_privs);
        lua_pop(L, 1);
@@ -74,7 +74,7 @@ void ScriptApiServer::getAuthHandler()
        }
        lua_remove(L, -2); // Remove minetest
        if(lua_type(L, -1) != LUA_TTABLE)
-               throw LuaError(NULL, "Authentication handler table not valid");
+               throw LuaError("Authentication handler table not valid");
 }
 
 void ScriptApiServer::readPrivileges(int index, std::set<std::string> &result)
@@ -108,7 +108,7 @@ void ScriptApiServer::createAuth(const std::string &playername,
        lua_getfield(L, -1, "create_auth");
        lua_remove(L, -2); // Remove auth handler
        if(lua_type(L, -1) != LUA_TFUNCTION)
-               throw LuaError(NULL, "Authentication handler missing create_auth");
+               throw LuaError("Authentication handler missing create_auth");
        lua_pushstring(L, playername.c_str());
        lua_pushstring(L, password.c_str());
        if(lua_pcall(L, 2, 0, errorhandler))
@@ -128,7 +128,7 @@ bool ScriptApiServer::setPassword(const std::string &playername,
        lua_getfield(L, -1, "set_password");
        lua_remove(L, -2); // Remove auth handler
        if(lua_type(L, -1) != LUA_TFUNCTION)
-               throw LuaError(NULL, "Authentication handler missing set_password");
+               throw LuaError("Authentication handler missing set_password");
        lua_pushstring(L, playername.c_str());
        lua_pushstring(L, password.c_str());
        if(lua_pcall(L, 2, 1, errorhandler))

diff --git a/src/script/lua_api/l_base.h b/src/script/lua_api/l_base.h
index 694ce5a1e3b1709c9a2681b8ef49be1f8613067a..debbcd09b521a35aef166799dd14667441db188d 100644 (file)
--- a/src/script/lua_api/l_base.h
+++ b/src/script/lua_api/l_base.h
@@ -48,7 +48,7 @@ protected:
                ScriptApiBase *scriptIface = getScriptApiBase(L);
                T *scriptIfaceDowncast = dynamic_cast<T*>(scriptIface);
                if (!scriptIfaceDowncast) {
-                       throw LuaError(NULL, "Requested unavailable ScriptApi - core engine bug!");
+                       throw LuaError("Requested unavailable ScriptApi - core engine bug!");
                }
                return scriptIfaceDowncast;
        }

diff --git a/src/script/lua_api/l_craft.cpp b/src/script/lua_api/l_craft.cpp
index aaca84c5601291977ed9194ac0db5c6b6109c832..8f8efbfbc356a8dc521aa5a54020fe6b596e2e7b 100644 (file)
--- a/src/script/lua_api/l_craft.cpp
+++ b/src/script/lua_api/l_craft.cpp
@@ -150,16 +150,16 @@ int ModApiCraft::l_register_craft(lua_State *L)
        if(type == "shaped"){
                std::string output = getstringfield_default(L, table, "output", "");
                if(output == "")
-                       throw LuaError(NULL, "Crafting definition is missing an output");
+                       throw LuaError("Crafting definition is missing an output");
 
                int width = 0;
                std::vector<std::string> recipe;
                lua_getfield(L, table, "recipe");
                if(lua_isnil(L, -1))
-                       throw LuaError(NULL, "Crafting definition is missing a recipe"
+                       throw LuaError("Crafting definition is missing a recipe"
                                        " (output=\"" + output + "\")");
                if(!readCraftRecipeShaped(L, -1, width, recipe))
-                       throw LuaError(NULL, "Invalid crafting recipe"
+                       throw LuaError("Invalid crafting recipe"
                                        " (output=\"" + output + "\")");
 
                CraftReplacements replacements;
@@ -167,7 +167,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
                if(!lua_isnil(L, -1))
                {
                        if(!readCraftReplacements(L, -1, replacements))
-                               throw LuaError(NULL, "Invalid replacements"
+                               throw LuaError("Invalid replacements"
                                                " (output=\"" + output + "\")");
                }
 
@@ -181,17 +181,17 @@ int ModApiCraft::l_register_craft(lua_State *L)
        else if(type == "shapeless"){
                std::string output = getstringfield_default(L, table, "output", "");
                if(output == "")
-                       throw LuaError(NULL, "Crafting definition (shapeless)"
+                       throw LuaError("Crafting definition (shapeless)"
                                        " is missing an output");
 
                std::vector<std::string> recipe;
                lua_getfield(L, table, "recipe");
                if(lua_isnil(L, -1))
-                       throw LuaError(NULL, "Crafting definition (shapeless)"
+                       throw LuaError("Crafting definition (shapeless)"
                                        " is missing a recipe"
                                        " (output=\"" + output + "\")");
                if(!readCraftRecipeShapeless(L, -1, recipe))
-                       throw LuaError(NULL, "Invalid crafting recipe"
+                       throw LuaError("Invalid crafting recipe"
                                        " (output=\"" + output + "\")");
 
                CraftReplacements replacements;
@@ -199,7 +199,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
                if(!lua_isnil(L, -1))
                {
                        if(!readCraftReplacements(L, -1, replacements))
-                               throw LuaError(NULL, "Invalid replacements"
+                               throw LuaError("Invalid replacements"
                                                " (output=\"" + output + "\")");
                }
 
@@ -224,12 +224,12 @@ int ModApiCraft::l_register_craft(lua_State *L)
        else if(type == "cooking"){
                std::string output = getstringfield_default(L, table, "output", "");
                if(output == "")
-                       throw LuaError(NULL, "Crafting definition (cooking)"
+                       throw LuaError("Crafting definition (cooking)"
                                        " is missing an output");
 
                std::string recipe = getstringfield_default(L, table, "recipe", "");
                if(recipe == "")
-                       throw LuaError(NULL, "Crafting definition (cooking)"
+                       throw LuaError("Crafting definition (cooking)"
                                        " is missing a recipe"
                                        " (output=\"" + output + "\")");
 
@@ -240,7 +240,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
                if(!lua_isnil(L, -1))
                {
                        if(!readCraftReplacements(L, -1, replacements))
-                               throw LuaError(NULL, "Invalid replacements"
+                               throw LuaError("Invalid replacements"
                                                " (cooking output=\"" + output + "\")");
                }
 
@@ -254,7 +254,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
        else if(type == "fuel"){
                std::string recipe = getstringfield_default(L, table, "recipe", "");
                if(recipe == "")
-                       throw LuaError(NULL, "Crafting definition (fuel)"
+                       throw LuaError("Crafting definition (fuel)"
                                        " is missing a recipe");
 
                float burntime = getfloatfield_default(L, table, "burntime", 1.0);
@@ -264,7 +264,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
                if(!lua_isnil(L, -1))
                {
                        if(!readCraftReplacements(L, -1, replacements))
-                               throw LuaError(NULL, "Invalid replacements"
+                               throw LuaError("Invalid replacements"
                                                " (fuel recipe=\"" + recipe + "\")");
                }
 
@@ -274,7 +274,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
        }
        else
        {
-               throw LuaError(NULL, "Unknown crafting definition type: \"" + type + "\"");
+               throw LuaError("Unknown crafting definition type: \"" + type + "\"");
        }
 
        lua_pop(L, 1);

diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
index 4b5c8979244b692ecbfcfac74692ea6aa8b8e58e..094d0bb25eb5b7c767c17ab4f37ec2ac24126e09 100644 (file)
--- a/src/script/lua_api/l_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -470,7 +470,7 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
                name = lua_tostring(L, -1);
                verbosestream<<"register_item_raw: "<<name<<std::endl;
        } else {
-               throw LuaError(NULL, "register_item_raw: name is not defined or not a string");
+               throw LuaError("register_item_raw: name is not defined or not a string");
        }
 
        // Check if on_use is defined
@@ -500,7 +500,7 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
                content_t id = ndef->set(f.name, f);
 
                if(id > MAX_REGISTERED_CONTENT){
-                       throw LuaError(NULL, "Number of registerable nodes ("
+                       throw LuaError("Number of registerable nodes ("
                                        + itos(MAX_REGISTERED_CONTENT+1)
                                        + ") exceeded (" + name + ")");
                }

diff --git a/src/script/lua_api/l_noise.cpp b/src/script/lua_api/l_noise.cpp
index 4ca9992af5db7f2a688a3ae96feb279fc0ae3255..263ecfd6999aab49f96610d29f5b6d765f88ce8e 100644 (file)
--- a/src/script/lua_api/l_noise.cpp
+++ b/src/script/lua_api/l_noise.cpp
@@ -330,10 +330,10 @@ int LuaPseudoRandom::l_next(lua_State *L)
                max = luaL_checkinteger(L, 3);
        if(max < min){
                errorstream<<"PseudoRandom.next(): max="<<max<<" min="<<min<<std::endl;
-               throw LuaError(NULL, "PseudoRandom.next(): max < min");
+               throw LuaError("PseudoRandom.next(): max < min");
        }
        if(max - min != 32767 && max - min > 32767/5)
-               throw LuaError(NULL, "PseudoRandom.next() max-min is not 32767"
+               throw LuaError("PseudoRandom.next() max-min is not 32767"
                                " and is > 32768/5. This is disallowed due to"
                                " the bad random distribution the"
                                " implementation would otherwise make.");

diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 059496c3d55701e53da3953f8f608c29b5cb48d3..90af51cc78719098ee619b6b47f02309d29e636b 100644 (file)
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -1120,7 +1120,7 @@ int ObjectRef::l_set_sky(lua_State *L)
        }
 
        if (type == "skybox" && params.size() != 6)
-               throw LuaError(L, "skybox expects 6 textures");
+               throw LuaError("skybox expects 6 textures");
 
        if (!getServer(L)->setSky(player, bgcolor, type, params))
                return 0;