Merge branch 'master' of https://github.com/actboy168/bee.lua

Author: actboy168

3rd/lua55/lcode.c

@@ -1370,9 +1370,11 @@ void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
     fillidxk(t, k->u.info, VINDEXUP);  /* literal short string */
   }
   else if (t->k == VVARGVAR) {  /* indexing the vararg parameter? */
-    lua_assert(t->u.ind.t == fs->f->numparams);
-    t->u.ind.t = cast_byte(t->u.var.ridx);
-    fillidxk(t, luaK_exp2anyreg(fs, k), VVARGIND);  /* register */
+    int kreg = luaK_exp2anyreg(fs, k);  /* put key in some register */
+    lu_byte vreg = cast_byte(t->u.var.ridx);  /* register with vararg param. */
+    lua_assert(vreg == fs->f->numparams);
+    t->u.ind.t = vreg;  /* (avoid a direct assignment; values may overlap) */
+    fillidxk(t, kreg, VVARGIND);  /* 't' represents 'vararg[k]' */
   }
   else {
     /* register index of the table */

3rd/lua55/lparser.c

@@ -505,8 +505,8 @@ static void buildglobal (LexState *ls, TString *varname, expdesc *var) {
   init_exp(var, VGLOBAL, -1);  /* global by default */
   singlevaraux(fs, ls->envn, var, 1);  /* get environment variable */
   if (var->k == VGLOBAL)
-    luaK_semerror(ls, "_ENV is global when accessing variable '%s'",
-                      getstr(varname));
+    luaK_semerror(ls, "%s is global when accessing variable '%s'",
+                      LUA_ENV, getstr(varname));
   luaK_exp2anyregup(fs, var);  /* _ENV could be a constant */
   codestring(&key, varname);  /* key is variable name */
   luaK_indexed(fs, var, &key);  /* 'var' represents _ENV[varname] */

bee/crash/handler.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #if defined(_MSC_VER) && !defined(__clang__) && !defined(__SANITIZE_ADDRESS__)
-#    include <bee/crash/handler_win.h>
-#elif defined(__linux__)
-#    include <bee/crash/handler_linux.h>
+#    include <bee/crash/windows/handler_win.h>
+//#elif defined(__linux__)
+//#    include <bee/crash/linux/handler_linux.h>
 #else
 namespace bee::crash {
     class empty_handler {

bee/crash/handler_linux.cpp bee/crash/linux/handler_linux.cppbee/crash/handler_linux.cpp renamed to bee/crash/linux/handler_linux.cpp

@@ -1,8 +1,8 @@
 #include <bee/crash/allocator.h>
-#include <bee/crash/handler_linux.h>
+#include <bee/crash/linux/handler_linux.h>
+#include <bee/crash/linux/unwind_linux.h>
 #include <bee/crash/nanoid.h>
 #include <bee/crash/stacktrace.h>
-#include <bee/crash/unwind_linux.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>

bee/crash/handler_linux.h bee/crash/linux/handler_linux.hbee/crash/handler_linux.h renamed to bee/crash/linux/handler_linux.h

@@ -1,4 +1,4 @@
-#include <bee/crash/unwind_linux.h>
+#include <bee/crash/linux/unwind_linux.h>
 
 #define UNW_LOCAL_ONLY
 #include <libunwind.h>

bee/crash/stacktrace_linux.cpp bee/crash/linux/stacktrace_linux.cppbee/crash/stacktrace_linux.cpp renamed to bee/crash/linux/stacktrace_linux.cpp

@@ -1,7 +1,7 @@
-#include <bee/crash/handler_win.h>
 #include <bee/crash/nanoid.h>
 #include <bee/crash/stacktrace.h>
-#include <bee/crash/unwind_win.h>
+#include <bee/crash/windows/handler_win.h>
+#include <bee/crash/windows/unwind_win.h>
 #include <bee/win/wtf8.h>
 #include <io.h>