diff options
| author | Mike Pall <mike> | 2015-02-02 11:06:34 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-02-02 11:06:45 +0100 |
| commit | ca5bbdf92a1802cc95ccb40157dfafd482e56480 (patch) | |
| tree | da8b861599541be8e65675a389349df99bdd0ec8 | |
| parent | 43cb818ba8166edf50d4432cff60b9f83f987d1e (diff) | |
| parent | dfa173b92962350ac5f019dd4a340ad1c5c265c7 (diff) | |
| download | luajit-ca5bbdf92a1802cc95ccb40157dfafd482e56480.tar.gz luajit-ca5bbdf92a1802cc95ccb40157dfafd482e56480.tar.bz2 luajit-ca5bbdf92a1802cc95ccb40157dfafd482e56480.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_lex.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_lex.c b/src/lj_lex.c index ad3f1306..8409cd78 100644 --- a/src/lj_lex.c +++ b/src/lj_lex.c | |||
| @@ -375,6 +375,7 @@ int lj_lex_setup(lua_State *L, LexState *ls) | |||
| 375 | ls->vtop = 0; | 375 | ls->vtop = 0; |
| 376 | ls->bcstack = NULL; | 376 | ls->bcstack = NULL; |
| 377 | ls->sizebcstack = 0; | 377 | ls->sizebcstack = 0; |
| 378 | ls->tok = 0; | ||
| 378 | ls->lookahead = TK_eof; /* No look-ahead token. */ | 379 | ls->lookahead = TK_eof; /* No look-ahead token. */ |
| 379 | ls->linenumber = 1; | 380 | ls->linenumber = 1; |
| 380 | ls->lastline = 1; | 381 | ls->lastline = 1; |