GitHub/lua
1
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2025-01-28 06:03:00 +08:00
Code Issues Projects Releases Wiki Activity

xpcall now is builtin + new macros `ttis*'

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2002-08-05 11:10:10 -03:00
parent 79c8edb6c4
commit 390fc99a5c
1 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ltests.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: ltests.c,v 1.129 2002/07/09 14:58:28 roberto Exp roberto $ ** $Id: ltests.c,v 1.130 2002/07/17 16:25:13 roberto Exp roberto $
** Internal Module for Debugging of the Lua Implementation ** Internal Module for Debugging of the Lua Implementation
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -299,9 +299,9 @@ static int table_query (lua_State *L) {
lua_pushnil(L); lua_pushnil(L);
} }
else if ((i -= t->sizearray) < sizenode(t)) { else if ((i -= t->sizearray) < sizenode(t)) {
if (ttype(val(node(t, i))) != LUA_TNIL || if (!ttisnil(val(node(t, i))) ||
ttype(key(node(t, i))) == LUA_TNIL || ttisnil(key(node(t, i))) ||
ttype(key(node(t, i))) == LUA_TNUMBER) { ttisnumber(key(node(t, i)))) {
luaA_pushobject(L, key(node(t, i))); luaA_pushobject(L, key(node(t, i)));
} }
else else
@ -338,34 +338,6 @@ static int string_query (lua_State *L) {
} }
static int xpcall (lua_State *L) {
int status;
luaL_check_type(L, 1, LUA_TFUNCTION);
luaL_check_any(L, 2);
lua_pushliteral(L, LUA_TRACEBACK);
lua_gettable(L, LUA_REGISTRYINDEX);
lua_pushliteral(L, LUA_TRACEBACK);
lua_pushvalue(L, 1);
lua_settable(L, LUA_REGISTRYINDEX);
lua_replace(L, 1);
status = lua_pcall(L, lua_gettop(L) - 2, LUA_MULTRET);
lua_pushliteral(L, LUA_TRACEBACK);
lua_pushvalue(L, 1);
lua_settable(L, LUA_REGISTRYINDEX);
if (status != 0) {
int numres = (status == LUA_ERRRUN) ? 3 : 2;
lua_pushnil(L);
lua_insert(L, -numres);
return numres;
}
else {
lua_pushboolean(L, 1);
lua_insert(L, 2);
return lua_gettop(L) - 1; /* return `true' + all results */
}
}
static int tref (lua_State *L) { static int tref (lua_State *L) {
int level = lua_gettop(L); int level = lua_gettop(L);
int lock = luaL_opt_int(L, 2, 1); int lock = luaL_opt_int(L, 2, 1);
@ -484,8 +456,10 @@ static int doremote (lua_State *L) {
int status; int status;
lua_settop(L1, 0); lua_settop(L1, 0);
status = luaL_loadbuffer(L1, code, lcode, code); status = luaL_loadbuffer(L1, code, lcode, code);
if (status == 0) if (status == 0) {
status = lua_pcall(L1, 0, LUA_MULTRET); status = lua_pcall(L1, 0, LUA_MULTRET);
if (status != 0) lua_pcallreset(L1);
}
if (status != 0) { if (status != 0) {
lua_pushnil(L); lua_pushnil(L);
lua_pushnumber(L, status); lua_pushnumber(L, status);
@ -711,7 +685,6 @@ static const struct luaL_reg tests_funcs[] = {
{"loadlib", loadlib}, {"loadlib", loadlib},
{"stacklevel", stacklevel}, {"stacklevel", stacklevel},
{"querystr", string_query}, {"querystr", string_query},
{"xpcall", xpcall},
{"querytab", table_query}, {"querytab", table_query},
{"testC", testC}, {"testC", testC},
{"ref", tref}, {"ref", tref},