Merge branch 'satoren:main' into patch-1

Author: Flamefire

include/kaguya/compatibility.hpp

@@ -9,6 +9,19 @@
 namespace kaguya {
 // for lua version compatibility
 namespace compat {
+#if LUA_VERSION_NUM >= 504
+#elif LUA_VERSION_NUM < 502
+inline int lua_resume(lua_State *L, lua_State *from, int nargs, int* nresults) {
+  KAGUYA_UNUSED(from);
+  *nresults = 1;
+  return ::lua_resume(L, nargs);
+}
+#else
+inline int lua_resume(lua_State *L, lua_State *from, int nargs, int* nresults) {
+  *nresults = 1;
+  return ::lua_resume(L, from, nargs);
+}
+#endif
 #if LUA_VERSION_NUM >= 503
 inline int lua_rawgetp_rtype(lua_State *L, int idx, const void *ptr) {
   return lua_rawgetp(L, idx, ptr);
@@ -54,10 +67,6 @@ inline size_t lua_rawlen(lua_State *L, int index) {
   return lua_objlen(L, index);
 }
 
-inline int lua_resume(lua_State *L, lua_State *from, int nargs) {
-  KAGUYA_UNUSED(from);
-  return ::lua_resume(L, nargs);
-}
 inline int lua_absindex(lua_State *L, int idx) {
   return (idx > 0 || (idx <= LUA_REGISTRYINDEX)) ? idx
                                                  : lua_gettop(L) + 1 + idx;

include/kaguya/detail/lua_function_def.hpp

@@ -162,14 +162,14 @@ template <typename Derived> class LuaThreadImpl {
     if (argnum < 0) {
       argnum = 0;
     }
-    int result = lua_resume(thread, state, argnum);
+    int nresult = 1;
+    int result = lua_resume(thread, state, argnum, &nresult);
     except::checkErrorAndThrow(result, thread);
-    return detail::FunctionResultProxy::ReturnValue(thread, result, 1,
+    return detail::FunctionResultProxy::ReturnValue(thread, result, nresult - (lua_gettop(state) + 1),
                                                     types::typetag<Result>());
   }
   template <class... Args> FunctionResults operator()(Args &&... args);
 #else
-
 #define KAGUYA_RESUME_DEF(N)                                                   \
   template <class Result KAGUYA_PP_TEMPLATE_DEF_REPEAT_CONCAT(N)>              \
   Result resume(KAGUYA_PP_ARG_CR_DEF_REPEAT(N)) {                              \
@@ -194,9 +194,10 @@ template <typename Derived> class LuaThreadImpl {
     if (argnum < 0) {                                                          \
       argnum = 0;                                                              \
     }                                                                          \
-    int result = lua_resume(thread, state, argnum);                            \
+    int nresult = 1;                                                           \
+    int result = lua_resume(thread, state, argnum, &nresult);                  \
     except::checkErrorAndThrow(result, thread);                                \
-    return detail::FunctionResultProxy::ReturnValue(thread, result, 1,         \
+    return detail::FunctionResultProxy::ReturnValue(thread, result, nresult - (lua_gettop(state) + 1),  \
                                                     types::typetag<Result>()); \
   }
 

test/test_03_function.cpp

@@ -235,7 +235,8 @@ int cfunction(lua_State *L) {
 
 int coroutinefn(lua_State *cor) {
   using namespace kaguya;
-  lua_resume(cor, 0, 0);
+  int nresult = 0;
+  lua_resume(cor, 0, 0, &nresult);
   return static_cast<int>(lua_tointeger(cor, 1));
 }
 

test/test_05_lua_ref.cpp

@@ -13,7 +13,6 @@ void ignore_error_fun(int status, const char *message) {
 KAGUYA_TEST_FUNCTION_DEF(access)(kaguya::State &state) {
   kaguya::LuaRef ref(state.state(), "abc");
   TEST_EQUAL(ref.get<std::string>(), "abc");
-  ref = ref;
 
   state("abc={d =1,e=3,f=64,g='sss'}");
   kaguya::LuaRef abctable = state["abc"];

test/test_09_utility.cpp

@@ -48,7 +48,8 @@ KAGUYA_TEST_FUNCTION_DEF(lua_resume_test)(kaguya::State &s) {
   lua_pushnumber(co, 2);
   lua_pushnumber(co, 3);
 
-  lua_resume(co, s.state(), 2);
+  int nres;
+  lua_resume(co, s.state(), 2, &nres);
 
   TEST_EQUAL(s["v"][1], 2);
   TEST_EQUAL(s["v"][2], 3);

test/test_12_push_any.cpp

@@ -21,7 +21,6 @@ KAGUYA_TEST_FUNCTION_DEF(push_any_type)(kaguya::State &state) {
   AnyDataPusher a("d");
   AnyDataPusher b(4);
   a = b;
-  a = a;
   AnyDataPusher c;
   TEST_COMPARE_EQ(state.newRef(a), 4);
   TEST_COMPARE_EQ(state.newRef(b), 4);