lua

A copy of the Lua development repository
Log | Files | Refs | README

commit 0c7de97d47074b82dd08e67443e78dcee1241277
parent 900b7d4514a29e9214f15213a81e2ee00bd482c3
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Wed, 13 Jan 2010 14:17:08 -0200

correct error message when yielding from outside a coroutine

Diffstat:
Mldo.c | 10+++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ldo.c b/ldo.c @@ -1,5 +1,5 @@ /* -** $Id: ldo.c,v 2.78 2009/12/17 12:28:57 roberto Exp roberto $ +** $Id: ldo.c,v 2.79 2009/12/22 15:32:50 roberto Exp roberto $ ** Stack and Call structure of Lua ** See Copyright Notice in lua.h */ @@ -554,8 +554,12 @@ LUA_API int lua_yieldk (lua_State *L, int nresults, int ctx, lua_CFunction k) { luai_userstateyield(L, nresults); lua_lock(L); api_checknelems(L, nresults); - if (L->nny > 0) - luaG_runerror(L, "attempt to yield across metamethod/C-call boundary"); + if (L->nny > 0) { + if (L != G(L)->mainthread) + luaG_runerror(L, "attempt to yield across metamethod/C-call boundary"); + else + luaG_runerror(L, "attempt to yield from outside a coroutine"); + } L->status = LUA_YIELD; if (isLua(ci)) { /* inside a hook? */ api_check(L, k == NULL, "hooks cannot continue after yielding");