rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

message handler always adds a traceback to messages (even if they 

are not strings), unless they have a __tostring method.
This commit is contained in:
Roberto Ierusalimschy 2014-10-20 16:19:26 -02:00
parent 57559547a3
commit 961760c9b6
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lua.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lua.c,v 1.214 2014/09/25 14:20:37 roberto Exp roberto $ ** $Id: lua.c,v 1.215 2014/10/17 16:28:21 roberto Exp roberto $
** Lua stand-alone interpreter ** Lua stand-alone interpreter
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -158,32 +158,32 @@ static void l_message (const char *pname, const char *msg) {
/* /*
** Check whether 'status' is not OK and, if so, prints the error ** Check whether 'status' is not OK and, if so, prints the error
** message on the top of the stack. Because this function can be called ** message on the top of the stack.
** unprotected, it only accepts actual strings as error messages. (A
** coercion could raise a memory error.)
*/ */
static int report (lua_State *L, int status) { static int report (lua_State *L, int status) {
if (status != LUA_OK) { if (status != LUA_OK) {
const char *msg = (lua_type(L, -1) == LUA_TSTRING) const char *msg = lua_tostring(L, -1);
? lua_tostring(L, -1)
: "(error object is not a string)";
l_message(progname, msg); l_message(progname, msg);
lua_pop(L, 1); lua_pop(L, 1); /* remove message */
} }
return status; return status;
} }
/* /*
** Message handler to be used to run all chunks ** Message handler used to run all chunks
*/ */
static int msghandler (lua_State *L) { static int msghandler (lua_State *L) {
const char *msg = lua_tostring(L, 1); const char *msg = lua_tostring(L, 1);
if (msg) /* is error object a string? */ if (msg == NULL) { /* is error object not a string? */
luaL_traceback(L, L, msg, 1); /* use standard traceback */ if (luaL_callmeta(L, 1, "__tostring") && /* did have a metamethod */
else /* non-string error object */ lua_type(L, -1) == LUA_TSTRING) /* and it produce a string? */
luaL_callmeta(L, 1, "__tostring"); /* try its 'tostring' metamethod */ return 1; /* that is the message */
/* if no metamethod, original object still is in the stack */ else
msg = lua_pushfstring(L, "(error object is a %s value)",
luaL_typename(L, 1));
}
luaL_traceback(L, L, msg, 1); /* append a standard traceback */
return 1; return 1;
} }