'getcode' -> 'getinstruction'

This commit is contained in:
Roberto Ierusalimschy
2016-01-05 14:22:37 -02:00
parent 1a44e82200
commit 1f259be52a
3 changed files with 22 additions and 18 deletions

View File

@@ -1,5 +1,5 @@
/*
** $Id: lparser.c,v 2.149 2015/11/02 16:09:30 roberto Exp roberto $
** $Id: lparser.c,v 2.150 2015/12/09 15:21:28 roberto Exp roberto $
** Lua Parser
** See Copyright Notice in lua.h
*/
@@ -1498,7 +1498,7 @@ static void exprstat (LexState *ls) {
}
else { /* stat -> func */
check_condition(ls, v.v.k == VCALL, "syntax error");
SETARG_C(getcode(fs, &v.v), 1); /* call statement uses no results */
SETARG_C(getinstruction(fs, &v.v), 1); /* call statement uses no results */
}
}
@@ -1515,8 +1515,8 @@ static void retstat (LexState *ls) {
if (hasmultret(e.k)) {
luaK_setmultret(fs, &e);
if (e.k == VCALL && nret == 1) { /* tail call? */
SET_OPCODE(getcode(fs,&e), OP_TAILCALL);
lua_assert(GETARG_A(getcode(fs,&e)) == fs->nactvar);
SET_OPCODE(getinstruction(fs,&e), OP_TAILCALL);
lua_assert(GETARG_A(getinstruction(fs,&e)) == fs->nactvar);
}
first = fs->nactvar;
nret = LUA_MULTRET; /* return all values */