Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-24 15:12:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve Script CPP API diagnostics

Browse Source
This commit is contained in:
kwolekr 2015-08-05 00:49:35 -04:00
parent 3183d5a403
commit bcf47bc67c
16 changed files with 129 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,11 +69,51 @@ int script_exception_wrapper(lua_State *L, lua_CFunction f)
return lua_error(L); // Rethrow as a Lua error. return lua_error(L); // Rethrow as a Lua error.
} }
void script_error(lua_State *L) /*
* Note that we can't get tracebacks for LUA_ERRMEM or LUA_ERRERR (without
* hacking Lua internals). For LUA_ERRMEM, this is because memory errors will
* not execute the the error handler, and by the time lua_pcall returns the
* execution stack will have already been unwound. For LUA_ERRERR, there was
* another error while trying to generate a backtrace from a LUA_ERRRUN. It is
* presumed there is an error with the internal Lua state and thus not possible
* to gather a coherent backtrace. Realistically, the best we can do here is
* print which C function performed the failing pcall.
*/
void script_error(lua_State *L, int pcall_result, const char *fxn)
{ {
const char *s = lua_tostring(L, -1); if (pcall_result == 0)
std::string str(s ? s : ""); return;
throw LuaError(str);
const char *err_type;
switch (pcall_result) {
case LUA_ERRRUN:
err_type = "Runtime";
break;
case LUA_ERRMEM:
err_type = "OOM";
break;
case LUA_ERRERR:
err_type = "Double fault";
break;
default:
err_type = "Unknown";
}
const char *err_descr = lua_tostring(L, -1);
if (!err_descr)
err_descr = "<no description>";
std::string err_msg(err_type);
if (fxn) {
err_msg += " error in ";
err_msg += fxn;
err_msg += "(): ";
} else {
err_msg += " error: ";
}
err_msg += err_descr;
throw LuaError(err_msg);
} }
// Push the list of callbacks (a lua table). // Push the list of callbacks (a lua table).
@ -82,7 +122,8 @@ void script_error(lua_State *L)
// - runs the callbacks // - runs the callbacks
// - replaces the table and arguments with the return value, // - replaces the table and arguments with the return value,
// computed depending on mode // computed depending on mode
void script_run_callbacks(lua_State *L, int nargs, RunCallbacksMode mode) void script_run_callbacks_f(lua_State *L, int nargs,
RunCallbacksMode mode, const char *fxn)
{ {
FATAL_ERROR_IF(lua_gettop(L) < nargs + 1, "Not enough arguments"); FATAL_ERROR_IF(lua_gettop(L) < nargs + 1, "Not enough arguments");
@ -104,14 +145,12 @@ void script_run_callbacks(lua_State *L, int nargs, RunCallbacksMode mode)
// Stack now looks like this: // Stack now looks like this:
// ... <error handler> <run_callbacks> <table> <mode> <arg#1> <arg#2> ... <arg#n> // ... <error handler> <run_callbacks> <table> <mode> <arg#1> <arg#2> ... <arg#n>
if (lua_pcall(L, nargs + 2, 1, errorhandler)) { script_error(L, lua_pcall(L, nargs + 2, 1, errorhandler), fxn);
script_error(L);
}
lua_remove(L, -2); // Remove error handler lua_remove(L, -2); // Remove error handler
} }
void log_deprecated(lua_State *L, std::string message) void log_deprecated(lua_State *L, const std::string &message)
{ {
static bool configured = false; static bool configured = false;
static bool dolog = false; static bool dolog = false;
@ -131,9 +170,10 @@ void log_deprecated(lua_State *L, std::string message)
if (doerror) { if (doerror) {
if (L != NULL) { if (L != NULL) {
script_error(L); script_error(L, LUA_ERRRUN, NULL);
} else { } else {
FATAL_ERROR("Can't do a scripterror for this deprecated message, so exit completely!"); FATAL_ERROR("Can't do a scripterror for this deprecated message, "
"so exit completely!");
} }
} }

17
src/script/common/c_internal.h
View File

@ -34,6 +34,16 @@ extern "C" {
#include "common/c_types.h" #include "common/c_types.h"
#define PCALL_RESL(L, RES) do { \
int result_ = (RES); \
if (result_ != 0) { \
script_error((L), result_, __FUNCTION__); \
} \
} while (0)
#define script_run_callbacks(L, nargs, mode) \
script_run_callbacks_f((L), (nargs), (mode), __FUNCTION__)
// What script_run_callbacks does with the return values of callbacks. // What script_run_callbacks does with the return values of callbacks.
// Regardless of the mode, if only one callback is defined, // Regardless of the mode, if only one callback is defined,
// its return value is the total return value. // its return value is the total return value.
@ -67,8 +77,9 @@ enum RunCallbacksMode
std::string script_get_backtrace(lua_State *L); std::string script_get_backtrace(lua_State *L);
int script_error_handler(lua_State *L); int script_error_handler(lua_State *L);
int script_exception_wrapper(lua_State *L, lua_CFunction f); int script_exception_wrapper(lua_State *L, lua_CFunction f);
void script_error(lua_State *L); void script_error(lua_State *L, int pcall_result, const char *fxn);
void script_run_callbacks(lua_State *L, int nargs, RunCallbacksMode mode); void script_run_callbacks_f(lua_State *L, int nargs,
void log_deprecated(lua_State *L, std::string message); RunCallbacksMode mode, const char *fxn);
void log_deprecated(lua_State *L, const std::string &message);
#endif /* C_INTERNAL_H_ */ #endif /* C_INTERNAL_H_ */

9
src/script/cpp_api/s_async.cpp
View File

@ -164,9 +164,7 @@ void AsyncEngine::step(lua_State *L, int errorhandler)
lua_pushlstring(L, jobDone.serializedResult.data(), lua_pushlstring(L, jobDone.serializedResult.data(),
jobDone.serializedResult.size()); jobDone.serializedResult.size());
if (lua_pcall(L, 2, 0, errorhandler)) { PCALL_RESL(L, lua_pcall(L, 2, 0, errorhandler));
script_error(L);
}
} }
resultQueueMutex.Unlock(); resultQueueMutex.Unlock();
lua_pop(L, 1); // Pop core lua_pop(L, 1); // Pop core
@ -293,8 +291,9 @@ void* AsyncWorkerThread::Thread()
toProcess.serializedParams.data(), toProcess.serializedParams.data(),
toProcess.serializedParams.size()); toProcess.serializedParams.size());
if (lua_pcall(L, 2, 1, m_errorhandler)) { int result = lua_pcall(L, 2, 1, m_errorhandler);
scriptError(); if (result) {
PCALL_RES(result);
toProcess.serializedResult = ""; toProcess.serializedResult = "";
} else { } else {
// Fetch result // Fetch result

4
src/script/cpp_api/s_base.cpp
View File

@ -165,9 +165,9 @@ void ScriptApiBase::realityCheck()
} }
} }
void ScriptApiBase::scriptError() void ScriptApiBase::scriptError(int result, const char *fxn)
{ {
throw LuaError(lua_tostring(m_luastack, -1)); script_error(getStack(), result, fxn);
} }
void ScriptApiBase::stackDump(std::ostream &o) void ScriptApiBase::stackDump(std::ostream &o)

8
src/script/cpp_api/s_base.h
View File

@ -40,6 +40,12 @@ extern "C" {
// use that name to bypass security! // use that name to bypass security!
#define BUILTIN_MOD_NAME "*builtin*" #define BUILTIN_MOD_NAME "*builtin*"
#define PCALL_RES(RES) do { \
int result_ = (RES); \
if (result_ != 0) { \
scriptError(result_, __FUNCTION__); \
} \
} while (0)
class Server; class Server;
class Environment; class Environment;
@ -74,7 +80,7 @@ protected:
{ return m_luastack; } { return m_luastack; }
void realityCheck(); void realityCheck();
void scriptError(); void scriptError(int result, const char *fxn);
void stackDump(std::ostream &o); void stackDump(std::ostream &o);
void setServer(Server* server) { m_server = server; } void setServer(Server* server) { m_server = server; }

15
src/script/cpp_api/s_entity.cpp
View File

@ -92,8 +92,7 @@ void ScriptApiEntity::luaentity_Activate(u16 id,
lua_pushlstring(L, staticdata.c_str(), staticdata.size()); lua_pushlstring(L, staticdata.c_str(), staticdata.size());
lua_pushinteger(L, dtime_s); lua_pushinteger(L, dtime_s);
// Call with 3 arguments, 0 results // Call with 3 arguments, 0 results
if (lua_pcall(L, 3, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 3, 0, m_errorhandler));
scriptError();
} else { } else {
lua_pop(L, 1); lua_pop(L, 1);
} }
@ -140,8 +139,7 @@ std::string ScriptApiEntity::luaentity_GetStaticdata(u16 id)
luaL_checktype(L, -1, LUA_TFUNCTION); luaL_checktype(L, -1, LUA_TFUNCTION);
lua_pushvalue(L, object); // self lua_pushvalue(L, object); // self
// Call with 1 arguments, 1 results // Call with 1 arguments, 1 results
if (lua_pcall(L, 1, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 1, 1, m_errorhandler));
scriptError();
lua_remove(L, object); // Remove object lua_remove(L, object); // Remove object
size_t len = 0; size_t len = 0;
@ -210,8 +208,7 @@ void ScriptApiEntity::luaentity_Step(u16 id, float dtime)
lua_pushvalue(L, object); // self lua_pushvalue(L, object); // self
lua_pushnumber(L, dtime); // dtime lua_pushnumber(L, dtime); // dtime
// Call with 2 arguments, 0 results // Call with 2 arguments, 0 results
if (lua_pcall(L, 2, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 2, 0, m_errorhandler));
scriptError();
lua_pop(L, 1); // Pop object lua_pop(L, 1); // Pop object
} }
@ -242,8 +239,7 @@ void ScriptApiEntity::luaentity_Punch(u16 id,
push_tool_capabilities(L, *toolcap); push_tool_capabilities(L, *toolcap);
push_v3f(L, dir); push_v3f(L, dir);
// Call with 5 arguments, 0 results // Call with 5 arguments, 0 results
if (lua_pcall(L, 5, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 5, 0, m_errorhandler));
scriptError();
lua_pop(L, 1); // Pop object lua_pop(L, 1); // Pop object
} }
@ -269,8 +265,7 @@ void ScriptApiEntity::luaentity_Rightclick(u16 id,
lua_pushvalue(L, object); // self lua_pushvalue(L, object); // self
objectrefGetOrCreate(L, clicker); // Clicker reference objectrefGetOrCreate(L, clicker); // Clicker reference
// Call with 2 arguments, 0 results // Call with 2 arguments, 0 results
if (lua_pcall(L, 2, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 2, 0, m_errorhandler));
scriptError();
lua_pop(L, 1); // Pop object lua_pop(L, 1); // Pop object
} }

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

@ -48,8 +48,7 @@ int ScriptApiDetached::detached_inventory_AllowMove(
lua_pushinteger(L, to_index + 1); // to_index lua_pushinteger(L, to_index + 1); // to_index
lua_pushinteger(L, count); // count lua_pushinteger(L, count); // count
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 7, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 7, 1, m_errorhandler));
scriptError();
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError("allow_move should return a number. name=" + name); throw LuaError("allow_move should return a number. name=" + name);
int ret = luaL_checkinteger(L, -1); int ret = luaL_checkinteger(L, -1);
@ -77,8 +76,7 @@ int ScriptApiDetached::detached_inventory_AllowPut(
lua_pushinteger(L, index + 1); // index lua_pushinteger(L, index + 1); // index
LuaItemStack::create(L, stack); // stack LuaItemStack::create(L, stack); // stack
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 5, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 5, 1, m_errorhandler));
scriptError();
if (!lua_isnumber(L, -1)) if (!lua_isnumber(L, -1))
throw LuaError("allow_put should return a number. name=" + name); throw LuaError("allow_put should return a number. name=" + name);
int ret = luaL_checkinteger(L, -1); int ret = luaL_checkinteger(L, -1);
@ -106,8 +104,7 @@ int ScriptApiDetached::detached_inventory_AllowTake(
lua_pushinteger(L, index + 1); // index lua_pushinteger(L, index + 1); // index
LuaItemStack::create(L, stack); // stack LuaItemStack::create(L, stack); // stack
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 5, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 5, 1, m_errorhandler));
scriptError();
if (!lua_isnumber(L, -1)) if (!lua_isnumber(L, -1))
throw LuaError("allow_take should return a number. name=" + name); throw LuaError("allow_take should return a number. name=" + name);
int ret = luaL_checkinteger(L, -1); int ret = luaL_checkinteger(L, -1);
@ -139,8 +136,7 @@ void ScriptApiDetached::detached_inventory_OnMove(
lua_pushinteger(L, to_index + 1); // to_index lua_pushinteger(L, to_index + 1); // to_index
lua_pushinteger(L, count); // count lua_pushinteger(L, count); // count
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 7, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 7, 0, m_errorhandler));
scriptError();
} }
// Report put items // Report put items
@ -164,8 +160,7 @@ void ScriptApiDetached::detached_inventory_OnPut(
lua_pushinteger(L, index + 1); // index lua_pushinteger(L, index + 1); // index
LuaItemStack::create(L, stack); // stack LuaItemStack::create(L, stack); // stack
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 5, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 5, 0, m_errorhandler));
scriptError();
} }
// Report taken items // Report taken items
@ -189,8 +184,7 @@ void ScriptApiDetached::detached_inventory_OnTake(
lua_pushinteger(L, index + 1); // index lua_pushinteger(L, index + 1); // index
LuaItemStack::create(L, stack); // stack LuaItemStack::create(L, stack); // stack
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 5, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 5, 0, m_errorhandler));
scriptError();
} }
// Retrieves core.detached_inventories[name][callbackname] // Retrieves core.detached_inventories[name][callbackname]

17
src/script/cpp_api/s_item.cpp
View File

@ -42,8 +42,7 @@ bool ScriptApiItem::item_OnDrop(ItemStack &item,
LuaItemStack::create(L, item); LuaItemStack::create(L, item);
objectrefGetOrCreate(L, dropper); objectrefGetOrCreate(L, dropper);
pushFloatPos(L, pos); pushFloatPos(L, pos);
if (lua_pcall(L, 3, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 3, 1, m_errorhandler));
scriptError();
if (!lua_isnil(L, -1)) { if (!lua_isnil(L, -1)) {
try { try {
item = read_item(L,-1, getServer()); item = read_item(L,-1, getServer());
@ -68,8 +67,7 @@ bool ScriptApiItem::item_OnPlace(ItemStack &item,
LuaItemStack::create(L, item); LuaItemStack::create(L, item);
objectrefGetOrCreate(L, placer); objectrefGetOrCreate(L, placer);
pushPointedThing(pointed); pushPointedThing(pointed);
if (lua_pcall(L, 3, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 3, 1, m_errorhandler));
scriptError();
if (!lua_isnil(L, -1)) { if (!lua_isnil(L, -1)) {
try { try {
item = read_item(L,-1, getServer()); item = read_item(L,-1, getServer());
@ -94,8 +92,7 @@ bool ScriptApiItem::item_OnUse(ItemStack &item,
LuaItemStack::create(L, item); LuaItemStack::create(L, item);
objectrefGetOrCreate(L, user); objectrefGetOrCreate(L, user);
pushPointedThing(pointed); pushPointedThing(pointed);
if (lua_pcall(L, 3, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 3, 1, m_errorhandler));
scriptError();
if(!lua_isnil(L, -1)) { if(!lua_isnil(L, -1)) {
try { try {
item = read_item(L,-1, getServer()); item = read_item(L,-1, getServer());
@ -116,7 +113,7 @@ bool ScriptApiItem::item_OnCraft(ItemStack &item, ServerActiveObject *user,
lua_getfield(L, -1, "on_craft"); lua_getfield(L, -1, "on_craft");
LuaItemStack::create(L, item); LuaItemStack::create(L, item);
objectrefGetOrCreate(L, user); objectrefGetOrCreate(L, user);
// Push inventory list // Push inventory list
std::vector<ItemStack> items; std::vector<ItemStack> items;
for (u32 i = 0; i < old_craft_grid->getSize(); i++) { for (u32 i = 0; i < old_craft_grid->getSize(); i++) {
@ -125,8 +122,7 @@ bool ScriptApiItem::item_OnCraft(ItemStack &item, ServerActiveObject *user,
push_items(L, items); push_items(L, items);
InvRef::create(L, craft_inv); InvRef::create(L, craft_inv);
if (lua_pcall(L, 4, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 4, 1, m_errorhandler));
scriptError();
if (!lua_isnil(L, -1)) { if (!lua_isnil(L, -1)) {
try { try {
item = read_item(L,-1, getServer()); item = read_item(L,-1, getServer());
@ -156,8 +152,7 @@ bool ScriptApiItem::item_CraftPredict(ItemStack &item, ServerActiveObject *user,
push_items(L, items); push_items(L, items);
InvRef::create(L, craft_inv); InvRef::create(L, craft_inv);
if (lua_pcall(L, 4, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 4, 1, m_errorhandler));
scriptError();
if (!lua_isnil(L, -1)) { if (!lua_isnil(L, -1)) {
try { try {
item = read_item(L,-1, getServer()); item = read_item(L,-1, getServer());

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

@ -55,8 +55,7 @@ void ScriptApiMainMenu::handleMainMenuEvent(std::string text)
// Call it // Call it
lua_pushstring(L, text.c_str()); lua_pushstring(L, text.c_str());
if (lua_pcall(L, 1, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 1, 0, m_errorhandler));
scriptError();
} }
void ScriptApiMainMenu::handleMainMenuButtons(const StringMap &fields) void ScriptApiMainMenu::handleMainMenuButtons(const StringMap &fields)
@ -85,7 +84,6 @@ void ScriptApiMainMenu::handleMainMenuButtons(const StringMap &fields)
} }
// Call it // Call it
if (lua_pcall(L, 1, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 1, 0, m_errorhandler));
scriptError();
} }

28
src/script/cpp_api/s_node.cpp
View File

@ -106,8 +106,7 @@ bool ScriptApiNode::node_on_punch(v3s16 p, MapNode node,
pushnode(L, node, ndef); pushnode(L, node, ndef);
objectrefGetOrCreate(L, puncher); objectrefGetOrCreate(L, puncher);
pushPointedThing(pointed); pushPointedThing(pointed);
if (lua_pcall(L, 4, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 4, 0, m_errorhandler));
scriptError();
return true; return true;
} }
@ -126,8 +125,7 @@ bool ScriptApiNode::node_on_dig(v3s16 p, MapNode node,
push_v3s16(L, p); push_v3s16(L, p);
pushnode(L, node, ndef); pushnode(L, node, ndef);
objectrefGetOrCreate(L, digger); objectrefGetOrCreate(L, digger);
if (lua_pcall(L, 3, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 3, 0, m_errorhandler));
scriptError();
return true; return true;
} }
@ -143,8 +141,7 @@ void ScriptApiNode::node_on_construct(v3s16 p, MapNode node)
// Call function // Call function
push_v3s16(L, p); push_v3s16(L, p);
if (lua_pcall(L, 1, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 1, 0, m_errorhandler));
scriptError();
} }
void ScriptApiNode::node_on_destruct(v3s16 p, MapNode node) void ScriptApiNode::node_on_destruct(v3s16 p, MapNode node)
@ -159,8 +156,7 @@ void ScriptApiNode::node_on_destruct(v3s16 p, MapNode node)
// Call function // Call function
push_v3s16(L, p); push_v3s16(L, p);
if (lua_pcall(L, 1, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 1, 0, m_errorhandler));
scriptError();
} }
void ScriptApiNode::node_after_destruct(v3s16 p, MapNode node) void ScriptApiNode::node_after_destruct(v3s16 p, MapNode node)
@ -176,8 +172,7 @@ void ScriptApiNode::node_after_destruct(v3s16 p, MapNode node)
// Call function // Call function
push_v3s16(L, p); push_v3s16(L, p);
pushnode(L, node, ndef); pushnode(L, node, ndef);
if (lua_pcall(L, 2, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 2, 0, m_errorhandler));
scriptError();
} }
bool ScriptApiNode::node_on_timer(v3s16 p, MapNode node, f32 dtime) bool ScriptApiNode::node_on_timer(v3s16 p, MapNode node, f32 dtime)
@ -193,8 +188,7 @@ bool ScriptApiNode::node_on_timer(v3s16 p, MapNode node, f32 dtime)
// Call function // Call function
push_v3s16(L, p); push_v3s16(L, p);
lua_pushnumber(L,dtime); lua_pushnumber(L,dtime);
if (lua_pcall(L, 2, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 2, 1, m_errorhandler));
scriptError();
return (bool) lua_isboolean(L, -1) && (bool) lua_toboolean(L, -1) == true; return (bool) lua_isboolean(L, -1) && (bool) lua_toboolean(L, -1) == true;
} }
@ -229,8 +223,7 @@ void ScriptApiNode::node_on_receive_fields(v3s16 p,
lua_settable(L, -3); lua_settable(L, -3);
} }
objectrefGetOrCreate(L, sender); // player objectrefGetOrCreate(L, sender); // player
if (lua_pcall(L, 4, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 4, 0, m_errorhandler));
scriptError();
} }
void ScriptApiNode::node_falling_update(v3s16 p) void ScriptApiNode::node_falling_update(v3s16 p)
@ -239,8 +232,7 @@ void ScriptApiNode::node_falling_update(v3s16 p)
lua_getglobal(L, "nodeupdate"); lua_getglobal(L, "nodeupdate");
push_v3s16(L, p); push_v3s16(L, p);
if (lua_pcall(L, 1, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 1, 0, m_errorhandler));
scriptError();
} }
void ScriptApiNode::node_falling_update_single(v3s16 p) void ScriptApiNode::node_falling_update_single(v3s16 p)
@ -249,7 +241,5 @@ void ScriptApiNode::node_falling_update_single(v3s16 p)
lua_getglobal(L, "nodeupdate_single"); lua_getglobal(L, "nodeupdate_single");
push_v3s16(L, p); push_v3s16(L, p);
if (lua_pcall(L, 1, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 1, 0, m_errorhandler));
scriptError();
} }

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

@ -54,8 +54,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowMove(v3s16 p,
lua_pushinteger(L, to_index + 1); // to_index lua_pushinteger(L, to_index + 1); // to_index
lua_pushinteger(L, count); // count lua_pushinteger(L, count); // count
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 7, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 7, 1, m_errorhandler));
scriptError();
if (!lua_isnumber(L, -1)) if (!lua_isnumber(L, -1))
throw LuaError("allow_metadata_inventory_move should" throw LuaError("allow_metadata_inventory_move should"
" return a number, guilty node: " + nodename); " return a number, guilty node: " + nodename);
@ -89,8 +88,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowPut(v3s16 p,
lua_pushinteger(L, index + 1); // index lua_pushinteger(L, index + 1); // index
LuaItemStack::create(L, stack); // stack LuaItemStack::create(L, stack); // stack
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 5, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 5, 1, m_errorhandler));
scriptError();
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError("allow_metadata_inventory_put should" throw LuaError("allow_metadata_inventory_put should"
" return a number, guilty node: " + nodename); " return a number, guilty node: " + nodename);
@ -124,8 +122,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowTake(v3s16 p,
lua_pushinteger(L, index + 1); // index lua_pushinteger(L, index + 1); // index
LuaItemStack::create(L, stack); // stack LuaItemStack::create(L, stack); // stack
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 5, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 5, 1, m_errorhandler));
scriptError();
if (!lua_isnumber(L, -1)) if (!lua_isnumber(L, -1))
throw LuaError("allow_metadata_inventory_take should" throw LuaError("allow_metadata_inventory_take should"
" return a number, guilty node: " + nodename); " return a number, guilty node: " + nodename);
@ -162,8 +159,7 @@ void ScriptApiNodemeta::nodemeta_inventory_OnMove(v3s16 p,
lua_pushinteger(L, to_index + 1); // to_index lua_pushinteger(L, to_index + 1); // to_index
lua_pushinteger(L, count); // count lua_pushinteger(L, count); // count
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 7, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 7, 0, m_errorhandler));
scriptError();
} }
// Report put items // Report put items
@ -191,8 +187,7 @@ void ScriptApiNodemeta::nodemeta_inventory_OnPut(v3s16 p,
lua_pushinteger(L, index + 1); // index lua_pushinteger(L, index + 1); // index
LuaItemStack::create(L, stack); // stack LuaItemStack::create(L, stack); // stack
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 5, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 5, 0, m_errorhandler));
scriptError();
} }
// Report taken items // Report taken items
@ -220,13 +215,14 @@ void ScriptApiNodemeta::nodemeta_inventory_OnTake(v3s16 p,
lua_pushinteger(L, index + 1); // index lua_pushinteger(L, index + 1); // index
LuaItemStack::create(L, stack); // stack LuaItemStack::create(L, stack); // stack
objectrefGetOrCreate(L, player); // player objectrefGetOrCreate(L, player); // player
if (lua_pcall(L, 5, 0, m_errorhandler)) PCALL_RES(lua_pcall(L, 5, 0, m_errorhandler));
scriptError();
} }
ScriptApiNodemeta::ScriptApiNodemeta() { ScriptApiNodemeta::ScriptApiNodemeta()
{
} }
ScriptApiNodemeta::~ScriptApiNodemeta() { ScriptApiNodemeta::~ScriptApiNodemeta()
{
} }

3
src/script/cpp_api/s_player.cpp
View File

@ -81,8 +81,7 @@ s16 ScriptApiPlayer::on_player_hpchange(ServerActiveObject *player,
objectrefGetOrCreate(L, player); objectrefGetOrCreate(L, player);
lua_pushnumber(L, hp_change); lua_pushnumber(L, hp_change);
if (lua_pcall(L, 2, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 2, 1, m_errorhandler));
scriptError();
hp_change = lua_tointeger(L, -1); hp_change = lua_tointeger(L, -1);
lua_pop(L, -1); lua_pop(L, -1);
return hp_change; return hp_change;

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

@ -32,8 +32,7 @@ bool ScriptApiServer::getAuth(const std::string &playername,
if (lua_type(L, -1) != LUA_TFUNCTION) if (lua_type(L, -1) != LUA_TFUNCTION)
throw LuaError("Authentication handler missing get_auth"); throw LuaError("Authentication handler missing get_auth");
lua_pushstring(L, playername.c_str()); lua_pushstring(L, playername.c_str());
if (lua_pcall(L, 1, 1, m_errorhandler)) PCALL_RES(lua_pcall(L, 1, 1, m_errorhandler));
scriptError();
lua_remove(L, -2); // Remove auth handler lua_remove(L, -2); // Remove auth handler
// nil = login not allowed // nil = login not allowed
@ -104,8 +103,7 @@ void ScriptApiServer::createAuth(const std::string &playername,
throw LuaError("Authentication handler missing create_auth"); throw LuaError("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, m_errorhandler)) PCALL_RES(lua_pcall(L, 2, 0, m_errorhandler));
scriptError();
} }
bool ScriptApiServer::setPassword(const std::string &playername, bool ScriptApiServer::setPassword(const std::string &playername,
@ -120,8 +118,7 @@ bool ScriptApiServer::setPassword(const std::string &playername,
throw LuaError("Authentication handler missing set_password"); throw LuaError("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, m_errorhandler)) PCALL_RES(lua_pcall(L, 2, 1, m_errorhandler));
scriptError();
return lua_toboolean(L, -1); return lua_toboolean(L, -1);
} }

10
src/script/lua_api/l_env.cpp
View File

@ -77,8 +77,9 @@ void LuaABM::trigger(ServerEnvironment *env, v3s16 p, MapNode n,
pushnode(L, n, env->getGameDef()->ndef()); pushnode(L, n, env->getGameDef()->ndef());
lua_pushnumber(L, active_object_count); lua_pushnumber(L, active_object_count);
lua_pushnumber(L, active_object_count_wider); lua_pushnumber(L, active_object_count_wider);
if(lua_pcall(L, 4, 0, errorhandler))
script_error(L); PCALL_RESL(L, lua_pcall(L, 4, 0, errorhandler));
lua_pop(L, 1); // Pop error handler lua_pop(L, 1); // Pop error handler
} }
@ -418,8 +419,9 @@ int ModApiEnvMod::l_add_item(lua_State *L)
return 0; return 0;
lua_pushvalue(L, 1); lua_pushvalue(L, 1);
lua_pushstring(L, item.getItemString().c_str()); lua_pushstring(L, item.getItemString().c_str());
if(lua_pcall(L, 2, 1, errorhandler))
script_error(L); PCALL_RESL(L, lua_pcall(L, 2, 1, errorhandler));
lua_remove(L, errorhandler); // Remove error handler lua_remove(L, errorhandler); // Remove error handler
return 1; return 1;
} }

4
src/script/scripting_game.cpp
View File

@ -105,7 +105,7 @@ void GameScripting::InitializeModApi(lua_State *L, int top)
LuaSettings::Register(L); LuaSettings::Register(L);
} }
void log_deprecated(std::string message) void log_deprecated(const std::string &message)
{ {
log_deprecated(NULL,message); log_deprecated(NULL, message);
} }

2
src/script/scripting_game.h
View File

@ -52,6 +52,6 @@ private:
void InitializeModApi(lua_State *L, int top); void InitializeModApi(lua_State *L, int top);
}; };
void log_deprecated(std::string message); void log_deprecated(const std::string &message);
#endif /* SCRIPTING_GAME_H_ */ #endif /* SCRIPTING_GAME_H_ */