Skip to content

fix static properties registrations for subsequent class registrations #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2023
Merged

fix static properties registrations for subsequent class registrations #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c08385
fix stack for classes on subsequent registrations
matrix47 Sep 21, 2023
9ec7464
test for broken static property subsequent registration
matrix47 Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Source/LuaBridge/detail/Namespace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,9 +347,13 @@ class Namespace : public detail::Registrar
}
else
{
LUABRIDGE_ASSERT(lua_istable(L, -1)); // Stack: ns, st
LUABRIDGE_ASSERT(lua_istable(L, -1)); // Stack: ns, vst
++m_stackSize;

lua_getmetatable(L, -1); // Stack: ns, vst, st
lua_insert(L, -2); // Stack: ns, st, vst
lua_pop(L, 1); // Stack: ns, st

// Map T back from its stored tables

lua_rawgetp(L, LUA_REGISTRYINDEX, detail::getConstRegistryKey<T>()); // Stack: ns, st, co
Expand Down
21 changes: 21 additions & 0 deletions Tests/Source/ClassTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1718,6 +1718,27 @@ TEST_F(ClassStaticProperties, FieldPointers_Overridden)
ASSERT_EQ(7, Derived::staticData);
}

TEST_F(ClassStaticProperties, SubsequentRegistration)
{
using Int = Class<int, EmptyBase>;

luabridge::getGlobalNamespace(L)
.beginClass<Int>("Int")
.endClass()
.beginClass<Int>("Int")
.addStaticProperty("staticData", &Int::staticData, true)
.endClass();

Int::staticData = 10;

runLua("result = Int.staticData");
ASSERT_TRUE(result().isNumber());
ASSERT_EQ(10, result<int>());

runLua("Int.staticData = 20");
ASSERT_EQ(20, Int::staticData);
}

struct ClassMetaMethods : ClassTests
{
};
Expand Down