lua

commit 56e50e8bc546884957fbe1d82ff78d27f1eef93c
parent 90569630d6755190c5f499c51e1d0e6ef41c6cd8
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Mon,  5 Feb 2018 15:10:25 -0200

'collectgarbage' returns old mode when changing mode

Diffstat:
M
lapi.c
 | 
6
+++++-
M
lbaselib.c
 | 
14
+++++++++-----

2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/lapi.c b/lapi.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 2.281 2018/01/28 15:13:26 roberto Exp roberto $
+** $Id: lapi.c,v 2.282 2018/01/29 16:21:35 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -1121,6 +1121,7 @@ LUA_API int lua_gc (lua_State *L, int what, ...) {
       break;
     }
     case LUA_GCGEN: {
+      int oldmode = g->gckind;
       int minormul = va_arg(argp, int);
       int majormul = va_arg(argp, int);
       if (minormul != 0)
@@ -1128,9 +1129,11 @@ LUA_API int lua_gc (lua_State *L, int what, ...) {
       if (majormul != 0)
         setgcparam(g->genmajormul, majormul);
       luaC_changemode(L, KGC_GEN);
+      res = (oldmode == KGC_GEN) ? LUA_GCGEN : LUA_GCINC;
       break;
     }
     case LUA_GCINC: {
+      int oldmode = g->gckind;
       int pause = va_arg(argp, int);
       int stepmul = va_arg(argp, int);
       int stepsize = va_arg(argp, int);
@@ -1141,6 +1144,7 @@ LUA_API int lua_gc (lua_State *L, int what, ...) {
       if (stepsize != 0)
         g->gcstepsize = stepsize;
       luaC_changemode(L, KGC_INC);
+      res = (oldmode == KGC_GEN) ? LUA_GCGEN : LUA_GCINC;
       break;
     }
     default: res = -1;  /* invalid option */
diff --git a/lbaselib.c b/lbaselib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lbaselib.c,v 1.317 2017/06/27 18:32:49 roberto Exp roberto $
+** $Id: lbaselib.c,v 1.318 2017/11/16 13:19:06 roberto Exp roberto $
 ** Basic library
 ** See Copyright Notice in lua.h
 */
@@ -170,6 +170,12 @@ static int luaB_rawset (lua_State *L) {
 }
 
 
+static int pushmode (lua_State *L, int oldmode) {
+  lua_pushstring(L, (oldmode == LUA_GCINC) ? "incremental" : "generational");
+  return 1;
+}
+
+
 static int luaB_collectgarbage (lua_State *L) {
   static const char *const opts[] = {"stop", "restart", "collect",
     "count", "step", "setpause", "setstepmul",
@@ -206,15 +212,13 @@ static int luaB_collectgarbage (lua_State *L) {
     case LUA_GCGEN: {
       int minormul = (int)luaL_optinteger(L, 2, 0);
       int majormul = (int)luaL_optinteger(L, 3, 0);
-      lua_gc(L, o, minormul, majormul);
-      return 0;
+      return pushmode(L, lua_gc(L, o, minormul, majormul));
     }
     case LUA_GCINC: {
       int pause = (int)luaL_optinteger(L, 2, 0);
       int stepmul = (int)luaL_optinteger(L, 3, 0);
       int stepsize = (int)luaL_optinteger(L, 4, 0);
-      lua_gc(L, o, pause, stepmul, stepsize);
-      return 0;
+      return pushmode(L, lua_gc(L, o, pause, stepmul, stepsize));
     }
     default: {
       int res = lua_gc(L, o);