Fix stuff

Author: kunitoki

Distribution/LuaBridge/LuaBridge.h

@@ -1067,8 +1067,6 @@ inline void lua_pushcclosure_x(lua_State* L, lua_CFunction fn, const char* debug
 [[noreturn]] inline void lua_error_x(lua_State* L)
 {
     lua_error(L);
-
-    detail::unreachable();
 }
 
 inline int lua_getstack_x(lua_State* L, int level, lua_Debug* ar)
@@ -3707,6 +3705,7 @@ class LuaException : public std::exception
     LuaException(lua_State* L, std::error_code code)
         : m_L(L)
         , m_code(code)
+        , m_what(code.message())
     {
     }
 
@@ -4732,7 +4731,7 @@ struct UserdataGetter
 };
 
 template <class T>
-struct UserdataGetter<T, std::void_t<T (*)()>>
+struct UserdataGetter<T, std::enable_if_t<!is_move_only_function_v<T>, std::void_t<T (*)()>>>
 {
     using ReturnType = TypeResult<T>;
 
@@ -4746,6 +4745,26 @@ struct UserdataGetter<T, std::void_t<T (*)()>>
     }
 };
 
+#if LUABRIDGE_HAS_CXX23_MOVE_ONLY_FUNCTION
+template <class T>
+struct UserdataGetter<T, std::enable_if_t<is_move_only_function_v<T>>>
+{
+    using ReturnType = TypeResult<T>;
+
+    static ReturnType get(lua_State* L, int index)
+    {
+        auto result = Userdata::get<T>(L, index, true);
+        if (! result)
+            return result.error();
+
+        if (*result == nullptr)
+            return getNilBadArgError<T>(L, index);
+
+        return std::move(**result);
+    }
+};
+#endif
+
 } 
 
 template <class T, class = void>
@@ -7566,6 +7585,76 @@ inline void push_class_or_const_table(lua_State* L, int index)
     }
 }
 
+inline std::optional<int> try_call_instance_static_index(lua_State* L, int classMetatableIndex)
+{
+    lua_rawgetp_x(L, classMetatableIndex, getStaticKey()); 
+    if (! lua_istable(L, -1))
+    {
+        lua_pop(L, 1);
+        return std::nullopt;
+    }
+
+    lua_pushvalue(L, 2); 
+    lua_rawget(L, -2); 
+    if (! lua_isnil(L, -1))
+    {
+        lua_remove(L, -2); 
+        return 1;
+    }
+
+    lua_pop(L, 1); 
+    lua_rawgetp_x(L, -1, getPropgetKey()); 
+    if (! lua_istable(L, -1))
+    {
+        lua_pop(L, 2);
+        return std::nullopt;
+    }
+
+    lua_pushvalue(L, 2); 
+    lua_rawget(L, -2); 
+    if (! lua_iscfunction(L, -1))
+    {
+        lua_pop(L, 3);
+        return std::nullopt;
+    }
+
+    lua_remove(L, -2); 
+    lua_remove(L, -2); 
+    lua_call(L, 0, 1); 
+    return 1;
+}
+
+inline std::optional<int> try_call_instance_static_newindex(lua_State* L, int classMetatableIndex)
+{
+    lua_rawgetp_x(L, classMetatableIndex, getStaticKey()); 
+    if (! lua_istable(L, -1))
+    {
+        lua_pop(L, 1);
+        return std::nullopt;
+    }
+
+    lua_rawgetp_x(L, -1, getPropsetKey()); 
+    if (! lua_istable(L, -1))
+    {
+        lua_pop(L, 2);
+        return std::nullopt;
+    }
+
+    lua_pushvalue(L, 2); 
+    lua_rawget(L, -2); 
+    if (! lua_iscfunction(L, -1))
+    {
+        lua_pop(L, 3);
+        return std::nullopt;
+    }
+
+    lua_remove(L, -2); 
+    lua_remove(L, -2); 
+    lua_pushvalue(L, 3); 
+    lua_call(L, 1, 0);
+    return 0;
+}
+
 inline std::optional<int> try_call_index_fallback(lua_State* L)
 {
     LUABRIDGE_ASSERT(lua_istable(L, -1)); 
@@ -7763,12 +7852,6 @@ inline int index_metamethod(lua_State* L)
     {
         const Options options = get_class_options(L, -1); 
 
-        // For static __index: the static fallback takes priority over registered static
-        // property getters so that a user-defined static __index fallback can shadow
-        // static properties.
-        // For instance __index with allowOverridingMethods: the instance fallback takes
-        // priority over class-table Lua methods, enabling Lua-side method overrides via
-        // __newindex.
         if constexpr (IsObject)
         {
             if (options.test(extensibleClass | allowOverridingMethods))
@@ -7840,6 +7923,12 @@ inline int index_metamethod(lua_State* L)
         LUABRIDGE_ASSERT(lua_isnil(L, -1)); 
         lua_pop(L, 1); 
 
+        if constexpr (IsObject)
+        {
+            if (auto result = try_call_instance_static_index(L, -1))
+                return *result;
+        }
+
         lua_rawgetp_x(L, -1, getParentKey()); 
 
         if (lua_istable(L, -1))
@@ -7973,6 +8062,10 @@ inline int index_metamethod_simple(lua_State* L)
                 return 1;
 
             lua_pop(L, 1);
+
+            if (auto result = try_call_instance_static_index(L, lua_upvalueindex(2)))
+                return *result;
+
             lua_pushnil(L);
             return 1;
         }
@@ -8165,7 +8258,7 @@ inline std::optional<int> try_call_newindex_extensible(lua_State* L, const char*
 
         const int mtIndex = lua_absindex(L, -2);
         const int origClassTableIndex = lua_absindex(L, -1);
-        const auto process_metatable = [L, key, origClassTableIndex](int candidateMtIndex)
+        const auto process_metatable = [=](int candidateMtIndex)
         {
             push_class_or_const_table(L, candidateMtIndex); 
             if (! lua_istable(L, -1))
@@ -8235,7 +8328,7 @@ inline std::optional<int> try_call_newindex_extensible(lua_State* L, const char*
     lua_pushvalue(L, rootMetatableIndex); 
     const int targetMetatableIndex = lua_absindex(L, -1);
 
-    const auto process_metatable = [L, key, targetMetatableIndex](int candidateMtIndex)
+    const auto process_metatable = [=](int candidateMtIndex)
     {
         push_class_or_const_table(L, candidateMtIndex); 
         if (! lua_istable(L, -1))
@@ -8454,6 +8547,12 @@ inline int newindex_metamethod(lua_State* L)
 
     lua_pop(L, 1); 
 
+    if constexpr (IsObject)
+    {
+        if (auto result = try_call_instance_static_newindex(L, -1))
+            return *result;
+    }
+
     if (auto result = try_call_parent_newindex_setters<IsObject>(L))
         return *result;
 
@@ -8529,6 +8628,13 @@ inline int newindex_metamethod_simple(lua_State* L)
                 return 0;
             }
 
+            lua_pop(L, 1);
+            lua_getmetatable(L, 1); 
+            LUABRIDGE_ASSERT(lua_istable(L, -1));
+            if (auto result = try_call_instance_static_newindex(L, -1))
+                return *result;
+            lua_pop(L, 1);
+
             luaL_error(L, "no writable member '%s'", key);
         }
     }
@@ -12488,7 +12594,7 @@ class Namespace : public detail::Registrar
             LUABRIDGE_ASSERT(lua_istable(L, visitedIndex));
             LUABRIDGE_ASSERT(lua_istable(L, baseMetatableIndex));
 
-            const auto appendUnique = [L, parentsIndex, visitedIndex](int metatableIndex)
+            const auto appendUnique = [=](int metatableIndex)
             {
                 metatableIndex = lua_absindex(L, metatableIndex);
 

Source/LuaBridge/detail/LuaHelpers.h

@@ -184,8 +184,6 @@ inline void lua_pushcclosure_x(lua_State* L, lua_CFunction fn, const char* debug
 [[noreturn]] inline void lua_error_x(lua_State* L)
 {
     lua_error(L);
-
-    detail::unreachable();
 }
 
 inline int lua_getstack_x(lua_State* L, int level, lua_Debug* ar)