aboutsummaryrefslogtreecommitdiff
path: root/ldo.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2014-06-10 16:18:50 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2014-06-10 16:18:50 -0300
commit88a9e51f3431548833772207242f9c804fb8e44d (patch)
tree260f1dccf6f7e6efe4326bfb45f695e9558a5a13 /ldo.c
parent8b5940e7ca6a1233b81d850411261c22f2a7a657 (diff)
downloadlua-88a9e51f3431548833772207242f9c804fb8e44d.tar.gz
lua-88a9e51f3431548833772207242f9c804fb8e44d.tar.bz2
lua-88a9e51f3431548833772207242f9c804fb8e44d.zip
bit-field CIST_YIELDED removed (it was never consulted)
Diffstat (limited to 'ldo.c')
-rw-r--r--ldo.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/ldo.c b/ldo.c
index 8adaefcd..51450b92 100644
--- a/ldo.c
+++ b/ldo.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: ldo.c,v 2.118 2014/06/10 17:41:38 roberto Exp roberto $ 2** $Id: ldo.c,v 2.119 2014/06/10 18:51:21 roberto Exp roberto $
3** Stack and Call structure of Lua 3** Stack and Call structure of Lua
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -425,10 +425,10 @@ static void finishCcall (lua_State *L, int status) {
425 ci->callstatus &= ~CIST_YPCALL; /* finish 'lua_pcall' */ 425 ci->callstatus &= ~CIST_YPCALL; /* finish 'lua_pcall' */
426 L->errfunc = ci->u.c.old_errfunc; 426 L->errfunc = ci->u.c.old_errfunc;
427 } 427 }
428 /* finish 'lua_callk'/'lua_pcall' */ 428 /* finish 'lua_callk'/'lua_pcall'; CIST_YPCALL and 'errfunc' already
429 handled */
429 adjustresults(L, ci->nresults); 430 adjustresults(L, ci->nresults);
430 /* call continuation function */ 431 /* call continuation function */
431 ci->callstatus = (ci->callstatus & ~CIST_YPCALL) | CIST_YIELDED;
432 lua_unlock(L); 432 lua_unlock(L);
433 n = (*ci->u.c.k)(L, status, ci->u.c.ctx); 433 n = (*ci->u.c.k)(L, status, ci->u.c.ctx);
434 lua_lock(L); 434 lua_lock(L);
@@ -536,7 +536,6 @@ static void resume (lua_State *L, void *ud) {
536 else { /* 'common' yield */ 536 else { /* 'common' yield */
537 if (ci->u.c.k != NULL) { /* does it have a continuation? */ 537 if (ci->u.c.k != NULL) { /* does it have a continuation? */
538 int n; 538 int n;
539 ci->callstatus |= CIST_YIELDED;
540 lua_unlock(L); 539 lua_unlock(L);
541 n = (*ci->u.c.k)(L, LUA_YIELD, ci->u.c.ctx); /* call continuation */ 540 n = (*ci->u.c.k)(L, LUA_YIELD, ci->u.c.ctx); /* call continuation */
542 lua_lock(L); 541 lua_lock(L);