Fix lua5.5 support

Author: CppCXY

README.md

@@ -34,6 +34,7 @@
 | Lua 5.2     | ✅     | Fully supported |
 | Lua 5.3     | ✅     | Fully supported |
 | Lua 5.4     | ✅     | Fully supported |
+| Lua 5.5     | ✅     | Fully supported |
 | LuaJIT      | ✅     | Fully supported |
 
 ## 🚀 Quick Start
@@ -97,14 +98,14 @@ print("Hello, EmmyLua Debugger!")
 
 | Option                | Default | Description                        |
 |-----------------------|---------|------------------------------------|
-| `EMMY_LUA_VERSION`    | `54`    | Lua version (51/52/53/54/jit)      |
+| `EMMY_LUA_VERSION`    | `55`    | Lua version (51/52/53/54/55/jit)      |
 | `EMMY_USE_LUA_SOURCE` | `OFF`   | Whether to build with Lua source   |
 
 ### Advanced Build Examples
 
 ```bash
 # Build for a specific version
-cmake .. -DEMMY_LUA_VERSION=53 
+cmake .. -DEMMY_LUA_VERSION=55
 # Build using Lua source
 cmake .. -DEMMY_USE_LUA_SOURCE=ON
 ```

build_script/lua_exe/CMakeLists.txt

@@ -19,7 +19,7 @@ elseif(${EMMY_LUA_VERSION} STREQUAL "51")
 endif()
 
 option(LUA_BUILD_AS_DLL "USE" ON)
-set(lua_dll_SOURCE_DIR "../../third-party/${EMMY_LUA_DIR}")
+set(lua_dll_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../third-party/${EMMY_LUA_DIR}")
 
 add_subdirectory("${lua_dll_SOURCE_DIR}" luadll.out)
 
@@ -33,54 +33,8 @@ target_sources(lua PUBLIC
 
 target_link_libraries(lua "lua${EMMY_LUA_VERSION}")
 
-# Add luac executable
-add_executable(luac)
-
-target_sources(luac PRIVATE
-    ${lua_dll_SOURCE_DIR}/src/luac.c
-    # Lua core library sources (required for luac)
-    ${lua_dll_SOURCE_DIR}/src/lapi.c
-    ${lua_dll_SOURCE_DIR}/src/lcode.c
-    ${lua_dll_SOURCE_DIR}/src/lctype.c
-    ${lua_dll_SOURCE_DIR}/src/ldebug.c
-    ${lua_dll_SOURCE_DIR}/src/ldo.c
-    ${lua_dll_SOURCE_DIR}/src/ldump.c
-    ${lua_dll_SOURCE_DIR}/src/lfunc.c
-    ${lua_dll_SOURCE_DIR}/src/lgc.c
-    ${lua_dll_SOURCE_DIR}/src/llex.c
-    ${lua_dll_SOURCE_DIR}/src/lmem.c
-    ${lua_dll_SOURCE_DIR}/src/lobject.c
-    ${lua_dll_SOURCE_DIR}/src/lopcodes.c
-    ${lua_dll_SOURCE_DIR}/src/lparser.c
-    ${lua_dll_SOURCE_DIR}/src/lstate.c
-    ${lua_dll_SOURCE_DIR}/src/lstring.c
-    ${lua_dll_SOURCE_DIR}/src/ltable.c
-    ${lua_dll_SOURCE_DIR}/src/ltm.c
-    ${lua_dll_SOURCE_DIR}/src/lundump.c
-    ${lua_dll_SOURCE_DIR}/src/lvm.c
-    ${lua_dll_SOURCE_DIR}/src/lzio.c
-    ${lua_dll_SOURCE_DIR}/src/lauxlib.c
-)
-
-if(WIN32)
-    target_compile_definitions(luac PRIVATE _CRT_SECURE_NO_WARNINGS)
-elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    target_compile_definitions(luac PRIVATE LUA_USE_LINUX)
-    target_link_libraries(luac m dl)
-else()
-    target_compile_definitions(luac PRIVATE LUA_USE_MACOSX)
-    target_link_libraries(luac m)
-endif()
-
-
-install(
-    TARGETS lua luac
-    LIBRARY DESTINATION ./
-    RUNTIME DESTINATION ./
-)
-
 install(
-    TARGETS "lua${EMMY_LUA_VERSION}"
+    TARGETS lua "lua${EMMY_LUA_VERSION}"
     LIBRARY DESTINATION ./
     RUNTIME DESTINATION ./
 )

emmy_debugger/src/api/lua_api_loader.cpp

@@ -318,12 +318,20 @@ void luaL_setfuncs(lua_State* L, const luaL_Reg* l, int nup)
 
 int lua_upvalueindex(int i)
 {
-	if (luaVersion == LuaVersion::LUA_54)
-		return -1001000 - i;
-	if (luaVersion == LuaVersion::LUA_53)
-		return -1001000 - i;
-	if (luaVersion == LuaVersion::LUA_52)
-		return -1001000 - i;
+	switch (luaVersion) {
+		case LuaVersion::LUA_55: {
+			return LUA_REGISTRYINDEX - i;
+		}
+		case LuaVersion::LUA_52:
+		case LuaVersion::LUA_53:
+		case LuaVersion::LUA_54: {
+			return -1001000 - i;
+		}
+		default: {
+			return -10002 - i;
+		}
+	}
+
 	return -10002 - i;
 }
 

emmy_debugger/src/debugger/emmy_debugger.cpp

@@ -963,9 +963,31 @@ bool Debugger::DoEval(std::shared_ptr<EvalContext> evalContext) {
 	// 如果是 aaa:bbbb 则纠正为aaa.bbbb
 	int r = luaL_loadstring(L, statement.c_str());
 	if (r == LUA_ERRSYNTAX) {
-		evalContext->error = "syntax err: ";
-		evalContext->error.append(evalContext->expr);
-		return false;
+		// 尝试将 : 替换为 . 后重新加载
+		std::string correctedExpr = evalContext->expr;
+		size_t colonPos = correctedExpr.find(':');
+		if (colonPos != std::string::npos) {
+			correctedExpr[colonPos] = '.';
+			std::string correctedStatement = "return ";
+			if (evalContext->setValue) {
+				correctedStatement = correctedExpr + " = " + evalContext->value + " return " + correctedExpr;
+			} else {
+				correctedStatement.append(correctedExpr);
+			}
+			lua_pop(L, 1); // 弹出之前的错误信息
+			r = luaL_loadstring(L, correctedStatement.c_str());
+			if (r == LUA_OK) {
+				// 纠正成功，继续执行
+				evalContext->expr = correctedExpr; // 更新表达式
+			}
+		}
+		
+		if (r == LUA_ERRSYNTAX) {
+			lua_pop(L, 1); // 弹出错误信息
+			evalContext->error = "syntax err: ";
+			evalContext->error.append(evalContext->expr);
+			return false;
+		}
 	}
 	// call
 	const int fIdx = lua_gettop(L);
@@ -977,7 +999,8 @@ bool Debugger::DoEval(std::shared_ptr<EvalContext> evalContext) {
 	lua_setfenv(L, fIdx);
 #elif defined(EMMY_LUA_51) || defined(EMMY_LUA_JIT)
     lua_setfenv(L, fIdx);
-#else //52 & 53
+#else //52, 53, 54, 55+
+    // Lua 5.2+ 使用 _ENV upvalue 替代 setfenv
     lua_setupvalue(L, fIdx, 1);
 #endif
 	assert(lua_gettop(L) == fIdx);

third-party/libuv-1.46.0/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.11)
 
 if(POLICY CMP0091)
   cmake_policy(SET CMP0091 NEW) # Enable MSVC_RUNTIME_LIBRARY setting