Просмотр исходного кода

USHRT_MAX may not fit in a (16-bit) int

Roberto Ierusalimschy 20 лет назад
Родитель
Сommit
b6a7983b65
2 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      lparser.c
  2. 2 2
      lparser.h

+ 2 - 2
lparser.c

@@ -1,5 +1,5 @@
 /*
 /*
-** $Id: lparser.c,v 2.12 2005/01/04 15:55:12 roberto Exp roberto $
+** $Id: lparser.c,v 2.13 2005/01/05 18:20:51 roberto Exp roberto $
 ** Lua Parser
 ** Lua Parser
 ** See Copyright Notice in lua.h
 ** See Copyright Notice in lua.h
 */
 */
@@ -167,7 +167,7 @@ static int registerlocalvar (LexState *ls, TString *varname) {
   Proto *f = fs->f;
   Proto *f = fs->f;
   int oldsize = f->sizelocvars;
   int oldsize = f->sizelocvars;
   luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars,
   luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars,
-                  LocVar, USHRT_MAX, "too many local variables");
+                  LocVar, SHRT_MAX, "too many local variables");
   while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL;
   while (oldsize < f->sizelocvars) f->locvars[oldsize++].varname = NULL;
   f->locvars[fs->nlocvars].varname = varname;
   f->locvars[fs->nlocvars].varname = varname;
   luaC_objbarrier(ls->L, f, varname);
   luaC_objbarrier(ls->L, f, varname);

+ 2 - 2
lparser.h

@@ -1,5 +1,5 @@
 /*
 /*
-** $Id: lparser.h,v 1.50 2003/08/25 19:51:54 roberto Exp roberto $
+** $Id: lparser.h,v 1.51 2004/05/31 18:51:50 roberto Exp roberto $
 ** Lua Parser
 ** Lua Parser
 ** See Copyright Notice in lua.h
 ** See Copyright Notice in lua.h
 */
 */
@@ -65,7 +65,7 @@ typedef struct FuncState {
   int freereg;  /* first free register */
   int freereg;  /* first free register */
   int nk;  /* number of elements in `k' */
   int nk;  /* number of elements in `k' */
   int np;  /* number of elements in `p' */
   int np;  /* number of elements in `p' */
-  int nlocvars;  /* number of elements in `locvars' */
+  short nlocvars;  /* number of elements in `locvars' */
   lu_byte nactvar;  /* number of active local variables */
   lu_byte nactvar;  /* number of active local variables */
   upvaldesc upvalues[MAXUPVALUES];  /* upvalues */
   upvaldesc upvalues[MAXUPVALUES];  /* upvalues */
   unsigned short actvar[MAXVARS];  /* declared-variable stack */
   unsigned short actvar[MAXVARS];  /* declared-variable stack */