smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Fix adding C++ class instances to Lua STL containers

Browse source 
This is because Userdata::getClass() doesn't handle
negative stack indexes. It worked fine for Lua built-in types.
This commit is contained in:
Robin Gareus 2025-11-09 03:47:56 +01:00
parent d9af50449d
commit 0fd67d36d9
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libs/lua/LuaBridge/detail/CFunctions.h
View file

@ -1238,10 +1238,14 @@ struct CFunc
lua_pushvalue (L, -1);
lua_pushnil (L);
while (lua_next (L, -2)) {
#if 0
lua_pushvalue (L, -2);
T const value = Stack<T>::get (L, -2);
lua_pop (L, 1);
#endif
// lua_gettop is used because Userdata::getClass() doesn't handle negative stack indexes.
T const value = Stack<T>::get (L, lua_gettop (L));
t->push_back (value);
lua_pop (L, 2);
lua_pop (L, 1);
}
lua_pop (L, 1);
lua_pop (L, 2);
@ -1388,11 +1392,13 @@ struct CFunc
lua_pushnil (L);
while (lua_next (L, -2)) {
lua_pushvalue (L, -2);
K const key = Stack<K>::get (L, -1);
V const value = Stack<V>::get (L, -2);
// lua_gettop is used because Userdata::getClass() doesn't handle negative stack indexes.
K const key = Stack<K>::get (L, lua_gettop (L));
lua_pop (L, 1);
V const value = Stack<V>::get (L, lua_gettop (L));
lua_pop (L, 1);
t->insert (std::pair<K,V> (key, value));
//(*t)[key] = value;
lua_pop (L, 2);
}
lua_pop (L, 1);
lua_pop (L, 2);
@ -1482,12 +1488,14 @@ struct CFunc
lua_pushnil (L);
while (lua_next (L, -2)) {
lua_pushvalue (L, -2);
T const member = Stack<T>::get (L, -1);
bool const v = Stack<bool>::get (L, -2);
// lua_gettop is used because Userdata::getClass() doesn't handle negative stack indexes.
T const member = Stack<T>::get (L, lua_gettop (L));
lua_pop (L, 1);
bool const v = Stack<bool>::get (L, lua_gettop (L));
lua_pop (L, 1);
if (v) {
t->insert (member);
}
lua_pop (L, 2);
}
lua_pop (L, 1);
lua_pop (L, 2);