lua

A copy of the Lua development repository
Log | Files | Refs | README

commit 4f5f2fe36732d7809a4c0e0856cb9aca02e9ce24
parent 01586d539e214f844fc34dd552ff06843ac0c4f9
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Thu, 21 Jan 2010 14:48:57 -0200

new function 'luaL_cpcall'

Diffstat:
Mlapi.c | 11+----------
Mlauxlib.c | 13++++++++++++-
Mlauxlib.h | 4+++-
Mlua.c | 11++++-------
Mluaconf.h | 9+++++----
5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/lapi.c b/lapi.c @@ -1,5 +1,5 @@ /* -** $Id: lapi.c,v 2.110 2010/01/11 17:38:30 roberto Exp roberto $ +** $Id: lapi.c,v 2.111 2010/01/13 16:18:25 roberto Exp roberto $ ** Lua API ** See Copyright Notice in lua.h */ @@ -1150,12 +1150,3 @@ LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1, luaC_objbarrier(L, f1, *up2); } - -#if defined(LUA_COMPAT_CPCALL) -LUA_API int lua_cpcall (lua_State *L, lua_CFunction func, void *ud) { - lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_CPCALL); - lua_pushlightuserdata(L, &func); - lua_pushlightuserdata(L, ud); - return lua_pcall(L, 2, 0, 0); -} -#endif diff --git a/lauxlib.c b/lauxlib.c @@ -1,5 +1,5 @@ /* -** $Id: lauxlib.c,v 1.195 2009/12/17 16:20:01 roberto Exp roberto $ +** $Id: lauxlib.c,v 1.196 2009/12/22 15:32:50 roberto Exp roberto $ ** Auxiliary functions for building Lua libraries ** See Copyright Notice in lua.h */ @@ -773,3 +773,14 @@ LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver) { ver, *v); } + +LUALIB_API int luaL_cpcall (lua_State *L, lua_CFunction f, int nargs, + int nresults) { + nargs++; /* to include function itself */ + lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_CPCALL); + lua_insert(L, -nargs); + lua_pushlightuserdata(L, &f); + lua_insert(L, -nargs); + return lua_pcall(L, nargs, nresults, 0); +} + diff --git a/lauxlib.h b/lauxlib.h @@ -1,5 +1,5 @@ /* -** $Id: lauxlib.h,v 1.98 2010/01/06 15:14:15 roberto Exp roberto $ +** $Id: lauxlib.h,v 1.99 2010/01/11 16:00:45 roberto Exp roberto $ ** Auxiliary functions for building Lua libraries ** See Copyright Notice in lua.h */ @@ -82,6 +82,8 @@ LUALIB_API const char *(luaL_findtable) (lua_State *L, int idx, LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1, const char *msg, int level); +LUALIB_API int luaL_cpcall (lua_State *L, lua_CFunction f, int nargs, + int nresults); /* diff --git a/lua.c b/lua.c @@ -1,5 +1,5 @@ /* -** $Id: lua.c,v 1.182 2009/12/22 16:47:12 roberto Exp roberto $ +** $Id: lua.c,v 1.183 2010/01/21 16:31:06 roberto Exp roberto $ ** Lua stand-alone interpreter ** See Copyright Notice in lua.h */ @@ -445,7 +445,6 @@ static int pmain (lua_State *L) { int main (int argc, char **argv) { - static lua_CFunction ppmain = &pmain; int status, result; lua_State *L = luaL_newstate(); /* create state */ if (L == NULL) { @@ -453,11 +452,9 @@ int main (int argc, char **argv) { return EXIT_FAILURE; } /* call 'pmain' in protected mode */ - lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_CPCALL); /* calling function */ - lua_pushlightuserdata(L, &ppmain); - lua_pushinteger(L, argc); - lua_pushlightuserdata(L, argv); - status = lua_pcall(L, 3, 1, 0); + lua_pushinteger(L, argc); /* 1st argument */ + lua_pushlightuserdata(L, argv); /* 2nd argument */ + status = luaL_cpcall(L, &pmain, 2, 1); result = lua_toboolean(L, -1); /* get result */ finalreport(L, status); lua_close(L); diff --git a/luaconf.h b/luaconf.h @@ -1,5 +1,5 @@ /* -** $Id: luaconf.h,v 1.130 2010/01/11 17:15:30 roberto Exp roberto $ +** $Id: luaconf.h,v 1.131 2010/01/21 16:31:24 roberto Exp roberto $ ** Configuration file for Lua ** See Copyright Notice in lua.h */ @@ -220,11 +220,11 @@ #define LUA_COMPAT_UNPACK /* -@@ LUA_COMPAT_CPCALL controls the presence of function 'lua_cpcall'. +@@ LUA_COMPAT_CPCALL controls the presence of macro 'lua_cpcall'. ** You can replace it with the preregistered function 'cpcall'. */ -#define LUA_COMPAT_CPCALL -LUA_API int (lua_cpcall) (lua_State *L, lua_CFunction func, void *ud); +#define lua_cpcall(L,f,u) \ + (lua_pushlightuserdata(L,(u)), luaL_cpcall(L,(f),1,0)) /* @@ LUA_COMPAT_FENV controls the presence of functions 'setfenv/getfenv'. @@ -233,6 +233,7 @@ LUA_API int (lua_cpcall) (lua_State *L, lua_CFunction func, void *ud); */ #define LUA_COMPAT_FENV + /* @@ LUA_COMPAT_LOG10 defines the function 'log10' in the math library. ** You can rewrite 'log10(x)' as 'log(x, 10)'.