rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid 'continue' unless necessary

This commit is contained in:
Roberto Ierusalimschy 2010-02-27 18:16:24 -03:00
parent 622e448710
commit 347f0c33d1
2 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llex.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: llex.c,v 2.33 2009/05/18 17:28:04 roberto Exp roberto $ ** $Id: llex.c,v 2.34 2009/11/17 16:33:38 roberto Exp roberto $
** Lexical Analyzer ** Lexical Analyzer
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -313,11 +313,11 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
switch (ls->current) { switch (ls->current) {
case EOZ: case EOZ:
lexerror(ls, "unfinished string", TK_EOS); lexerror(ls, "unfinished string", TK_EOS);
continue; /* to avoid warnings */ break; /* to avoid warnings */
case '\n': case '\n':
case '\r': case '\r':
lexerror(ls, "unfinished string", TK_STRING); lexerror(ls, "unfinished string", TK_STRING);
continue; /* to avoid warnings */ break; /* to avoid warnings */
case '\\': { /* escape sequences */ case '\\': { /* escape sequences */
int c; /* final character to be saved */ int c; /* final character to be saved */
next(ls); /* do not save the `\' */ next(ls); /* do not save the `\' */
@ -343,7 +343,7 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
} }
next(ls); next(ls);
save(ls, c); save(ls, c);
continue; break;
} }
default: default:
save_and_next(ls); save_and_next(ls);
@ -362,7 +362,7 @@ static int llex (LexState *ls, SemInfo *seminfo) {
case '\n': case '\n':
case '\r': { case '\r': {
inclinenumber(ls); inclinenumber(ls);
continue; break;
} }
case '-': { case '-': {
next(ls); next(ls);
@ -375,13 +375,13 @@ static int llex (LexState *ls, SemInfo *seminfo) {
if (sep >= 0) { if (sep >= 0) {
read_long_string(ls, NULL, sep); /* long comment */ read_long_string(ls, NULL, sep); /* long comment */
luaZ_resetbuffer(ls->buff); luaZ_resetbuffer(ls->buff);
continue; break;
} }
} }
/* else short comment */ /* else short comment */
while (!currIsNewline(ls) && ls->current != EOZ) while (!currIsNewline(ls) && ls->current != EOZ)
next(ls); next(ls);
continue; break;
} }
case '[': { case '[': {
int sep = skip_sep(ls); int sep = skip_sep(ls);
@ -437,7 +437,7 @@ static int llex (LexState *ls, SemInfo *seminfo) {
if (lisspace(ls->current)) { if (lisspace(ls->current)) {
lua_assert(!currIsNewline(ls)); lua_assert(!currIsNewline(ls));
next(ls); next(ls);
continue; break;
} }
else if (lisdigit(ls->current)) { else if (lisdigit(ls->current)) {
read_numeral(ls, seminfo); read_numeral(ls, seminfo);

102
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.103 2010/01/15 16:23:58 roberto Exp roberto $ ** $Id: lvm.c,v 2.104 2010/02/26 20:40:29 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -448,10 +448,15 @@ void luaV_finishOp (lua_State *L) {
void luaV_execute (lua_State *L) { void luaV_execute (lua_State *L) {
CallInfo *ci = L->ci; CallInfo *ci = L->ci;
LClosure *cl = &clvalue(ci->func)->l; LClosure *cl;
TValue *k = cl->p->k; TValue *k;
StkId base = ci->u.l.base; StkId base;
newframe: /* reentry point when frame changes (call/return) */
lua_assert(isLua(ci)); lua_assert(isLua(ci));
lua_assert(ci == L->ci);
cl = &clvalue(ci->func)->l;
k = cl->p->k;
base = ci->u.l.base;
/* main loop of interpreter */ /* main loop of interpreter */
for (;;) { for (;;) {
Instruction i = *(ci->u.l.savedpc++); Instruction i = *(ci->u.l.savedpc++);
@ -472,29 +477,29 @@ void luaV_execute (lua_State *L) {
switch (GET_OPCODE(i)) { switch (GET_OPCODE(i)) {
case OP_MOVE: { case OP_MOVE: {
setobjs2s(L, ra, RB(i)); setobjs2s(L, ra, RB(i));
continue; break;
} }
case OP_LOADK: { case OP_LOADK: {
TValue *rb = KBx(i); TValue *rb = KBx(i);
setobj2s(L, ra, rb); setobj2s(L, ra, rb);
continue; break;
} }
case OP_LOADBOOL: { case OP_LOADBOOL: {
setbvalue(ra, GETARG_B(i)); setbvalue(ra, GETARG_B(i));
if (GETARG_C(i)) ci->u.l.savedpc++; /* skip next instruction (if C) */ if (GETARG_C(i)) ci->u.l.savedpc++; /* skip next instruction (if C) */
continue; break;
} }
case OP_LOADNIL: { case OP_LOADNIL: {
TValue *rb = RB(i); TValue *rb = RB(i);
do { do {
setnilvalue(rb--); setnilvalue(rb--);
} while (rb >= ra); } while (rb >= ra);
continue; break;
} }
case OP_GETUPVAL: { case OP_GETUPVAL: {
int b = GETARG_B(i); int b = GETARG_B(i);
setobj2s(L, ra, cl->upvals[b]->v); setobj2s(L, ra, cl->upvals[b]->v);
continue; break;
} }
case OP_GETGLOBAL: { case OP_GETGLOBAL: {
TValue g; TValue g;
@ -502,16 +507,16 @@ void luaV_execute (lua_State *L) {
sethvalue(L, &g, cl->env); sethvalue(L, &g, cl->env);
lua_assert(ttisstring(rb)); lua_assert(ttisstring(rb));
Protect(luaV_gettable(L, &g, rb, ra)); Protect(luaV_gettable(L, &g, rb, ra));
continue; break;
} }
case OP_GETTABUP: { case OP_GETTABUP: {
int b = GETARG_B(i); int b = GETARG_B(i);
Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra)); Protect(luaV_gettable(L, cl->upvals[b]->v, RKC(i), ra));
continue; break;
} }
case OP_GETTABLE: { case OP_GETTABLE: {
Protect(luaV_gettable(L, RB(i), RKC(i), ra)); Protect(luaV_gettable(L, RB(i), RKC(i), ra));
continue; break;
} }
case OP_SETGLOBAL: { case OP_SETGLOBAL: {
TValue g; TValue g;
@ -519,22 +524,22 @@ void luaV_execute (lua_State *L) {
sethvalue(L, &g, cl->env); sethvalue(L, &g, cl->env);
lua_assert(ttisstring(rb)); lua_assert(ttisstring(rb));
Protect(luaV_settable(L, &g, rb, ra)); Protect(luaV_settable(L, &g, rb, ra));
continue; break;
} }
case OP_SETTABUP: { case OP_SETTABUP: {
int a = GETARG_A(i); int a = GETARG_A(i);
Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i))); Protect(luaV_settable(L, cl->upvals[a]->v, RKB(i), RKC(i)));
continue; break;
} }
case OP_SETUPVAL: { case OP_SETUPVAL: {
UpVal *uv = cl->upvals[GETARG_B(i)]; UpVal *uv = cl->upvals[GETARG_B(i)];
setobj(L, uv->v, ra); setobj(L, uv->v, ra);
luaC_barrier(L, uv, ra); luaC_barrier(L, uv, ra);
continue; break;
} }
case OP_SETTABLE: { case OP_SETTABLE: {
Protect(luaV_settable(L, ra, RKB(i), RKC(i))); Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
continue; break;
} }
case OP_NEWTABLE: { case OP_NEWTABLE: {
int b = GETARG_B(i); int b = GETARG_B(i);
@ -544,37 +549,37 @@ void luaV_execute (lua_State *L) {
if (b != 0 || c != 0) if (b != 0 || c != 0)
luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c)); luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c));
Protect(luaC_checkGC(L)); Protect(luaC_checkGC(L));
continue; break;
} }
case OP_SELF: { case OP_SELF: {
StkId rb = RB(i); StkId rb = RB(i);
setobjs2s(L, ra+1, rb); setobjs2s(L, ra+1, rb);
Protect(luaV_gettable(L, rb, RKC(i), ra)); Protect(luaV_gettable(L, rb, RKC(i), ra));
continue; break;
} }
case OP_ADD: { case OP_ADD: {
arith_op(luai_numadd, TM_ADD); arith_op(luai_numadd, TM_ADD);
continue; break;
} }
case OP_SUB: { case OP_SUB: {
arith_op(luai_numsub, TM_SUB); arith_op(luai_numsub, TM_SUB);
continue; break;
} }
case OP_MUL: { case OP_MUL: {
arith_op(luai_nummul, TM_MUL); arith_op(luai_nummul, TM_MUL);
continue; break;
} }
case OP_DIV: { case OP_DIV: {
arith_op(luai_numdiv, TM_DIV); arith_op(luai_numdiv, TM_DIV);
continue; break;
} }
case OP_MOD: { case OP_MOD: {
arith_op(luai_nummod, TM_MOD); arith_op(luai_nummod, TM_MOD);
continue; break;
} }
case OP_POW: { case OP_POW: {
arith_op(luai_numpow, TM_POW); arith_op(luai_numpow, TM_POW);
continue; break;
} }
case OP_UNM: { case OP_UNM: {
TValue *rb = RB(i); TValue *rb = RB(i);
@ -585,16 +590,16 @@ void luaV_execute (lua_State *L) {
else { else {
Protect(luaV_arith(L, ra, rb, rb, TM_UNM)); Protect(luaV_arith(L, ra, rb, rb, TM_UNM));
} }
continue; break;
} }
case OP_NOT: { case OP_NOT: {
int res = l_isfalse(RB(i)); /* next assignment may change this value */ int res = l_isfalse(RB(i)); /* next assignment may change this value */
setbvalue(ra, res); setbvalue(ra, res);
continue; break;
} }
case OP_LEN: { case OP_LEN: {
Protect(luaV_objlen(L, ra, RB(i))); Protect(luaV_objlen(L, ra, RB(i)));
continue; break;
} }
case OP_CONCAT: { case OP_CONCAT: {
int b = GETARG_B(i); int b = GETARG_B(i);
@ -603,11 +608,11 @@ void luaV_execute (lua_State *L) {
Protect(luaV_concat(L, c-b+1); luaC_checkGC(L)); Protect(luaV_concat(L, c-b+1); luaC_checkGC(L));
L->top = ci->top; /* restore top */ L->top = ci->top; /* restore top */
setobjs2s(L, RA(i), base+b); setobjs2s(L, RA(i), base+b);
continue; break;
} }
case OP_JMP: { case OP_JMP: {
dojump(GETARG_sBx(i)); dojump(GETARG_sBx(i));
continue; break;
} }
case OP_EQ: { case OP_EQ: {
TValue *rb = RKB(i); TValue *rb = RKB(i);
@ -617,7 +622,7 @@ void luaV_execute (lua_State *L) {
dojump(GETARG_sBx(*ci->u.l.savedpc)); dojump(GETARG_sBx(*ci->u.l.savedpc));
) )
ci->u.l.savedpc++; ci->u.l.savedpc++;
continue; break;
} }
case OP_LT: { case OP_LT: {
Protect( Protect(
@ -625,7 +630,7 @@ void luaV_execute (lua_State *L) {
dojump(GETARG_sBx(*ci->u.l.savedpc)); dojump(GETARG_sBx(*ci->u.l.savedpc));
) )
ci->u.l.savedpc++; ci->u.l.savedpc++;
continue; break;
} }
case OP_LE: { case OP_LE: {
Protect( Protect(
@ -633,13 +638,13 @@ void luaV_execute (lua_State *L) {
dojump(GETARG_sBx(*ci->u.l.savedpc)); dojump(GETARG_sBx(*ci->u.l.savedpc));
) )
ci->u.l.savedpc++; ci->u.l.savedpc++;
continue; break;
} }
case OP_TEST: { case OP_TEST: {
if (GETARG_C(i) ? !l_isfalse(ra) : l_isfalse(ra)) if (GETARG_C(i) ? !l_isfalse(ra) : l_isfalse(ra))
dojump(GETARG_sBx(*ci->u.l.savedpc)); dojump(GETARG_sBx(*ci->u.l.savedpc));
ci->u.l.savedpc++; ci->u.l.savedpc++;
continue; break;
} }
case OP_TESTSET: { case OP_TESTSET: {
TValue *rb = RB(i); TValue *rb = RB(i);
@ -648,7 +653,7 @@ void luaV_execute (lua_State *L) {
dojump(GETARG_sBx(*ci->u.l.savedpc)); dojump(GETARG_sBx(*ci->u.l.savedpc));
} }
ci->u.l.savedpc++; ci->u.l.savedpc++;
continue; break;
} }
case OP_CALL: { case OP_CALL: {
int b = GETARG_B(i); int b = GETARG_B(i);
@ -657,12 +662,12 @@ void luaV_execute (lua_State *L) {
if (luaD_precall(L, ra, nresults)) { /* C function? */ if (luaD_precall(L, ra, nresults)) { /* C function? */
if (nresults >= 0) L->top = ci->top; /* adjust results */ if (nresults >= 0) L->top = ci->top; /* adjust results */
base = ci->u.l.base; base = ci->u.l.base;
continue; break;
} }
else { /* Lua function */ else { /* Lua function */
ci = L->ci; ci = L->ci;
ci->callstatus |= CIST_REENTRY; ci->callstatus |= CIST_REENTRY;
break; /* restart luaV_execute over new Lua function */ goto newframe; /* restart luaV_execute over new Lua function */
} }
} }
case OP_TAILCALL: { case OP_TAILCALL: {
@ -671,7 +676,7 @@ void luaV_execute (lua_State *L) {
lua_assert(GETARG_C(i) - 1 == LUA_MULTRET); lua_assert(GETARG_C(i) - 1 == LUA_MULTRET);
if (luaD_precall(L, ra, LUA_MULTRET)) { /* C function? */ if (luaD_precall(L, ra, LUA_MULTRET)) { /* C function? */
base = ci->u.l.base; base = ci->u.l.base;
continue; break;
} }
else { else {
/* tail call: put called frame (n) in place of caller one (o) */ /* tail call: put called frame (n) in place of caller one (o) */
@ -693,7 +698,7 @@ void luaV_execute (lua_State *L) {
oci->callstatus |= CIST_TAIL; /* function was tail called */ oci->callstatus |= CIST_TAIL; /* function was tail called */
ci = L->ci = oci; /* remove new frame */ ci = L->ci = oci; /* remove new frame */
lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize); lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize);
break; /* restart luaV_execute over new Lua function */ goto newframe; /* restart luaV_execute over new Lua function */
} }
} }
case OP_RETURN: { case OP_RETURN: {
@ -708,7 +713,7 @@ void luaV_execute (lua_State *L) {
if (b) L->top = ci->top; if (b) L->top = ci->top;
lua_assert(isLua(ci)); lua_assert(isLua(ci));
lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL); lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL);
break; /* restart luaV_execute over new Lua function */ goto newframe; /* restart luaV_execute over new Lua function */
} }
} }
case OP_FORLOOP: { case OP_FORLOOP: {
@ -721,7 +726,7 @@ void luaV_execute (lua_State *L) {
setnvalue(ra, idx); /* update internal index... */ setnvalue(ra, idx); /* update internal index... */
setnvalue(ra+3, idx); /* ...and external index */ setnvalue(ra+3, idx); /* ...and external index */
} }
continue; break;
} }
case OP_FORPREP: { case OP_FORPREP: {
const TValue *init = ra; const TValue *init = ra;
@ -735,7 +740,7 @@ void luaV_execute (lua_State *L) {
luaG_runerror(L, LUA_QL("for") " step must be a number"); luaG_runerror(L, LUA_QL("for") " step must be a number");
setnvalue(ra, luai_numsub(L, nvalue(ra), nvalue(pstep))); setnvalue(ra, luai_numsub(L, nvalue(ra), nvalue(pstep)));
dojump(GETARG_sBx(i)); dojump(GETARG_sBx(i));
continue; break;
} }
case OP_TFORCALL: { case OP_TFORCALL: {
StkId cb = ra + 3; /* call base */ StkId cb = ra + 3; /* call base */
@ -755,7 +760,7 @@ void luaV_execute (lua_State *L) {
setobjs2s(L, ra, ra + 1); /* save control variable */ setobjs2s(L, ra, ra + 1); /* save control variable */
dojump(GETARG_sBx(i)); /* jump back */ dojump(GETARG_sBx(i)); /* jump back */
} }
continue; break;
} }
case OP_SETLIST: { case OP_SETLIST: {
int n = GETARG_B(i); int n = GETARG_B(i);
@ -777,11 +782,11 @@ void luaV_execute (lua_State *L) {
luaC_barriert(L, h, val); luaC_barriert(L, h, val);
} }
L->top = ci->top; /* correct top (in case of previous open call) */ L->top = ci->top; /* correct top (in case of previous open call) */
continue; break;
} }
case OP_CLOSE: { case OP_CLOSE: {
luaF_close(L, ra); luaF_close(L, ra);
continue; break;
} }
case OP_CLOSURE: { case OP_CLOSURE: {
Proto *p = cl->p->p[GETARG_Bx(i)]; /* prototype for new closure */ Proto *p = cl->p->p[GETARG_Bx(i)]; /* prototype for new closure */
@ -806,7 +811,7 @@ void luaV_execute (lua_State *L) {
ncl->l.upvals[j] = cl->upvals[uv[j].idx]; ncl->l.upvals[j] = cl->upvals[uv[j].idx];
} }
Protect(luaC_checkGC(L)); Protect(luaC_checkGC(L));
continue; break;
} }
case OP_VARARG: { case OP_VARARG: {
int b = GETARG_B(i) - 1; int b = GETARG_B(i) - 1;
@ -826,18 +831,13 @@ void luaV_execute (lua_State *L) {
setnilvalue(ra + j); setnilvalue(ra + j);
} }
} }
continue; break;
} }
case OP_EXTRAARG: { case OP_EXTRAARG: {
luaG_runerror(L, "bad opcode"); luaG_runerror(L, "bad opcode");
return; return;
} }
} }
/* function changed (call/return): update pointers */
lua_assert(ci == L->ci);
cl = &clvalue(ci->func)->l;
k = cl->p->k;
base = ci->u.l.base;
} }
} }