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

stand-alone error-message details

This commit is contained in:
Roberto Ierusalimschy 2007-09-05 14:17:39 -03:00
parent 9b47cee8b2
commit c676f13e1a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lauxlib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lauxlib.c,v 1.171 2007/06/22 15:39:34 roberto Exp roberto $ ** $Id: lauxlib.c,v 1.172 2007/08/10 12:56:02 roberto Exp roberto $
** Auxiliary functions for building Lua libraries ** Auxiliary functions for building Lua libraries
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */

6
lua.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lua.c,v 1.166 2007/06/22 15:33:54 roberto Exp roberto $ ** $Id: lua.c,v 1.167 2007/08/07 16:53:40 roberto Exp roberto $
** Lua stand-alone interpreter ** Lua stand-alone interpreter
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -76,7 +76,7 @@ static int report (lua_State *L, int status) {
static int traceback (lua_State *L) { static int traceback (lua_State *L) {
const char *msg = lua_tostring(L, 1); const char *msg = lua_tostring(L, 1);
if (msg) if (msg)
luaL_traceback(L, L, msg, 2); luaL_traceback(L, L, msg, 1);
else if (!lua_isnoneornil(L, 1)) { /* is there an error object? */ else if (!lua_isnoneornil(L, 1)) { /* is there an error object? */
if (!luaL_callmeta(L, 1, "__tostring")) /* try its 'tostring' metamethod */ if (!luaL_callmeta(L, 1, "__tostring")) /* try its 'tostring' metamethod */
lua_pushliteral(L, "(no error message)"); lua_pushliteral(L, "(no error message)");
@ -141,7 +141,7 @@ static int dostring (lua_State *L, const char *s, const char *name) {
static int dolibrary (lua_State *L, const char *name) { static int dolibrary (lua_State *L, const char *name) {
lua_getglobal(L, "require"); lua_getglobal(L, "require");
lua_pushstring(L, name); lua_pushstring(L, name);
return report(L, lua_pcall(L, 1, 0, 0)); return report(L, docall(L, 1, 1));
} }