nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small optimization when returning a single local value

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2002-03-14 15:32:37 -03:00
parent 7ff21273d6
commit 9681ff09db
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lparser.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lparser.c,v 1.168 2002/03/08 19:10:32 roberto Exp roberto $ ** $Id: lparser.c,v 1.169 2002/03/14 18:01:52 roberto Exp roberto $
** Lua Parser ** Lua Parser
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -341,7 +341,6 @@ static void leaveblock (FuncState *fs) {
lua_assert(bl->nactloc == fs->nactloc); lua_assert(bl->nactloc == fs->nactloc);
lua_assert(bl->nactvar == fs->nactvar); lua_assert(bl->nactvar == fs->nactvar);
fs->defaultglob = bl->defaultglob; fs->defaultglob = bl->defaultglob;
fs->freereg = bl->nactloc; /* free registers used by locals */
luaK_patchtohere(fs, bl->breaklist); luaK_patchtohere(fs, bl->breaklist);
} }
@@ -1202,20 +1201,23 @@ static void retstat (LexState *ls) {
if (block_follow(ls->t.token) || ls->t.token == ';') if (block_follow(ls->t.token) || ls->t.token == ';')
first = nret = 0; /* return no values */ first = nret = 0; /* return no values */
else { else {
explist1(ls, &e); /* optional return values */ nret = explist1(ls, &e); /* optional return values */
if (e.k == VCALL) { if (e.k == VCALL) {
luaK_setcallreturns(fs, &e, LUA_MULTRET); luaK_setcallreturns(fs, &e, LUA_MULTRET);
first = fs->nactloc; first = fs->nactloc;
nret = LUA_MULTRET; /* return all values */ nret = LUA_MULTRET; /* return all values */
} }
else { else {
luaK_exp2nextreg(fs, &e); /* values must go to the `stack' */ if (nret == 1) /* only one single value? */
first = fs->nactloc; first = luaK_exp2anyreg(fs, &e);
nret = fs->freereg - first; /* return all `active' values */ else {
luaK_exp2nextreg(fs, &e); /* values must go to the `stack' */
first = fs->nactloc; /* return all `active' values */
lua_assert(nret == fs->freereg - first);
}
} }
} }
luaK_codeABC(fs, OP_RETURN, first, nret+1, 0); luaK_codeABC(fs, OP_RETURN, first, nret+1, 0);
fs->freereg = fs->nactloc; /* removes all temp values */
} }