diff options
Diffstat (limited to 'lparser.c')
-rw-r--r-- | lparser.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lparser.c,v 1.149 2001/06/12 14:36:48 roberto Exp roberto $ | 2 | ** $Id: lparser.c,v 1.150 2001/06/20 21:07:57 roberto Exp roberto $ |
3 | ** LL(1) Parser and code generator for Lua | 3 | ** LL(1) Parser and code generator for Lua |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -296,13 +296,13 @@ static void pushclosure (LexState *ls, FuncState *func, expdesc *v) { | |||
296 | int reg = fs->freereg; | 296 | int reg = fs->freereg; |
297 | for (i=0; i<func->f->nupvalues; i++) | 297 | for (i=0; i<func->f->nupvalues; i++) |
298 | luaK_exp2nextreg(fs, &func->upvalues[i]); | 298 | luaK_exp2nextreg(fs, &func->upvalues[i]); |
299 | luaM_growvector(ls->L, f->kproto, fs->nkproto, f->sizekproto, Proto *, | 299 | luaM_growvector(ls->L, f->p, fs->np, f->sizep, Proto *, |
300 | MAXARG_Bc, l_s("constant table overflow")); | 300 | MAXARG_Bc, l_s("constant table overflow")); |
301 | f->kproto[fs->nkproto++] = func->f; | 301 | f->p[fs->np++] = func->f; |
302 | fs->freereg = reg; /* CLOSURE will consume those values */ | 302 | fs->freereg = reg; /* CLOSURE will consume those values */ |
303 | init_exp(v, VNONRELOC, reg); | 303 | init_exp(v, VNONRELOC, reg); |
304 | luaK_reserveregs(fs, 1); | 304 | luaK_reserveregs(fs, 1); |
305 | luaK_codeABc(fs, OP_CLOSURE, v->u.i.info, fs->nkproto-1); | 305 | luaK_codeABc(fs, OP_CLOSURE, v->u.i.info, fs->np-1); |
306 | } | 306 | } |
307 | 307 | ||
308 | 308 | ||
@@ -318,7 +318,7 @@ static void open_func (LexState *ls, FuncState *fs) { | |||
318 | fs->jlt = NO_JUMP; | 318 | fs->jlt = NO_JUMP; |
319 | fs->freereg = 0; | 319 | fs->freereg = 0; |
320 | fs->nk = 0; | 320 | fs->nk = 0; |
321 | fs->nkproto = 0; | 321 | fs->np = 0; |
322 | fs->nlineinfo = 0; | 322 | fs->nlineinfo = 0; |
323 | fs->nlocvars = 0; | 323 | fs->nlocvars = 0; |
324 | fs->nactloc = 0; | 324 | fs->nactloc = 0; |
@@ -343,8 +343,8 @@ static void close_func (LexState *ls) { | |||
343 | f->sizecode = fs->pc; | 343 | f->sizecode = fs->pc; |
344 | luaM_reallocvector(L, f->k, f->sizek, fs->nk, TObject); | 344 | luaM_reallocvector(L, f->k, f->sizek, fs->nk, TObject); |
345 | f->sizek = fs->nk; | 345 | f->sizek = fs->nk; |
346 | luaM_reallocvector(L, f->kproto, f->sizekproto, fs->nkproto, Proto *); | 346 | luaM_reallocvector(L, f->p, f->sizep, fs->np, Proto *); |
347 | f->sizekproto = fs->nkproto; | 347 | f->sizep = fs->np; |
348 | luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar); | 348 | luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar); |
349 | f->sizelocvars = fs->nlocvars; | 349 | f->sizelocvars = fs->nlocvars; |
350 | luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->nlineinfo+1, int); | 350 | luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->nlineinfo+1, int); |