nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'assert' does not assume that the error object is a string

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2014-06-02 00:06:26 -03:00
parent e9d86eddf3
commit 9e68c047ae
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lbaselib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lbaselib.c,v 1.286 2014/05/01 18:18:06 roberto Exp roberto $ ** $Id: lbaselib.c,v 1.287 2014/05/16 18:54:01 roberto Exp roberto $
** Basic library ** Basic library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -357,9 +357,14 @@ static int luaB_dofile (lua_State *L) {
static int luaB_assert (lua_State *L) { static int luaB_assert (lua_State *L) {
if (!lua_toboolean(L, 1)) if (lua_toboolean(L, 1)) /* condition is true? */
return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!")); return lua_gettop(L); /* return all arguments */
return lua_gettop(L); else { /* error */
if (lua_isnone(L, 2)) /* no error message? */
lua_pushliteral(L, "assertion failed!"); /* use standard message */
lua_remove(L, 1); /* remove the condition (if there is one...) */
return luaB_error(L); /* call 'error' */
}
} }