nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

accepts `$debug' in the middle of a function.

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2000-05-25 15:26:42 -03:00
parent 677313da32
commit a301304612
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lparser.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lparser.c,v 1.89 2000/05/24 13:54:49 roberto Exp roberto $ ** $Id: lparser.c,v 1.90 2000/05/24 18:04:17 roberto Exp roberto $
** LL(1) Parser and code generator for Lua ** LL(1) Parser and code generator for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -183,10 +183,11 @@ static TString *optionalname (LexState *ls) {
} }
static void luaI_registerlocalvar (LexState *ls, TString *varname, static void luaI_registerlocalvar (LexState *ls, TString *varname, int line) {
int line) {
FuncState *fs = ls->fs; FuncState *fs = ls->fs;
if (fs->nvars != -1) { /* debug information? */ /* start debug only when there are no active local variables,
but keep going after starting */
if ((ls->L->debug && fs->nlocalvar == 0) || fs->nvars != 0) {
Proto *f = fs->f; Proto *f = fs->f;
luaM_growvector(ls->L, f->locvars, fs->nvars, 1, LocVar, "", MAX_INT); luaM_growvector(ls->L, f->locvars, fs->nvars, 1, LocVar, "", MAX_INT);
f->locvars[fs->nvars].varname = varname; f->locvars[fs->nvars].varname = varname;
@@ -196,11 +197,6 @@ static void luaI_registerlocalvar (LexState *ls, TString *varname,
} }
static void luaI_unregisterlocalvar (LexState *ls, int line) {
luaI_registerlocalvar(ls, NULL, line);
}
static void store_localvar (LexState *ls, TString *name, int n) { static void store_localvar (LexState *ls, TString *name, int n) {
FuncState *fs = ls->fs; FuncState *fs = ls->fs;
luaX_checklimit(ls, fs->nlocalvar+n+1, MAXLOCALS, "local variables"); luaX_checklimit(ls, fs->nlocalvar+n+1, MAXLOCALS, "local variables");
@@ -212,17 +208,18 @@ static void adjustlocalvars (LexState *ls, int nvars) {
int line = ls->fs->lastsetline; int line = ls->fs->lastsetline;
FuncState *fs = ls->fs; FuncState *fs = ls->fs;
int i; int i;
fs->nlocalvar += nvars; for (i=fs->nlocalvar; i<fs->nlocalvar+nvars; i++)
for (i=fs->nlocalvar-nvars; i<fs->nlocalvar; i++)
luaI_registerlocalvar(ls, fs->localvar[i], line); luaI_registerlocalvar(ls, fs->localvar[i], line);
fs->nlocalvar += nvars;
} }
static void removelocalvars (LexState *ls, int nvars) { static void removelocalvars (LexState *ls, int nvars) {
int line = ls->fs->lastsetline; int line = ls->fs->lastsetline;
int i;
for (i=0;i<nvars;i++)
luaI_registerlocalvar(ls, NULL, line);
ls->fs->nlocalvar -= nvars; ls->fs->nlocalvar -= nvars;
while (nvars--)
luaI_unregisterlocalvar(ls, line);
} }
@@ -367,7 +364,6 @@ static void func_onstack (LexState *ls, FuncState *func) {
static void init_state (LexState *ls, FuncState *fs, TString *source) { static void init_state (LexState *ls, FuncState *fs, TString *source) {
lua_State *L = ls->L;
Proto *f = luaF_newproto(ls->L); Proto *f = luaF_newproto(ls->L);
fs->prev = ls->fs; /* linked list of funcstates */ fs->prev = ls->fs; /* linked list of funcstates */
fs->ls = ls; fs->ls = ls;
@@ -387,7 +383,7 @@ static void init_state (LexState *ls, FuncState *fs, TString *source) {
f->maxstacksize = 0; f->maxstacksize = 0;
f->numparams = 0; /* default for main chunk */ f->numparams = 0; /* default for main chunk */
f->is_vararg = 0; /* default for main chunk */ f->is_vararg = 0; /* default for main chunk */
fs->nvars = (L->debug) ? 0 : -1; /* flag no debug information? */ fs->nvars = 0;
} }
@@ -401,7 +397,7 @@ static void close_func (LexState *ls) {
luaM_reallocvector(L, f->kstr, f->nkstr, TString *); luaM_reallocvector(L, f->kstr, f->nkstr, TString *);
luaM_reallocvector(L, f->knum, f->nknum, Number); luaM_reallocvector(L, f->knum, f->nknum, Number);
luaM_reallocvector(L, f->kproto, f->nkproto, Proto *); luaM_reallocvector(L, f->kproto, f->nkproto, Proto *);
if (fs->nvars != -1) { /* debug information? */ if (f->locvars) { /* debug information? */
luaI_registerlocalvar(ls, NULL, -1); /* flag end of vector */ luaI_registerlocalvar(ls, NULL, -1); /* flag end of vector */
luaM_reallocvector(L, f->locvars, fs->nvars, LocVar); luaM_reallocvector(L, f->locvars, fs->nvars, LocVar);
} }

4
lparser.h
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lparser.h,v 1.15 2000/04/05 17:51:58 roberto Exp roberto $ ** $Id: lparser.h,v 1.16 2000/04/06 17:36:52 roberto Exp roberto $
** LL(1) Parser and code generator for Lua ** LL(1) Parser and code generator for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -47,7 +47,7 @@ typedef struct FuncState {
int stacklevel; /* number of values on activation register */ int stacklevel; /* number of values on activation register */
int nlocalvar; /* number of active local variables */ int nlocalvar; /* number of active local variables */
int nupvalues; /* number of upvalues */ int nupvalues; /* number of upvalues */
int nvars; /* number of entries in f->locvars (-1 if no debug information) */ int nvars; /* number of entries in f->locvars */
int lastsetline; /* line where last SETLINE was issued */ int lastsetline; /* line where last SETLINE was issued */
struct Breaklabel *bl; /* chain of breakable blocks */ struct Breaklabel *bl; /* chain of breakable blocks */
expdesc upvalues[MAXUPVALUES]; /* upvalues */ expdesc upvalues[MAXUPVALUES]; /* upvalues */