aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2005-03-07 13:58:27 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2005-03-07 13:58:27 -0300
commitb6a7983b650a572a9f04c1dd8b243cf5e081caa2 (patch)
tree8a5c4a911dcf3eb884e6f86ca9ce5c4d24d2ce87
parent49f90ffdebf2ae10f9fe9579d90bcf2da692b7a6 (diff)
downloadlua-b6a7983b650a572a9f04c1dd8b243cf5e081caa2.tar.gz
lua-b6a7983b650a572a9f04c1dd8b243cf5e081caa2.tar.bz2
lua-b6a7983b650a572a9f04c1dd8b243cf5e081caa2.zip
USHRT_MAX may not fit in a (16-bit) int
-rw-r--r--lparser.c4
-rw-r--r--lparser.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/lparser.c b/lparser.c
index cb348c40..518bfd50 100644
--- a/lparser.c
+++ b/lparser.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lparser.c,v 2.12 2005/01/04 15:55:12 roberto Exp roberto $ 2** $Id: lparser.c,v 2.13 2005/01/05 18:20:51 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*/
@@ -167,7 +167,7 @@ static int registerlocalvar (LexState *ls, TString *varname) {
167 Proto *f = fs->f; 167 Proto *f = fs->f;
168 int oldsize = f->sizelocvars; 168 int oldsize = f->sizelocvars;
169 luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars, 169 luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars,
170 LocVar, USHRT_MAX, "too many local variables"); 170 LocVar, SHRT_MAX, "too many local variables");
171 while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL; 171 while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL;
172 f->locvars[fs->nlocvars].varname = varname; 172 f->locvars[fs->nlocvars].varname = varname;
173 luaC_objbarrier(ls->L, f, varname); 173 luaC_objbarrier(ls->L, f, varname);
diff --git a/lparser.h b/lparser.h
index f4398ccc..1b7cc524 100644
--- a/lparser.h
+++ b/lparser.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lparser.h,v 1.50 2003/08/25 19:51:54 roberto Exp roberto $ 2** $Id: lparser.h,v 1.51 2004/05/31 18:51:50 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*/
@@ -65,7 +65,7 @@ typedef struct FuncState {
65 int freereg; /* first free register */ 65 int freereg; /* first free register */
66 int nk; /* number of elements in `k' */ 66 int nk; /* number of elements in `k' */
67 int np; /* number of elements in `p' */ 67 int np; /* number of elements in `p' */
68 int nlocvars; /* number of elements in `locvars' */ 68 short nlocvars; /* number of elements in `locvars' */
69 lu_byte nactvar; /* number of active local variables */ 69 lu_byte nactvar; /* number of active local variables */
70 upvaldesc upvalues[MAXUPVALUES]; /* upvalues */ 70 upvaldesc upvalues[MAXUPVALUES]; /* upvalues */
71 unsigned short actvar[MAXVARS]; /* declared-variable stack */ 71 unsigned short actvar[MAXVARS]; /* declared-variable stack */