Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2015-02-02 11:06:34 +01:00
commit ca5bbdf92a

View File

@ -375,6 +375,7 @@ int lj_lex_setup(lua_State *L, LexState *ls)
ls->vtop = 0; ls->vtop = 0;
ls->bcstack = NULL; ls->bcstack = NULL;
ls->sizebcstack = 0; ls->sizebcstack = 0;
ls->tok = 0;
ls->lookahead = TK_eof; /* No look-ahead token. */ ls->lookahead = TK_eof; /* No look-ahead token. */
ls->linenumber = 1; ls->linenumber = 1;
ls->lastline = 1; ls->lastline = 1;