3 files changed, 12 insertions, 3 deletions

diff --git a/lapi.c b/lapi.c
index d159df84..8f07a35b 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 2.76 2009/04/17 22:00:01 roberto Exp roberto $
+** $Id: lapi.c,v 2.78 2009/06/01 19:09:26 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -99,6 +99,11 @@ LUA_API int lua_checkstack (lua_State *L, int size) {
 }
 
 
+LUA_API lua_State *lua_mainthread (lua_State *L) {
+  return G(L)->mainthread;
+}
+
+
 LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) {
   int i;
   if (from == to) return;
diff --git a/ltests.c b/ltests.c
index e2c15f14..cb451f98 100644
--- a/ltests.c
+++ b/ltests.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ltests.c,v 2.63 2009/06/01 19:09:26 roberto Exp roberto $
+** $Id: ltests.c,v 2.64 2009/06/10 16:57:53 roberto Exp roberto $
 ** Internal Module for Debugging of the Lua Implementation
 ** See Copyright Notice in lua.h
 */
@@ -698,6 +698,8 @@ static int doonnewstack (lua_State *L) {
   size_t l;
   const char *s = luaL_checklstring(L, 1, &l);
   int status = luaL_loadbuffer(L1, s, l, s);
+  lua_State *ML = lua_mainthread(L1);
+  lua_assert(L1 != L && ML != L1 && lua_mainthread(L) == ML);
   if (status == LUA_OK)
     status = lua_pcall(L1, 0, 0, 0);
   lua_pushinteger(L, status);
diff --git a/lua.h b/lua.h
index 2836832b..62205158 100644
--- a/lua.h
+++ b/lua.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lua.h,v 1.236 2009/04/17 14:28:06 roberto Exp roberto $
+** $Id: lua.h,v 1.237 2009/05/21 20:06:11 roberto Exp roberto $
 ** Lua - An Extensible Extension Language
 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
@@ -113,6 +113,8 @@ LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
 LUA_API void       (lua_close) (lua_State *L);
 LUA_API lua_State *(lua_newthread) (lua_State *L);
 
+LUA_API lua_State *(lua_mainthread) (lua_State *L);
+
 LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);