aboutsummaryrefslogtreecommitdiff
path: root/lparser.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2016-08-01 16:51:24 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2016-08-01 16:51:24 -0300
commite4a9e6fcca4ac2a14c9832b1a40b74cdca7016b9 (patch)
treef4e6a467d530017d905a331ea41114cb9333ffd4 /lparser.c
parent9de2bb0d62a2531c47e5b8197f57a48c9aea05d2 (diff)
downloadlua-e4a9e6fcca4ac2a14c9832b1a40b74cdca7016b9.tar.gz
lua-e4a9e6fcca4ac2a14c9832b1a40b74cdca7016b9.tar.bz2
lua-e4a9e6fcca4ac2a14c9832b1a40b74cdca7016b9.zip
do not eliminate varargs from functions that do not use varargs
(confuses the debug lib and gains very little in performance)
Diffstat (limited to 'lparser.c')
-rw-r--r--lparser.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lparser.c b/lparser.c
index 2a818388..5894d8ff 100644
--- a/lparser.c
+++ b/lparser.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lparser.c,v 2.153 2016/05/13 19:10:16 roberto Exp roberto $ 2** $Id: lparser.c,v 2.154 2016/06/22 15:48:25 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*/
@@ -766,7 +766,7 @@ static void parlist (LexState *ls) {
766 } 766 }
767 case TK_DOTS: { /* param -> '...' */ 767 case TK_DOTS: { /* param -> '...' */
768 luaX_next(ls); 768 luaX_next(ls);
769 f->is_vararg = 2; /* declared vararg */ 769 f->is_vararg = 1; /* declared vararg */
770 break; 770 break;
771 } 771 }
772 default: luaX_syntaxerror(ls, "<name> or '...' expected"); 772 default: luaX_syntaxerror(ls, "<name> or '...' expected");
@@ -962,7 +962,6 @@ static void simpleexp (LexState *ls, expdesc *v) {
962 FuncState *fs = ls->fs; 962 FuncState *fs = ls->fs;
963 check_condition(ls, fs->f->is_vararg, 963 check_condition(ls, fs->f->is_vararg,
964 "cannot use '...' outside a vararg function"); 964 "cannot use '...' outside a vararg function");
965 fs->f->is_vararg = 1; /* function actually uses vararg */
966 init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0)); 965 init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0));
967 break; 966 break;
968 } 967 }
@@ -1614,7 +1613,7 @@ static void mainfunc (LexState *ls, FuncState *fs) {
1614 BlockCnt bl; 1613 BlockCnt bl;
1615 expdesc v; 1614 expdesc v;
1616 open_func(ls, fs, &bl); 1615 open_func(ls, fs, &bl);
1617 fs->f->is_vararg = 2; /* main function is always declared vararg */ 1616 fs->f->is_vararg = 1; /* main function is always declared vararg */
1618 init_exp(&v, VLOCAL, 0); /* create and... */ 1617 init_exp(&v, VLOCAL, 0); /* create and... */
1619 newupvalue(fs, ls->envn, &v); /* ...set environment upvalue */ 1618 newupvalue(fs, ls->envn, &v); /* ...set environment upvalue */
1620 luaX_next(ls); /* read first token */ 1619 luaX_next(ls); /* read first token */