aboutsummaryrefslogtreecommitdiff
path: root/lcorolib.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2023-06-22 11:41:48 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2023-06-22 11:41:48 -0300
commitab6a94952215b1f66436d8eeebded1dad9fa5409 (patch)
treeba66254537defc76602ce351d962b899ddfe1b29 /lcorolib.c
parent86e8039a72646cd9192fd08a6f1771c90b872ff6 (diff)
parentea39042e13645f63713425c05cc9ee4cfdcf0a40 (diff)
downloadlua-ab6a94952215b1f66436d8eeebded1dad9fa5409.tar.gz
lua-ab6a94952215b1f66436d8eeebded1dad9fa5409.tar.bz2
lua-ab6a94952215b1f66436d8eeebded1dad9fa5409.zip
Merge branch 'master' into nextversion
Diffstat (limited to 'lcorolib.c')
-rw-r--r--lcorolib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lcorolib.c b/lcorolib.c
index 40b880b1..c64adf08 100644
--- a/lcorolib.c
+++ b/lcorolib.c
@@ -76,7 +76,7 @@ static int luaB_auxwrap (lua_State *L) {
76 if (l_unlikely(r < 0)) { /* error? */ 76 if (l_unlikely(r < 0)) { /* error? */
77 int stat = lua_status(co); 77 int stat = lua_status(co);
78 if (stat != LUA_OK && stat != LUA_YIELD) { /* error in the coroutine? */ 78 if (stat != LUA_OK && stat != LUA_YIELD) { /* error in the coroutine? */
79 stat = lua_resetthread(co, L); /* close its tbc variables */ 79 stat = lua_closethread(co, L); /* close its tbc variables */
80 lua_assert(stat != LUA_OK); 80 lua_assert(stat != LUA_OK);
81 lua_xmove(co, L, 1); /* move error message to the caller */ 81 lua_xmove(co, L, 1); /* move error message to the caller */
82 } 82 }
@@ -172,7 +172,7 @@ static int luaB_close (lua_State *L) {
172 int status = auxstatus(L, co); 172 int status = auxstatus(L, co);
173 switch (status) { 173 switch (status) {
174 case COS_DEAD: case COS_YIELD: { 174 case COS_DEAD: case COS_YIELD: {
175 status = lua_resetthread(co, L); 175 status = lua_closethread(co, L);
176 if (status == LUA_OK) { 176 if (status == LUA_OK) {
177 lua_pushboolean(L, 1); 177 lua_pushboolean(L, 1);
178 return 1; 178 return 1;