Fix compatibility with Lua 5.4

The couroutine result index is always 1, not dependent on the number of results which is not available in < 5.4. Errors during GC are shown as warnings in 5.4+
satoren · Jan 4, 2025 · ef2f9cc · ef2f9cc
1 parent 698eab8
commit ef2f9cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/include/kaguya/detail/lua_function_def.hpp b/include/kaguya/detail/lua_function_def.hpp
@@ -165,8 +165,7 @@ template <typename Derived> class LuaThreadImpl {
     int nresult = 1;
     int result = lua_resume(thread, state, argnum, &nresult);
     except::checkErrorAndThrow(result, thread);
-    return detail::FunctionResultProxy::ReturnValue(thread, result, nresult - (lua_gettop(state) + 1),
-                                                    types::typetag<Result>());
+    return detail::FunctionResultProxy::ReturnValue(thread, result, 1, types::typetag<Result>());
   }
   template <class... Args> FunctionResults operator()(Args &&... args);
 #else
@@ -197,8 +196,7 @@ template <typename Derived> class LuaThreadImpl {
     int nresult = 1;                                                           \
     int result = lua_resume(thread, state, argnum, &nresult);                  \
     except::checkErrorAndThrow(result, thread);                                \
-    return detail::FunctionResultProxy::ReturnValue(thread, result, nresult - (lua_gettop(state) + 1),  \
-                                                    types::typetag<Result>()); \
+    return detail::FunctionResultProxy::ReturnValue(thread, result, 1, types::typetag<Result>()); \
   }
 
   KAGUYA_RESUME_DEF(0)

diff --git a/test/test_06_state.cpp b/test/test_06_state.cpp
@@ -472,7 +472,7 @@ KAGUYA_TEST_FUNCTION_DEF(this_typemismatch_error_test)(kaguya::State &state) {
   }
 }
 
-#if LUA_VERSION_NUM >= 502
+#if LUA_VERSION_NUM >= 502 && LUA_VERSION_NUM < 504
 KAGUYA_TEST_FUNCTION_DEF(gc_error_throw_test)(kaguya::State &) {
   bool catch_except = false;
   try {