aboutsummaryrefslogtreecommitdiff
path: root/lparser.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2017-06-29 12:38:41 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2017-06-29 12:38:41 -0300
commit07db10813cb044252c18973688f63b5eac6a90a6 (patch)
treedb08d5c25bbba80af51a719a9092062b5ea408b0 /lparser.c
parentf96497397addca22f22a6ba6eeabc906be43f16b (diff)
downloadlua-07db10813cb044252c18973688f63b5eac6a90a6.tar.gz
lua-07db10813cb044252c18973688f63b5eac6a90a6.tar.bz2
lua-07db10813cb044252c18973688f63b5eac6a90a6.zip
'OP_VARARG' has the vararg parameter as an operand
Diffstat (limited to 'lparser.c')
-rw-r--r--lparser.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lparser.c b/lparser.c
index a8c77c44..1a0a4e51 100644
--- a/lparser.c
+++ b/lparser.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lparser.c,v 2.160 2017/06/27 11:35:31 roberto Exp roberto $ 2** $Id: lparser.c,v 2.161 2017/06/29 15:06:44 roberto Exp roberto $
3** Lua Parser 3** Lua Parser
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -970,9 +970,10 @@ static void simpleexp (LexState *ls, expdesc *v) {
970 } 970 }
971 case TK_DOTS: { /* vararg */ 971 case TK_DOTS: { /* vararg */
972 FuncState *fs = ls->fs; 972 FuncState *fs = ls->fs;
973 int lastparam = fs->f->numparams - 1;
973 check_condition(ls, fs->f->is_vararg, 974 check_condition(ls, fs->f->is_vararg,
974 "cannot use '...' outside a vararg function"); 975 "cannot use '...' outside a vararg function");
975 init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0)); 976 init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, lastparam));
976 break; 977 break;
977 } 978 }
978 case '{': { /* constructor */ 979 case '{': { /* constructor */