Merge branch 'actboy168:master' into luajit-jit-support

Author: fesily

.clang-format

@@ -13,8 +13,5 @@ IndentPPDirectives: AfterHash
 IndentWidth: 4
 NamespaceIndentation: All
 PackConstructorInitializers: Never
+QualifierAlignment: Left
 SpaceBeforeCpp11BracedList: true
-
-BreakBeforeBraces: Custom
-BraceWrapping:
-  BeforeElse: true

.github/workflows/build.yml

@@ -15,37 +15,25 @@ jobs:
         include:
           - os: windows-latest
             platform: win32-x64
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             platform: linux-x64
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04-arm
             platform: linux-arm64
           - os: macos-latest
             platform: darwin-x64
           - os: macos-latest
             platform: darwin-arm64
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules : recursive
     - uses: actboy168/setup-luamake@master
-    - if: matrix.platform == 'linux-arm64'
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
     - run: luamake lua compile/download_deps.lua
     - run: luamake -mode release -platform ${{ matrix.platform }}
-    - run: npm install -g vsce ovsx
+    - run: npm install -g @vscode/vsce ovsx
     - run: npx vsce publish --target ${{ matrix.platform }} -p ${{ secrets.VSCE_KEY }}
       working-directory: publish
       continue-on-error: true
     - run: npx ovsx publish --target ${{ matrix.platform }} -p ${{ secrets.OVSX_KEY }}
       working-directory: publish
       continue-on-error: true
-    - if: matrix.platform == 'win32-x64'
-      run: npx vsce publish --target win32-ia32 -p ${{ secrets.VSCE_KEY }}
-      working-directory: publish
-      continue-on-error: true
-    - if: matrix.platform == 'win32-x64'
-      run: npx ovsx publish --target win32-ia32 -p ${{ secrets.OVSX_KEY }}
-      working-directory: publish
-      continue-on-error: true

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
 	"recommendations": [
 		"actboy168.tasks",
-		"actboy168.extension-path",
 		"actboy168.lua-debug"
 	]
 }

.vscode/launch.json

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

.vscode/settings.json

@@ -1,9 +1,3 @@
 {
-    "[c]": {
-        "editor.formatOnSave": true,
-    },
-    "[cpp]": {
-        "editor.formatOnSave": true,
-    },
     "C_Cpp.autoAddFileAssociations": false,
 }

.vscode/tasks.json

@@ -32,8 +32,7 @@
                 "lua",
                 "compile/copy.lua",
                 "extension",
-                "extension",
-                "${command:extensionPath}"
+                "${extensionInstallFolder:actboy168.lua-debug}"
             ]
         },
         {
@@ -43,8 +42,7 @@
                 "lua",
                 "compile/copy.lua",
                 "publish",
-                "publish",
-                "${command:extensionPath}"
+                "${extensionInstallFolder:actboy168.lua-debug}"
             ]
         }
     ]

3rd/bee.lua

@@ -30,7 +30,7 @@ CMCFLAGS=
 
 # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
 
-PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
+PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris
 
 LUA_A=	liblua.a
 CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
@@ -79,7 +79,7 @@ echo:
 	@echo "PLAT= $(PLAT)"
 	@echo "CC= $(CC)"
 	@echo "CFLAGS= $(CFLAGS)"
-	@echo "LDFLAGS= $(SYSLDFLAGS)"
+	@echo "LDFLAGS= $(LDFLAGS)"
 	@echo "LIBS= $(LIBS)"
 	@echo "AR= $(AR)"
 	@echo "RANLIB= $(RANLIB)"
@@ -117,6 +117,9 @@ FreeBSD NetBSD OpenBSD freebsd:
 
 generic: $(ALL)
 
+ios:
+	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_IOS"
+
 Linux linux:	linux-noreadline
 
 linux-noreadline:

3rd/json.lua

@@ -417,9 +417,9 @@ LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
     o = index2value(L, idx);  /* previous call may reallocate the stack */
   }
   if (len != NULL)
-    *len = vslen(o);
+    *len = tsslen(tsvalue(o));
   lua_unlock(L);
-  return svalue(o);
+  return getstr(tsvalue(o));
 }
 
 
@@ -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);