|
@@ -1,5 +1,5 @@
|
|
/*
|
|
/*
|
|
-** $Id: lparser.c,v 2.146 2014/11/27 18:41:43 roberto Exp roberto $
|
|
|
|
|
|
+** $Id: lparser.c,v 2.147 2014/12/27 20:31:43 roberto Exp roberto $
|
|
** Lua Parser
|
|
** Lua Parser
|
|
** See Copyright Notice in lua.h
|
|
** See Copyright Notice in lua.h
|
|
*/
|
|
*/
|
|
@@ -760,7 +760,7 @@ static void parlist (LexState *ls) {
|
|
}
|
|
}
|
|
case TK_DOTS: { /* param -> '...' */
|
|
case TK_DOTS: { /* param -> '...' */
|
|
luaX_next(ls);
|
|
luaX_next(ls);
|
|
- f->is_vararg = 1;
|
|
|
|
|
|
+ f->is_vararg = 2; /* declared vararg */
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
default: luaX_syntaxerror(ls, "<name> or '...' expected");
|
|
default: luaX_syntaxerror(ls, "<name> or '...' expected");
|
|
@@ -956,6 +956,7 @@ static void simpleexp (LexState *ls, expdesc *v) {
|
|
FuncState *fs = ls->fs;
|
|
FuncState *fs = ls->fs;
|
|
check_condition(ls, fs->f->is_vararg,
|
|
check_condition(ls, fs->f->is_vararg,
|
|
"cannot use '...' outside a vararg function");
|
|
"cannot use '...' outside a vararg function");
|
|
|
|
+ fs->f->is_vararg = 1; /* function actually uses vararg */
|
|
init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0));
|
|
init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0));
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
@@ -1610,7 +1611,7 @@ static void mainfunc (LexState *ls, FuncState *fs) {
|
|
BlockCnt bl;
|
|
BlockCnt bl;
|
|
expdesc v;
|
|
expdesc v;
|
|
open_func(ls, fs, &bl);
|
|
open_func(ls, fs, &bl);
|
|
- fs->f->is_vararg = 1; /* main function is always vararg */
|
|
|
|
|
|
+ fs->f->is_vararg = 2; /* main function is always declared vararg */
|
|
init_exp(&v, VLOCAL, 0); /* create and... */
|
|
init_exp(&v, VLOCAL, 0); /* create and... */
|
|
newupvalue(fs, ls->envn, &v); /* ...set environment upvalue */
|
|
newupvalue(fs, ls->envn, &v); /* ...set environment upvalue */
|
|
luaX_next(ls); /* read first token */
|
|
luaX_next(ls); /* read first token */
|