Upgrading to Lua 5.2.1. (Should be harmless upgrade, bug-fix only.)

liblua/Makefile

@@ -56,7 +56,7 @@ o: $(ALL_O)
 a: $(ALL_A)
 
 $(LUA_A): $(BASE_O)
- $(AR) $@ $?
+ $(AR) $@ $(BASE_O)
  $(RANLIB) $@
 
 $(LUA_T): $(LUA_O) $(LUA_A)

liblua/lapi.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 2.159 2011/11/30 12:32:05 roberto Exp $
+** $Id: lapi.c,v 2.164 2012/06/08 15:14:04 roberto Exp $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -950,7 +950,7 @@ LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc,
  ci->u.c.k = k; /* save continuation */
  ci->u.c.ctx = ctx; /* save context */
  /* save information for error recovery */
- ci->u.c.extra = savestack(L, c.func);
+ ci->extra = savestack(L, c.func);
  ci->u.c.old_allowhook = L->allowhook;
  ci->u.c.old_errfunc = L->errfunc;
  L->errfunc = func;
@@ -1045,17 +1045,17 @@ LUA_API int lua_gc (lua_State *L, int what, int data) {
  }
  case LUA_GCSTEP: {
  if (g->gckind == KGC_GEN) { /* generational mode? */
- res = (g->lastmajormem == 0); /* 1 if will do major collection */
+ res = (g->GCestimate == 0); /* true if it will do major collection */
  luaC_forcestep(L); /* do a single step */
  }
  else {
-  while (data-- >= 0) {
-  luaC_forcestep(L);
-  if (g->gcstate == GCSpause) { /* end of cycle? */
-  res = 1; /* signal it */
-  break;
-  }
- }
+ lu_mem debt = cast(lu_mem, data) * 1024 - GCSTEPSIZE;
+ if (g->gcrunning)
+ debt += g->GCdebt; /* include current debt */
+ luaE_setdebt(g, debt);
+ luaC_forcestep(L);
+ if (g->gcstate == GCSpause) /* end of cycle? */
+  res = 1; /* signal it */
  }
  break;
  }

liblua/lauxlib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lauxlib.c,v 1.240 2011/12/06 16:33:55 roberto Exp $
+** $Id: lauxlib.c,v 1.244 2012/05/31 20:28:45 roberto Exp $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
@@ -520,11 +520,11 @@ LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
 
 LUALIB_API int luaL_ref (lua_State *L, int t) {
  int ref;
- t = lua_absindex(L, t);
  if (lua_isnil(L, -1)) {
  lua_pop(L, 1); /* remove from stack */
  return LUA_REFNIL; /* `nil' has a unique fixed reference */
  }
+ t = lua_absindex(L, t);
  lua_rawgeti(L, t, freelist); /* get first free element */
  ref = (int)lua_tointeger(L, -1); /* ref = t[freelist] */
  lua_pop(L, 1); /* remove it from stack */
@@ -616,8 +616,10 @@ static int skipBOM (LoadF *lf) {
 static int skipcomment (LoadF *lf, int *cp) {
  int c = *cp = skipBOM(lf);
  if (c == '#') { /* first line is a comment (Unix exec. file)? */
- while ((c = getc(lf->f)) != EOF && c != '\n') ; /* skip first line */
- *cp = getc(lf->f); /* skip end-of-line */
+ do { /* skip first line */
+ c = getc(lf->f);
+ } while (c != EOF && c != '\n') ;
+ *cp = getc(lf->f); /* skip end-of-line, if present */
  return 1; /* there was a comment */
  }
  else return 0; /* no comment */
@@ -843,6 +845,7 @@ LUALIB_API void luaL_openlib (lua_State *L, const char *libname,
 ** Returns with only the table at the stack.
 */
 LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
+ luaL_checkversion(L);
  luaL_checkstack(L, nup, "too many upvalues");
  for (; l->name != NULL; l++) { /* fill the table with given functions */
  int i;
@@ -863,8 +866,8 @@ LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
  lua_getfield(L, idx, fname);
  if (lua_istable(L, -1)) return 1; /* table already there */
  else {
- idx = lua_absindex(L, idx);
  lua_pop(L, 1); /* remove previous result */
+ idx = lua_absindex(L, idx);
  lua_newtable(L);
  lua_pushvalue(L, -1); /* copy to be left at top */
  lua_setfield(L, idx, fname); /* assign new table to field */
@@ -889,10 +892,8 @@ LUALIB_API void luaL_requiref (lua_State *L, const char *modname,
  lua_setfield(L, -2, modname); /* _LOADED[modname] = module */
  lua_pop(L, 1); /* remove _LOADED table */
  if (glb) {
- lua_pushglobaltable(L);
- lua_pushvalue(L, -2); /* copy of 'mod' */
- lua_setfield(L, -2, modname); /* _G[modname] = module */
- lua_pop(L, 1); /* remove _G table */
+ lua_pushvalue(L, -1); /* copy of 'mod' */
+ lua_setglobal(L, modname); /* _G[modname] = module */
  }
 }
 

liblua/lbaselib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lbaselib.c,v 1.273 2011/11/30 13:03:24 roberto Exp $
+** $Id: lbaselib.c,v 1.274 2012/04/27 14:13:19 roberto Exp $
 ** Basic library
 ** See Copyright Notice in lua.h
 */
@@ -293,6 +293,7 @@ static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
  lua_pushvalue(L, 1); /* get function */
  lua_call(L, 0, 1); /* call it */
  if (lua_isnil(L, -1)) {
+ lua_pop(L, 1); /* pop result */
  *size = 0;
  return NULL;
  }

liblua/lcorolib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lcorolib.c,v 1.3 2011/08/23 17:24:34 roberto Exp $
+** $Id: lcorolib.c,v 1.4 2012/04/27 18:59:04 roberto Exp $
 ** Coroutine Library
 ** See Copyright Notice in lua.h
 */
@@ -80,8 +80,9 @@ static int luaB_auxwrap (lua_State *L) {
 
 
 static int luaB_cocreate (lua_State *L) {
- lua_State *NL = lua_newthread(L);
+ lua_State *NL;
  luaL_checktype(L, 1, LUA_TFUNCTION);
+ NL = lua_newthread(L);
  lua_pushvalue(L, 1); /* move function to top */
  lua_xmove(L, NL, 1); /* move function from L to NL */
  return 1;

liblua/ldblib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: ldblib.c,v 1.131 2011/10/24 14:54:05 roberto Exp $
+** $Id: ldblib.c,v 1.132 2012/01/19 20:14:44 roberto Exp $
 ** Interface from Lua to its debug API
 ** See Copyright Notice in lua.h
 */
@@ -253,14 +253,15 @@ static int db_upvaluejoin (lua_State *L) {
 }
 
 
-#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY);
+#define gethooktable(L) luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)
 
 
 static void hookf (lua_State *L, lua_Debug *ar) {
  static const char *const hooknames[] =
  {"call", "return", "line", "count", "tail call"};
  gethooktable(L);
- lua_rawgetp(L, -1, L);
+ lua_pushthread(L);
+ lua_rawget(L, -2);
  if (lua_isfunction(L, -1)) {
  lua_pushstring(L, hooknames[(int)ar->event]);
  if (ar->currentline >= 0)
@@ -306,10 +307,15 @@ static int db_sethook (lua_State *L) {
  count = luaL_optint(L, arg+3, 0);
  func = hookf; mask = makemask(smask, count);
  }
- gethooktable(L);
+ if (gethooktable(L) == 0) { /* creating hook table? */
+ lua_pushstring(L, "k");
+ lua_setfield(L, -2, "__mode"); /** hooktable.__mode = "k" */
+ lua_pushvalue(L, -1);
+ lua_setmetatable(L, -2); /* setmetatable(hooktable) = hooktable */
+ }
+ lua_pushthread(L1); lua_xmove(L1, L, 1);
  lua_pushvalue(L, arg+1);
- lua_rawsetp(L, -2, L1); /* set new hook */
- lua_pop(L, 1); /* remove hook table */
+ lua_rawset(L, -3); /* set new hook */
  lua_sethook(L1, func, mask, count); /* set hooks */
  return 0;
 }
@@ -325,7 +331,8 @@ static int db_gethook (lua_State *L) {
  lua_pushliteral(L, "external hook");
  else {
  gethooktable(L);
- lua_rawgetp(L, -1, L1); /* get hook */
+ lua_pushthread(L1); lua_xmove(L1, L, 1);
+ lua_rawget(L, -2); /* get hook */
  lua_remove(L, -2); /* remove hook table */
  }
  lua_pushstring(L, unmakemask(mask, buff));

liblua/ldebug.c

@@ -1,5 +1,5 @@
 /*
-** $Id: ldebug.c,v 2.88 2011/11/30 12:43:51 roberto Exp $
+** $Id: ldebug.c,v 2.89 2012/01/20 22:05:50 roberto Exp $
 ** Debug Interface
 ** See Copyright Notice in lua.h
 */
@@ -30,6 +30,9 @@
 
 
 
+#define noLuaClosure(f) ((f) == NULL || (f)->c.tt == LUA_TCCL)
+
+
 static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name);
 
 
@@ -173,7 +176,7 @@ LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
 
 
 static void funcinfo (lua_Debug *ar, Closure *cl) {
- if (cl == NULL || cl->c.isC) {
+ if (noLuaClosure(cl)) {
  ar->source = "=[C]";
  ar->linedefined = -1;
  ar->lastlinedefined = -1;
@@ -191,7 +194,7 @@ static void funcinfo (lua_Debug *ar, Closure *cl) {
 
 
 static void collectvalidlines (lua_State *L, Closure *f) {
- if (f == NULL || f->c.isC) {
+ if (noLuaClosure(f)) {
  setnilvalue(L->top);
  incr_top(L);
  }
@@ -210,7 +213,7 @@ static void collectvalidlines (lua_State *L, Closure *f) {
 
 
 static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
- Closure *f, CallInfo *ci) {
+  Closure *f, CallInfo *ci) {
  int status = 1;
  for (; *what; what++) {
  switch (*what) {
@@ -224,7 +227,7 @@ static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
  }
  case 'u': {
  ar->nups = (f == NULL) ? 0 : f->c.nupvalues;
- if (f == NULL || f->c.isC) {
+ if (noLuaClosure(f)) {
  ar->isvararg = 1;
  ar->nparams = 0;
  }

liblua/ldo.c

@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.c,v 2.102 2011/11/29 15:55:08 roberto Exp $
+** $Id: ldo.c,v 2.105 2012/06/08 15:14:04 roberto Exp $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
@@ -402,8 +402,6 @@ static void finishCcall (lua_State *L) {
  int n;
  lua_assert(ci->u.c.k != NULL); /* must have a continuation */
  lua_assert(L->nny == 0);
- /* finish 'luaD_call' */
- L->nCcalls--;
  /* finish 'lua_callk' */
  adjustresults(L, ci->nresults);
  /* call continuation function */
@@ -453,7 +451,7 @@ static int recover (lua_State *L, int status) {
  CallInfo *ci = findpcall(L);
  if (ci == NULL) return 0; /* no recovery point */
  /* "finish" luaD_pcall */
- oldtop = restorestack(L, ci->u.c.extra);
+ oldtop = restorestack(L, ci->extra);
  luaF_close(L, oldtop);
  seterrorobj(L, status, oldtop);
  L->ci = ci;
@@ -484,9 +482,10 @@ static l_noret resume_error (lua_State *L, const char *msg, StkId firstArg) {
 ** do the work for 'lua_resume' in protected mode
 */
 static void resume (lua_State *L, void *ud) {
+ int nCcalls = L->nCcalls;
  StkId firstArg = cast(StkId, ud);
  CallInfo *ci = L->ci;
- if (L->nCcalls >= LUAI_MAXCCALLS)
+ if (nCcalls >= LUAI_MAXCCALLS)
  resume_error(L, "C stack overflow", firstArg);
  if (L->status == LUA_OK) { /* may be starting a coroutine */
  if (ci != &L->base_ci) /* not in base level? */
@@ -499,10 +498,10 @@ static void resume (lua_State *L, void *ud) {
  resume_error(L, "cannot resume dead coroutine", firstArg);
  else { /* resuming from previous yield */
  L->status = LUA_OK;
+ ci->func = restorestack(L, ci->extra);
  if (isLua(ci)) /* yielded inside a hook? */
  luaV_execute(L); /* just continue running Lua code */
  else { /* 'common' yield */
- ci->func = restorestack(L, ci->u.c.extra);
  if (ci->u.c.k != NULL) { /* does it have a continuation? */
  int n;
  ci->u.c.status = LUA_YIELD; /* 'default' status */
@@ -513,11 +512,11 @@ static void resume (lua_State *L, void *ud) {
  api_checknelems(L, n);
  firstArg = L->top - n; /* yield results come from continuation */
  }
- L->nCcalls--; /* finish 'luaD_call' */
  luaD_poscall(L, firstArg); /* finish 'luaD_precall' */
  }
  unroll(L, NULL);
  }
+ lua_assert(nCcalls == L->nCcalls);
 }
 
 
@@ -564,13 +563,13 @@ LUA_API int lua_yieldk (lua_State *L, int nresults, int ctx, lua_CFunction k) {
  luaG_runerror(L, "attempt to yield from outside a coroutine");
  }
  L->status = LUA_YIELD;
+ ci->extra = savestack(L, ci->func); /* save current 'func' */
  if (isLua(ci)) { /* inside a hook? */
  api_check(L, k == NULL, "hooks cannot continue after yielding");
  }
  else {
  if ((ci->u.c.k = k) != NULL) /* is there a continuation? */
  ci->u.c.ctx = ctx; /* save context */
- ci->u.c.extra = savestack(L, ci->func); /* save current 'func' */
  ci->func = L->top - nresults - 1; /* protect stack below results */
  luaD_throw(L, LUA_YIELD);
  }
@@ -627,24 +626,23 @@ static void checkmode (lua_State *L, const char *mode, const char *x) {
 
 static void f_parser (lua_State *L, void *ud) {
  int i;
- Proto *tf;
  Closure *cl;
  struct SParser *p = cast(struct SParser *, ud);
  int c = zgetc(p->z); /* read first character */
  if (c == LUA_SIGNATURE[0]) {
  checkmode(L, p->mode, "binary");
- tf = luaU_undump(L, p->z, &p->buff, p->name);
+ cl = luaU_undump(L, p->z, &p->buff, p->name);
  }
  else {
  checkmode(L, p->mode, "text");
- tf = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
+ cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
+ }
+ lua_assert(cl->l.nupvalues == cl->l.p->sizeupvalues);
+ for (i = 0; i < cl->l.nupvalues; i++) { /* initialize upvalues */
+ UpVal *up = luaF_newupval(L);
+ cl->l.upvals[i] = up;
+ luaC_objbarrier(L, cl, up);
  }
- setptvalue2s(L, L->top, tf);
- incr_top(L);
- cl = luaF_newLclosure(L, tf);
- setclLvalue(L, L->top - 1, cl);
- for (i = 0; i < tf->sizeupvalues; i++) /* initialize upvalues */
- cl->l.upvals[i] = luaF_newupval(L);
 }
 
 

liblua/ldump.c

@@ -1,5 +1,5 @@
 /*
-** $Id: ldump.c,v 1.19 2011/11/23 17:48:18 lhf Exp $
+** $Id: ldump.c,v 2.17 2012/01/23 23:02:10 roberto Exp $
 ** save precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
@@ -84,8 +84,8 @@ static void DumpConstants(const Proto* f, DumpState* D)
  for (i=0; i<n; i++)
  {
  const TValue* o=&f->k[i];
- DumpChar(ttype(o),D);
- switch (ttype(o))
+ DumpChar(ttypenv(o),D);
+ switch (ttypenv(o))
  {
  case LUA_TNIL:
  break;
@@ -98,6 +98,7 @@ static void DumpConstants(const Proto* f, DumpState* D)
  case LUA_TSTRING:
  DumpString(rawtsvalue(o),D);
  break;
+ default: lua_assert(0);
  }
  }
  n=f->sizep;