Fix references to members

kunitoki · Mar 6, 2023 · 30f7d74 · 30f7d74
1 parent 417f9b1
commit 30f7d74
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/Source/LuaBridge/detail/Userdata.h b/Source/LuaBridge/detail/Userdata.h
@@ -842,6 +842,11 @@ struct RefStackHelper<T, false>
 {
     using ReturnType = TypeResult<std::reference_wrapper<T>>;
 
+    static Result push(lua_State* L, T& t)
+    {
+        return UserdataPtr::push(L, std::addressof(t));
+    }
+
     static Result push(lua_State* L, const T& t)
     {
         return UserdataPtr::push(L, std::addressof(t));
@@ -984,7 +989,7 @@ struct StackOpSelector<T&, true>
     using Helper = RefStackHelper<T, IsContainer<T>::value>;
     using ReturnType = typename Helper::ReturnType;
 
-    static Result push(lua_State* L, T& value) { return UserdataPtr::push(L, &value); }
+    static Result push(lua_State* L, T& value) { return Helper::push(L, value); }
 
     static ReturnType get(lua_State* L, int index) { return Helper::get(L, index); }
 

diff --git a/Tests/Source/Tests.cpp b/Tests/Source/Tests.cpp
@@ -673,6 +673,53 @@ TEST_F(LuaBridgeTest, StdSharedPtrDerivedPolymorphic)
     EXPECT_EQ("VirtualC", x3);
 }
 
+namespace {
+class TestClassInner : public std::enable_shared_from_this<TestClassInner>
+{
+public:
+    inline int getValue() const { return 42; }
+};
+
+class TestClassOuter
+{
+public:
+    TestClassOuter()
+        : sharedPointerNested(std::make_shared<TestClassInner>())
+    {
+    }
+
+    inline std::shared_ptr<TestClassInner> getNested() const { return sharedPointerNested; }
+
+    TestClassInner valueNested;
+    std::shared_ptr<TestClassInner> sharedPointerNested;
+};
+} // namespace
+
+TEST_F(LuaBridgeTest, StdSharedPtrAsProperty)
+{
+    luabridge::getGlobalNamespace(L)
+        .beginNamespace("test")
+            .beginClass<TestClassInner>("TestClassInner")
+                .addFunction("getValue", &TestClassInner::getValue)
+            .endClass()
+            .beginClass<TestClassOuter>("TestClassOuter")
+                .addConstructor<void()>()
+                .addProperty("getNested", &TestClassOuter::getNested)
+                .addProperty("valueNested", &TestClassOuter::valueNested)
+                .addProperty("sharedPointerNested", &TestClassOuter::sharedPointerNested)
+            .endClass()
+        .endNamespace();
+
+    ASSERT_TRUE(runLua("local x = test.TestClassOuter(); result = x.getNested:getValue()"));
+    EXPECT_EQ(42, result<int>());
+
+    ASSERT_TRUE(runLua("local x = test.TestClassOuter(); result = x.valueNested:getValue()"));
+    EXPECT_EQ(42, result<int>());
+
+    ASSERT_TRUE(runLua("local x = test.TestClassOuter(); result = x.sharedPointerNested:getValue()"));
+    EXPECT_EQ(42, result<int>());
+}
+
 #if LUABRIDGE_HAS_EXCEPTIONS
 namespace {
 template <class... Args>