diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2006-04-12 17:31:15 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2006-04-12 17:31:15 -0300 |
commit | 18330b6091696f2900d89e8ddef6fb548a3ac84d (patch) | |
tree | 69c6b775e656bb6f46b9cda81b912decbb2e8c76 | |
parent | 84879136970b76e5d1782f3b4664c7c8f9076821 (diff) | |
download | lua-github-18330b6091696f2900d89e8ddef6fb548a3ac84d.tar.gz |
lua_dostring/lua_dofile should return any values returned by the chunk
-rw-r--r-- | bugs | 23 | ||||
-rw-r--r-- | lauxlib.h | 8 |
2 files changed, 28 insertions, 3 deletions
@@ -923,3 +923,26 @@ patch = [[ ]], } + + +@Bug{ +what = [[lua_dostring/lua_dofile should return any values returned +by the chunk]], + +patch = [[ +* lauxlib.h: +@@ -108,9 +108,11 @@ + + #define luaL_typename(L,i) lua_typename(L, lua_type(L,(i))) + +-#define luaL_dofile(L, fn) (luaL_loadfile(L, fn) || lua_pcall(L, 0, 0, 0)) ++#define luaL_dofile(L, fn) \ ++ (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0)) + +-#define luaL_dostring(L, s) (luaL_loadstring(L, s) || lua_pcall(L, 0, 0, 0))+#define luaL_dostring(L, s) \ ++ (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0)) + + #define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) +]], + +} @@ -1,5 +1,5 @@ /* -** $Id: lauxlib.h,v 1.86 2005/10/21 13:47:42 roberto Exp roberto $ +** $Id: lauxlib.h,v 1.87 2005/12/29 15:32:11 roberto Exp roberto $ ** Auxiliary functions for building Lua libraries ** See Copyright Notice in lua.h */ @@ -108,9 +108,11 @@ LUALIB_API const char *(luaL_findtable) (lua_State *L, int idx, #define luaL_typename(L,i) lua_typename(L, lua_type(L,(i))) -#define luaL_dofile(L, fn) (luaL_loadfile(L, fn) || lua_pcall(L, 0, 0, 0)) +#define luaL_dofile(L, fn) \ + (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0)) -#define luaL_dostring(L, s) (luaL_loadstring(L, s) || lua_pcall(L, 0, 0, 0)) +#define luaL_dostring(L, s) \ + (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0)) #define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) |