BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Make sure we get a stacktrace for as many lua errors as possible

Browse Source
This commit is contained in:
Sfan5 2014-03-15 14:49:30 +01:00
parent d753d352f1
commit 362ef5f6ce
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/common/c_content.cpp
View File

@ -654,7 +654,7 @@ ItemStack read_item(lua_State* L, int index,Server* srv)
} }
else else
{ {
throw LuaError(NULL, "Expecting itemstack, itemstring, table or nil"); throw LuaError(L, "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)) { while (lua_next(L, index)) {
s32 key = luaL_checkinteger(L, -2); s32 key = luaL_checkinteger(L, -2);
if (key < 1) { if (key < 1) {
throw LuaError(NULL, "Invalid inventory list index"); throw LuaError(L, "Invalid inventory list index");
} }
if (items.size() < (u32) key) { if (items.size() < (u32) key) {
items.resize(key); items.resize(key);

2
src/script/common/c_internal.cpp
View File

@ -71,7 +71,7 @@ void script_error(lua_State *L)
{ {
const char *s = lua_tostring(L, -1); const char *s = lua_tostring(L, -1);
std::string str(s ? s : ""); std::string str(s ? s : "");
throw LuaError(NULL, str); throw LuaError(L, str);
} }
// Push the list of callbacks (a lua table). // Push the list of callbacks (a lua table).

6
src/script/cpp_api/s_inventory.cpp
View File

@ -54,7 +54,7 @@ int ScriptApiDetached::detached_inventory_AllowMove(
if(lua_pcall(L, 7, 1, errorhandler)) if(lua_pcall(L, 7, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError(NULL, "allow_move should return a number"); throw LuaError(L, "allow_move should return a number");
int ret = luaL_checkinteger(L, -1); int ret = luaL_checkinteger(L, -1);
lua_pop(L, 2); // Pop integer and error handler lua_pop(L, 2); // Pop integer and error handler
return ret; return ret;
@ -86,7 +86,7 @@ int ScriptApiDetached::detached_inventory_AllowPut(
if(lua_pcall(L, 5, 1, errorhandler)) if(lua_pcall(L, 5, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError(NULL, "allow_put should return a number"); throw LuaError(L, "allow_put should return a number");
int ret = luaL_checkinteger(L, -1); int ret = luaL_checkinteger(L, -1);
lua_pop(L, 2); // Pop integer and error handler lua_pop(L, 2); // Pop integer and error handler
return ret; return ret;
@ -118,7 +118,7 @@ int ScriptApiDetached::detached_inventory_AllowTake(
if(lua_pcall(L, 5, 1, errorhandler)) if(lua_pcall(L, 5, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError(NULL, "allow_take should return a number"); throw LuaError(L, "allow_take should return a number");
int ret = luaL_checkinteger(L, -1); int ret = luaL_checkinteger(L, -1);
lua_pop(L, 2); // Pop integer and error handler lua_pop(L, 2); // Pop integer and error handler
return ret; return ret;

6
src/script/cpp_api/s_nodemeta.cpp
View File

@ -61,7 +61,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowMove(v3s16 p,
scriptError(); scriptError();
lua_remove(L, errorhandler); // Remove error handler lua_remove(L, errorhandler); // Remove error handler
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError(NULL, "allow_metadata_inventory_move should" throw LuaError(L, "allow_metadata_inventory_move should"
" return a number, guilty node: " + nodename); " return a number, guilty node: " + nodename);
int num = luaL_checkinteger(L, -1); int num = luaL_checkinteger(L, -1);
lua_pop(L, 1); // Pop integer lua_pop(L, 1); // Pop integer
@ -100,7 +100,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowPut(v3s16 p,
scriptError(); scriptError();
lua_remove(L, errorhandler); // Remove error handler lua_remove(L, errorhandler); // Remove error handler
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError(NULL, "allow_metadata_inventory_put should" throw LuaError(L, "allow_metadata_inventory_put should"
" return a number, guilty node: " + nodename); " return a number, guilty node: " + nodename);
int num = luaL_checkinteger(L, -1); int num = luaL_checkinteger(L, -1);
lua_pop(L, 1); // Pop integer lua_pop(L, 1); // Pop integer
@ -139,7 +139,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowTake(v3s16 p,
scriptError(); scriptError();
lua_remove(L, errorhandler); // Remove error handler lua_remove(L, errorhandler); // Remove error handler
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError(NULL, "allow_metadata_inventory_take should" throw LuaError(L, "allow_metadata_inventory_take should"
" return a number, guilty node: " + nodename); " return a number, guilty node: " + nodename);
int num = luaL_checkinteger(L, -1); int num = luaL_checkinteger(L, -1);
lua_pop(L, 1); // Pop integer lua_pop(L, 1); // Pop integer

12
src/script/cpp_api/s_server.cpp
View File

@ -33,7 +33,7 @@ bool ScriptApiServer::getAuth(const std::string &playername,
getAuthHandler(); getAuthHandler();
lua_getfield(L, -1, "get_auth"); lua_getfield(L, -1, "get_auth");
if(lua_type(L, -1) != LUA_TFUNCTION) if(lua_type(L, -1) != LUA_TFUNCTION)
throw LuaError(NULL, "Authentication handler missing get_auth"); throw LuaError(L, "Authentication handler missing get_auth");
lua_pushstring(L, playername.c_str()); lua_pushstring(L, playername.c_str());
if(lua_pcall(L, 1, 1, errorhandler)) if(lua_pcall(L, 1, 1, errorhandler))
scriptError(); scriptError();
@ -48,13 +48,13 @@ bool ScriptApiServer::getAuth(const std::string &playername,
std::string password; std::string password;
bool found = getstringfield(L, -1, "password", password); bool found = getstringfield(L, -1, "password", password);
if(!found) if(!found)
throw LuaError(NULL, "Authentication handler didn't return password"); throw LuaError(L, "Authentication handler didn't return password");
if(dst_password) if(dst_password)
*dst_password = password; *dst_password = password;
lua_getfield(L, -1, "privileges"); lua_getfield(L, -1, "privileges");
if(!lua_istable(L, -1)) if(!lua_istable(L, -1))
throw LuaError(NULL, "Authentication handler didn't return privilege table"); throw LuaError(L, "Authentication handler didn't return privilege table");
if(dst_privs) if(dst_privs)
readPrivileges(-1, *dst_privs); readPrivileges(-1, *dst_privs);
lua_pop(L, 1); lua_pop(L, 1);
@ -74,7 +74,7 @@ void ScriptApiServer::getAuthHandler()
} }
lua_remove(L, -2); // Remove minetest lua_remove(L, -2); // Remove minetest
if(lua_type(L, -1) != LUA_TTABLE) if(lua_type(L, -1) != LUA_TTABLE)
throw LuaError(NULL, "Authentication handler table not valid"); throw LuaError(L, "Authentication handler table not valid");
} }
void ScriptApiServer::readPrivileges(int index, std::set<std::string> &result) 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_getfield(L, -1, "create_auth");
lua_remove(L, -2); // Remove auth handler lua_remove(L, -2); // Remove auth handler
if(lua_type(L, -1) != LUA_TFUNCTION) if(lua_type(L, -1) != LUA_TFUNCTION)
throw LuaError(NULL, "Authentication handler missing create_auth"); throw LuaError(L, "Authentication handler missing create_auth");
lua_pushstring(L, playername.c_str()); lua_pushstring(L, playername.c_str());
lua_pushstring(L, password.c_str()); lua_pushstring(L, password.c_str());
if(lua_pcall(L, 2, 0, errorhandler)) 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_getfield(L, -1, "set_password");
lua_remove(L, -2); // Remove auth handler lua_remove(L, -2); // Remove auth handler
if(lua_type(L, -1) != LUA_TFUNCTION) if(lua_type(L, -1) != LUA_TFUNCTION)
throw LuaError(NULL, "Authentication handler missing set_password"); throw LuaError(L, "Authentication handler missing set_password");
lua_pushstring(L, playername.c_str()); lua_pushstring(L, playername.c_str());
lua_pushstring(L, password.c_str()); lua_pushstring(L, password.c_str());
if(lua_pcall(L, 2, 1, errorhandler)) if(lua_pcall(L, 2, 1, errorhandler))

28
src/script/lua_api/l_craft.cpp
View File

@ -150,16 +150,16 @@ int ModApiCraft::l_register_craft(lua_State *L)
if(type == "shaped"){ if(type == "shaped"){
std::string output = getstringfield_default(L, table, "output", ""); std::string output = getstringfield_default(L, table, "output", "");
if(output == "") if(output == "")
throw LuaError(NULL, "Crafting definition is missing an output"); throw LuaError(L, "Crafting definition is missing an output");
int width = 0; int width = 0;
std::vector<std::string> recipe; std::vector<std::string> recipe;
lua_getfield(L, table, "recipe"); lua_getfield(L, table, "recipe");
if(lua_isnil(L, -1)) if(lua_isnil(L, -1))
throw LuaError(NULL, "Crafting definition is missing a recipe" throw LuaError(L, "Crafting definition is missing a recipe"
" (output=\"" + output + "\")"); " (output=\"" + output + "\")");
if(!readCraftRecipeShaped(L, -1, width, recipe)) if(!readCraftRecipeShaped(L, -1, width, recipe))
throw LuaError(NULL, "Invalid crafting recipe" throw LuaError(L, "Invalid crafting recipe"
" (output=\"" + output + "\")"); " (output=\"" + output + "\")");
CraftReplacements replacements; CraftReplacements replacements;
@ -167,7 +167,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
if(!lua_isnil(L, -1)) if(!lua_isnil(L, -1))
{ {
if(!readCraftReplacements(L, -1, replacements)) if(!readCraftReplacements(L, -1, replacements))
throw LuaError(NULL, "Invalid replacements" throw LuaError(L, "Invalid replacements"
" (output=\"" + output + "\")"); " (output=\"" + output + "\")");
} }
@ -181,17 +181,17 @@ int ModApiCraft::l_register_craft(lua_State *L)
else if(type == "shapeless"){ else if(type == "shapeless"){
std::string output = getstringfield_default(L, table, "output", ""); std::string output = getstringfield_default(L, table, "output", "");
if(output == "") if(output == "")
throw LuaError(NULL, "Crafting definition (shapeless)" throw LuaError(L, "Crafting definition (shapeless)"
" is missing an output"); " is missing an output");
std::vector<std::string> recipe; std::vector<std::string> recipe;
lua_getfield(L, table, "recipe"); lua_getfield(L, table, "recipe");
if(lua_isnil(L, -1)) if(lua_isnil(L, -1))
throw LuaError(NULL, "Crafting definition (shapeless)" throw LuaError(L, "Crafting definition (shapeless)"
" is missing a recipe" " is missing a recipe"
" (output=\"" + output + "\")"); " (output=\"" + output + "\")");
if(!readCraftRecipeShapeless(L, -1, recipe)) if(!readCraftRecipeShapeless(L, -1, recipe))
throw LuaError(NULL, "Invalid crafting recipe" throw LuaError(L, "Invalid crafting recipe"
" (output=\"" + output + "\")"); " (output=\"" + output + "\")");
CraftReplacements replacements; CraftReplacements replacements;
@ -199,7 +199,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
if(!lua_isnil(L, -1)) if(!lua_isnil(L, -1))
{ {
if(!readCraftReplacements(L, -1, replacements)) if(!readCraftReplacements(L, -1, replacements))
throw LuaError(NULL, "Invalid replacements" throw LuaError(L, "Invalid replacements"
" (output=\"" + output + "\")"); " (output=\"" + output + "\")");
} }
@ -224,12 +224,12 @@ int ModApiCraft::l_register_craft(lua_State *L)
else if(type == "cooking"){ else if(type == "cooking"){
std::string output = getstringfield_default(L, table, "output", ""); std::string output = getstringfield_default(L, table, "output", "");
if(output == "") if(output == "")
throw LuaError(NULL, "Crafting definition (cooking)" throw LuaError(L, "Crafting definition (cooking)"
" is missing an output"); " is missing an output");
std::string recipe = getstringfield_default(L, table, "recipe", ""); std::string recipe = getstringfield_default(L, table, "recipe", "");
if(recipe == "") if(recipe == "")
throw LuaError(NULL, "Crafting definition (cooking)" throw LuaError(L, "Crafting definition (cooking)"
" is missing a recipe" " is missing a recipe"
" (output=\"" + output + "\")"); " (output=\"" + output + "\")");
@ -240,7 +240,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
if(!lua_isnil(L, -1)) if(!lua_isnil(L, -1))
{ {
if(!readCraftReplacements(L, -1, replacements)) if(!readCraftReplacements(L, -1, replacements))
throw LuaError(NULL, "Invalid replacements" throw LuaError(L, "Invalid replacements"
" (cooking output=\"" + output + "\")"); " (cooking output=\"" + output + "\")");
} }
@ -254,7 +254,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
else if(type == "fuel"){ else if(type == "fuel"){
std::string recipe = getstringfield_default(L, table, "recipe", ""); std::string recipe = getstringfield_default(L, table, "recipe", "");
if(recipe == "") if(recipe == "")
throw LuaError(NULL, "Crafting definition (fuel)" throw LuaError(L, "Crafting definition (fuel)"
" is missing a recipe"); " is missing a recipe");
float burntime = getfloatfield_default(L, table, "burntime", 1.0); 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(!lua_isnil(L, -1))
{ {
if(!readCraftReplacements(L, -1, replacements)) if(!readCraftReplacements(L, -1, replacements))
throw LuaError(NULL, "Invalid replacements" throw LuaError(L, "Invalid replacements"
" (fuel recipe=\"" + recipe + "\")"); " (fuel recipe=\"" + recipe + "\")");
} }
@ -274,7 +274,7 @@ int ModApiCraft::l_register_craft(lua_State *L)
} }
else else
{ {
throw LuaError(NULL, "Unknown crafting definition type: \"" + type + "\""); throw LuaError(L, "Unknown crafting definition type: \"" + type + "\"");
} }
lua_pop(L, 1); lua_pop(L, 1);