summaryrefslogtreecommitdiff
path: root/src/lvm.c
diff options
context:
space:
mode:
authorLua Team <team@lua.org>2011-11-30 12:00:00 +0000
committerrepogen <>2011-11-30 12:00:00 +0000
commitac1beaea25f1fec341e1edb168c63ac7131a6bdd (patch)
tree07b408b92516a459a685fdc1aca30694663051f3 /src/lvm.c
parentdfa489618335f21b74e1b2040a64b28dcbe048a6 (diff)
downloadlua-github-5.2.0-rc3.tar.gz
Lua 5.2.0-rc35.2.0-rc3
Diffstat (limited to 'src/lvm.c')
-rw-r--r--src/lvm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lvm.c b/src/lvm.c
index de340776..2eff0fcd 100644
--- a/src/lvm.c
+++ b/src/lvm.c
@@ -1,5 +1,5 @@
/*
-** $Id: lvm.c,v 2.144 2011/10/07 20:45:19 roberto Exp $
+** $Id: lvm.c,v 2.146 2011/11/29 15:54:38 roberto Exp $
** Lua virtual machine
** See Copyright Notice in lua.h
*/
@@ -515,6 +515,7 @@ void luaV_finishOp (lua_State *L) {
#define vmdispatch(o) switch(o)
#define vmcase(l,b) case l: {b} break;
+#define vmcasenb(l,b) case l: {b} /* nb = no break */
void luaV_execute (lua_State *L) {
CallInfo *ci = L->ci;
@@ -534,7 +535,7 @@ void luaV_execute (lua_State *L) {
(--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
Protect(traceexec(L));
}
- /* warning!! several calls may realloc the stack and invalidate `ra' */
+ /* WARNING: several calls may realloc the stack and invalidate `ra' */
ra = RA(i);
lua_assert(base == ci->u.l.base);
lua_assert(base <= L->top && L->top < L->stack + L->stacksize);
@@ -741,7 +742,7 @@ void luaV_execute (lua_State *L) {
goto newframe; /* restart luaV_execute over new Lua function */
}
)
- vmcase(OP_RETURN,
+ vmcasenb(OP_RETURN,
int b = GETARG_B(i);
if (b != 0) L->top = ra+b-1;
if (cl->p->sizep > 0) luaF_close(L, base);
@@ -780,7 +781,7 @@ void luaV_execute (lua_State *L) {
setnvalue(ra, luai_numsub(L, nvalue(ra), nvalue(pstep)));
ci->u.l.savedpc += GETARG_sBx(i);
)
- vmcase(OP_TFORCALL,
+ vmcasenb(OP_TFORCALL,
StkId cb = ra + 3; /* call base */
setobjs2s(L, cb+2, ra+2);
setobjs2s(L, cb+1, ra+1);