 @@ -1,14 +1,14 @@
-/*	$NetBSD: lcorolib.c,v 1.8 2023/04/16 20:46:17 nikita Exp $	*/
+/*	$NetBSD: lcorolib.c,v 1.9 2023/04/17 20:33:12 nikita Exp $	*/
 /*
 ** Id: lcorolib.c
 ** Coroutine Library
 ** See Copyright Notice in lua.h
 */
 #define lcorolib_c
 #define LUA_LIB
 #include "lprefix.h"
 @@ -70,27 +70,27 @@ static int luaB_coresume (lua_State *L)
     lua_pushboolean(L, 1);
     lua_insert(L, -(r + 1));
     return r + 1;  /* return true + 'resume' returns */
+  }
+}
 static int luaB_auxwrap (lua_State *L) {
   lua_State *co = lua_tothread(L, lua_upvalueindex(1));
   int r = auxresume(L, co, lua_gettop(L));
   if (l_unlikely(r < 0)) {  /* error? */
     int stat = lua_status(co);
     if (stat != LUA_OK && stat != LUA_YIELD) {  /* error in the coroutine? */
-      stat = lua_resetthread(co);  /* close its tbc variables */
+      stat = lua_resetthread(co, L);  /* close its tbc variables */
       lua_assert(stat != LUA_OK);
       lua_xmove(co, L, 1);  /* move error message to the caller */
+    }
     if (stat != LUA_ERRMEM &&  /* not a memory error and ... */
         lua_type(L, -1) == LUA_TSTRING) {  /* ... error object is a string? */
       luaL_where(L, 1);  /* add extra info, if available */
       lua_insert(L, -2);
       lua_concat(L, 2);
+    }
     return lua_error(L);  /* propagate error */
+  }
   return r;
+}
 @@ -166,27 +166,27 @@ static int luaB_yieldable (lua_State *L)
 static int luaB_corunning (lua_State *L) {
   int ismain = lua_pushthread(L);
   lua_pushboolean(L, ismain);
   return 2;
+}
 static int luaB_close (lua_State *L) {
   lua_State *co = getco(L);
   int status = auxstatus(L, co);
   switch (status) {
     case COS_DEAD: case COS_YIELD: {
-      status = lua_resetthread(co);
+      status = lua_resetthread(co, L);
       if (status == LUA_OK) {
         lua_pushboolean(L, 1);
         return 1;
+      }
       else {
         lua_pushboolean(L, 0);
         lua_xmove(co, L, 1);  /* move error message */
         return 2;
+      }
+    }
     default:  /* normal or running coroutine */
       return luaL_error(L, "cannot close a %s coroutine", statname[status]);
+  }

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lstate.c,v 1.10 2023/04/16 20:46:17 nikita Exp $	*/
+/*	$NetBSD: lstate.c,v 1.11 2023/04/17 20:33:12 nikita Exp $	*/
 /*
 ** Id: lstate.c
 ** Global State
 ** See Copyright Notice in lua.h
 */
 #define lstate_c
 #define LUA_CORE
 #include "lprefix.h"
 @@ -337,29 +337,30 @@ int luaE_resetthread (lua_State *L, int
     status = LUA_OK;
   L->status = LUA_OK;  /* so it can run __close metamethods */
   status = luaD_closeprotected(L, 1, status);
   if (status != LUA_OK)  /* errors? */
     luaD_seterrorobj(L, status, L->stack + 1);
   else
     L->top = L->stack + 1;
   ci->top = L->top + LUA_MINSTACK;
   luaD_reallocstack(L, cast_int(ci->top - L->stack), 0);
   return status;
+}
-LUA_API int lua_resetthread (lua_State *L) {
+LUA_API int lua_resetthread (lua_State *L, lua_State *from) {
   int status;
   lua_lock(L);
   L->nCcalls = (from) ? getCcalls(from) : 0;
   status = luaE_resetthread(L, L->status);
   lua_unlock(L);
   return status;
+}
 LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
   int i;
   lua_State *L;
   global_State *g;
   LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG)));
   if (l == NULL) return NULL;
   L = &l->l.l;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lua.h,v 1.12 2023/04/16 20:46:17 nikita Exp $	*/
+/*	$NetBSD: lua.h,v 1.13 2023/04/17 20:33:12 nikita Exp $	*/
 /*
 ** Id: lua.h
 ** Lua - A Scripting Language
 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
 */
 #ifndef lua_h
 #define lua_h
 #include <stdarg.h>
 @@ -147,27 +147,27 @@ typedef void (*lua_WarnFunction) (void *
 /*
 ** RCS ident string
 */
 extern const char lua_ident[];
 /*
 ** state manipulation
 */
 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 int        (lua_resetthread) (lua_State *L);
+LUA_API int        (lua_resetthread) (lua_State *L, lua_State *from);
 LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
 LUA_API lua_Number (lua_version) (lua_State *L);
 /*
 ** basic stack manipulation
 */
 LUA_API int   (lua_absindex) (lua_State *L, int idx);
 LUA_API int   (lua_gettop) (lua_State *L);
 LUA_API void  (lua_settop) (lua_State *L, int idx);