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

SETLIST extra argument now is an "instruction" (OP_EXTRAARG)

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2008-04-02 14:38:54 -03:00
parent 5627d51e05
commit a4d3080fe3
6 changed files with 68 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lcode.c
View File

@@ -1,5 +1,5 @@
/*
** $Id: lcode.c,v 2.33 2007/03/27 14:11:38 roberto Exp roberto $
** $Id: lcode.c,v 2.34 2007/05/04 18:41:49 roberto Exp roberto $
** Code generator for Lua
** See Copyright Notice in lua.h
*/
@@ -824,16 +824,24 @@ int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) {
}
static int luaK_codeAx (FuncState *fs, OpCode o, int a) {
lua_assert(getOpMode(o) == iAx);
return luaK_code(fs, CREATE_Ax(o, a));
}
void luaK_setlist (FuncState *fs, int base, int nelems, int tostore) {
int c = (nelems - 1)/LFIELDS_PER_FLUSH + 1;
int b = (tostore == LUA_MULTRET) ? 0 : tostore;
lua_assert(tostore != 0);
if (c <= MAXARG_C)
luaK_codeABC(fs, OP_SETLIST, base, b, c);
else {
else if (c <= MAXARG_Ax) {
luaK_codeABC(fs, OP_SETLIST, base, b, 0);
luaK_code(fs, cast(Instruction, c));
luaK_codeAx(fs, OP_EXTRAARG, c);
}
else
luaX_syntaxerror(fs->ls, "constructor too long");
fs->freereg = base + 1; /* free registers with list values */
}