[Bug] Lua 5.4 not working #5781
Description
Hi,
I am looking for a library for OSM map matching and wanted to try libosrm. But while compiling I noticed that there are problems with Lua version 5.4:
1>D:\test9\src\third_party\sol2\sol2/sol.hpp(3402): error C2065: "LUA_ERRGCMM": undeclared identifier
1>D:\test9\src\third_party\sol2\sol2/sol.hpp(3412): error C2065: "LUA_ERRGCMM": undeclared identifier
1>D:\test9\src\third_party\sol2\sol2/sol.hpp(3421): error C2065: "LUA_ERRGCMM": undeclared identifier
1>D:\test9\src\third_party\sol2\sol2/sol.hpp(3465): error C2196: case value "0" is already used
1>D:\test9\src\third_party\sol2\sol2/sol.hpp(3488): error C2196: case value "0" is already used
1>D:\test9\src\third_party\sol2\sol2/sol.hpp(14378): error C2660: "lua_resume": function does not take 3 Arguments
The function lua_resume now has an extra parameter. This out parameter returns the number of values on the top of the stack that were yielded or returned by the coroutine (in previous versions, those values were the entire stack.). The constant LUA_ERRGCMM was removed. Errors in finalizers are never propagated; instead, they generate a warning.
Proposal for a patch:
diff --git a/third_party/sol2/sol2/sol.hpp b/third_party/sol2/sol2/sol.hpp
index a349ea9d1..d48b67431 100644
--- a/third_party/sol2/sol2/sol.hpp
+++ b/third_party/sol2/sol2/sol.hpp
@@ -3399,7 +3399,9 @@ namespace sol {
runtime = LUA_ERRRUN,
memory = LUA_ERRMEM,
handler = LUA_ERRERR,
+#if SOL_LUA_VERSION < 504
gc = LUA_ERRGCMM,
+#endif
syntax = LUA_ERRSYNTAX,
file = LUA_ERRFILE,
};
@@ -3409,7 +3411,9 @@ namespace sol {
yielded = LUA_YIELD,
runtime = LUA_ERRRUN,
memory = LUA_ERRMEM,
+#if SOL_LUA_VERSION < 504
gc = LUA_ERRGCMM,
+#endif
handler = LUA_ERRERR,
dead = -1,
};
@@ -3418,7 +3422,9 @@ namespace sol {
ok = LUA_OK,
syntax = LUA_ERRSYNTAX,
memory = LUA_ERRMEM,
+#if SOL_LUA_VERSION < 504
gc = LUA_ERRGCMM,
+#endif
file = LUA_ERRFILE,
};
@@ -3462,8 +3468,10 @@ namespace sol {
return names[3];
case call_status::handler:
return names[4];
+#if SOL_LUA_VERSION < 504
case call_status::gc:
return names[5];
+#endif
case call_status::syntax:
return names[6];
case call_status::file:
@@ -3485,8 +3493,10 @@ namespace sol {
return names[0];
case load_status::memory:
return names[1];
+#if SOL_LUA_VERSION < 504
case load_status::gc:
return names[2];
+#endif
case load_status::syntax:
return names[3];
case load_status::file:
@@ -14374,9 +14384,12 @@ namespace sol {
void luacall(std::ptrdiff_t argcount, std::ptrdiff_t) {
#if SOL_LUA_VERSION < 502
stats = static_cast<call_status>(lua_resume(lua_state(), static_cast<int>(argcount)));
-#else
+#elif SOL_LUA_VERSION < 504
stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount)));
-#endif // Lua 5.1 compat
+#else
+ int nstack = 0;
+ stats = static_cast<call_status>(lua_resume(lua_state(), nullptr, static_cast<int>(argcount), &nstack));
+#endif
}
template<std::size_t... I, typename... Ret>