Merge remote-tracking branch 'upsteam/master'

Author: fesily

.vscode/launch.json

@@ -8,13 +8,13 @@
             "console": "integratedTerminal",
             "luaVersion": "lua-latest",
             "windows": {
-                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.10-win32-x64/bin/lua-debug.exe"
+                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.12-win32-x64/bin/lua-debug.exe"
             },
             "linux": {
-                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.10-linux-x64/bin/lua-debug",
+                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.12-linux-x64/bin/lua-debug",
             },
             "osx": {
-                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.10-darwin-arm64/bin/lua-debug",
+                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.12-darwin-arm64/bin/lua-debug",
             },
             "outputCapture": [
             ],
@@ -34,7 +34,7 @@
                 "--extensionDevelopmentPath=${workspaceFolder}/extension/"
             ],
             "env": {
-                "VSCODE_EXTENSION_PATH" : "${command:extensionPath}actboy168.lua-debug-2.0.10"
+                "VSCODE_EXTENSION_PATH" : "${command:extensionPath}actboy168.lua-debug-2.0.12"
             }
         }
     ]

3rd/bee.lua

@@ -1343,7 +1343,7 @@ void lua_warning (lua_State *L, const char *msg, int tocont) {
 LUA_API void *lua_newuserdatauv (lua_State *L, size_t size, int nuvalue) {
   Udata *u;
   lua_lock(L);
-  api_check(L, 0 <= nuvalue && nuvalue < USHRT_MAX, "invalid value");
+  api_check(L, 0 <= nuvalue && nuvalue < SHRT_MAX, "invalid value");
   u = luaS_newudata(L, size, nuvalue);
   setuvalue(L, s2v(L->top.p), u);
   api_incr_top(L);

3rd/json.lua

@@ -985,7 +985,7 @@ void luaK_exp2anyregup (FuncState *fs, expdesc *e) {
 ** or it is a constant.
 */
 void luaK_exp2val (FuncState *fs, expdesc *e) {
-  if (hasjumps(e))
+  if (e->k == VJMP || hasjumps(e))
     luaK_exp2anyreg(fs, e);
   else
     luaK_dischargevars(fs, e);

3rd/lua/lua-latest/lapi.c

@@ -123,6 +123,7 @@ l_noret luaD_throw (lua_State *L, int errcode) {
   else {  /* thread has no error handler */
     global_State *g = G(L);
     errcode = luaE_resetthread(L, errcode);  /* close all upvalues */
+    L->status = errcode;
     if (g->mainthread->errorJmp) {  /* main thread has a handler? */
       setobjs2s(L, g->mainthread->top.p++, L->top.p - 1);  /* copy error obj. */
       luaD_throw(g->mainthread, errcode);  /* re-throw in main thread */

3rd/lua/lua-latest/lcode.c

@@ -198,7 +198,7 @@ static int new_localvar (LexState *ls, TString *name) {
   checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal,
                  MAXVARS, "local variables");
   luaM_growvector(L, dyd->actvar.arr, dyd->actvar.n + 1,
-                  dyd->actvar.size, Vardesc, USHRT_MAX, "local variables");
+                  dyd->actvar.size, Vardesc, SHRT_MAX, "local variables");
   var = &dyd->actvar.arr[dyd->actvar.n++];
   var->vd.kind = VDKREG;  /* default */
   var->vd.name = name;

3rd/lua/lua-latest/ldo.c

@@ -342,8 +342,10 @@ int luaE_resetthread (lua_State *L, int status) {
 LUA_API int lua_closethread (lua_State *L, lua_State *from) {
   int status;
   lua_lock(L);
+  luai_threadcall(L, from);
   L->nCcalls = (from) ? getCcalls(from) : 0;
   status = luaE_resetthread(L, L->status);
+  luai_threadret(from, L);
   lua_unlock(L);
   return status;
 }

3rd/lua/lua-latest/lparser.c

@@ -342,8 +342,10 @@ int luaE_resetthread (lua_State *L, int status) {
 LUA_API int lua_closethread (lua_State *L, lua_State *from) {
   int status;
   lua_lock(L);
+  luai_threadcall(L, from);
   L->nCcalls = (from) ? getCcalls(from) : 0;
   status = luaE_resetthread(L, L->status);
+  luai_threadret(from, L);
   lua_unlock(L);
   return status;
 }

3rd/lua/lua-latest/lstate.c

@@ -3,7 +3,7 @@ local lm = require "luamake"
 lm.rootdir = "../../3rd/bee.lua"
 
 lm:lua_src "source_bee" {
-    sources = "3rd/lua-seri/lua-seri.c",
+    sources = "3rd/lua-seri/lua-seri.cpp",
     msvc = {
         flags = "/wd4244"
     }