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

actboy168 · Dec 28, 2023 · a64950e · a64950e
2 parents 6a2868f + 693549d
commit a64950e
Show file tree

Hide file tree

Showing 100 changed files with 1,818 additions and 1,346 deletions.
diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -0,0 +1 @@
+3rd/.*
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,15 +6,15 @@
             "request": "launch",
             "name": "Test Client",
             "console": "integratedTerminal",
-            "luaVersion": "latest",
+            "luaVersion": "lua-latest",
             "windows": {
-                "luaexe": "${command:extensionPath}actboy168.lua-debug-1.61.0-win32-x64/bin/lua-debug"
+                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.4-win32-x64/bin/lua-debug"
             },
             "linux": {
-                "luaexe": "${command:extensionPath}actboy168.lua-debug-1.61.0-linux-x64/bin/lua-debug",
+                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.4-linux-x64/bin/lua-debug",
             },
             "osx": {
-                "luaexe": "${command:extensionPath}actboy168.lua-debug-1.61.0-darwin-arm64/bin/lua-debug",
+                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.4-darwin-arm64/bin/lua-debug",
             },
             "outputCapture": [
             ],
@@ -34,7 +34,7 @@
                 "--extensionDevelopmentPath=${workspaceFolder}/extension/"
             ],
             "env": {
-                "VSCODE_EXTENSION_PATH" : "${command:extensionPath}actboy168.lua-debug-1.61.0"
+                "VSCODE_EXTENSION_PATH" : "${command:extensionPath}actboy168.lua-debug-2.0.4"
             }
         }
     ]

diff --git a/3rd/bee.lua b/3rd/bee.lua
diff --git a/3rd/json.lua b/3rd/json.lua
diff --git a/3rd/lua/lua54/Makefile b/3rd/lua/lua54/Makefile
@@ -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:
+132 −0		.editorconfig
+4 −4		json-beautify.lua
+86 −83		json-edit.lua
+69 −67		json.lua
+55 −54		jsonc.lua
+23 −22		test/conformance.lua
+3 −4		test/edit.lua
+3 −3		test/jsonc.lua