semicolons now represent the empty statement

This commit is contained in:
Roberto Ierusalimschy 2010-05-15 10:32:02 -03:00
parent e99e9a9473
commit 12c764ed1e
1 changed files with 5 additions and 3 deletions

View File

@ -1,5 +1,5 @@
/* /*
** $Id: lparser.c,v 2.84 2010/05/13 12:03:26 roberto Exp roberto $ ** $Id: lparser.c,v 2.85 2010/05/14 15:03:43 roberto Exp roberto $
** Lua Parser ** Lua Parser
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -1346,7 +1346,8 @@ static void retstat (LexState *ls) {
static int statement (LexState *ls) { static int statement (LexState *ls) {
int line = ls->linenumber; /* may be needed for error messages */ int line = ls->linenumber; /* may be needed for error messages */
switch (ls->t.token) { switch (ls->t.token) {
case ';': { /* stat -> <empty statement> */ case ';': { /* stat -> ';' (empty statement) */
luaX_next(ls); /* skip ';' */
return 0; return 0;
} }
case TK_IF: { /* stat -> ifstat */ case TK_IF: { /* stat -> ifstat */
@ -1407,7 +1408,8 @@ static void chunk (LexState *ls) {
enterlevel(ls); enterlevel(ls);
while (!islast && !block_follow(ls->t.token)) { while (!islast && !block_follow(ls->t.token)) {
islast = statement(ls); islast = statement(ls);
testnext(ls, ';'); if (islast)
testnext(ls, ';');
lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg && lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg &&
ls->fs->freereg >= ls->fs->nactvar); ls->fs->freereg >= ls->fs->nactvar);
ls->fs->freereg = ls->fs->nactvar; /* free registers */ ls->fs->freereg = ls->fs->nactvar; /* free registers */