LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 08:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

math and data module instances are now deleted when they have no more Lua references (matches the behaviour of other modules.) Fixes the deprecation system not fully restarting when love.event.quit("restart") is called.

Browse Source 
Resolves issue #1462.
This commit is contained in:
Alex Szpakowski
2018-12-17 16:44:13 -04:00
parent d4762b4612
commit 5d5c2f9a96
6 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/data/wrap_DataModule.cpp
+20 -12
View File
@@ -41,6 +41,8 @@ namespace love
namespace data
{
#define instance() (Module::getInstance<DataModule>(Module::M_DATA))
ContainerType luax_checkcontainertype(lua_State *L, int idx)
{
const char *str = luaL_checkstring(L, idx);
@@ -60,7 +62,7 @@ int w_newDataView(lua_State *L)
if (offset < 0 || size < 0)
return luaL_error(L, "DataView offset and size must not be negative.");
DataView *d = DataModule::instance.newDataView(data, (size_t) offset, (size_t) size);
DataView *d = instance()->newDataView(data, (size_t) offset, (size_t) size);
luax_pushtype(L, d);
d->release();
@@ -89,20 +91,20 @@ int w_newByteData(lua_State *L)
return luaL_error(L, "Offset and size arguments must fit within the given Data's size.");
const char *bytes = (const char *) data->getData() + offset;
luax_catchexcept(L, [&]() { d = DataModule::instance.newByteData(bytes, (size_t) size); });
luax_catchexcept(L, [&]() { d = instance()->newByteData(bytes, (size_t) size); });
}
else if (lua_type(L, 1) == LUA_TSTRING)
{
size_t size = 0;
const char *data = luaL_checklstring(L, 1, &size);
luax_catchexcept(L, [&]() { d = DataModule::instance.newByteData(data, size); });
luax_catchexcept(L, [&]() { d = instance()->newByteData(data, size); });
}
else
{
lua_Integer size = luaL_checkinteger(L, 1);
if (size <= 0)
return luaL_error(L, "Data size must be a positive number.");
luax_catchexcept(L, [&]() { d = DataModule::instance.newByteData((size_t) size); });
luax_catchexcept(L, [&]() { d = instance()->newByteData((size_t) size); });
}
luax_pushtype(L, d);
@@ -184,7 +186,7 @@ int w_decompress(lua_State *L)
if (ctype == CONTAINER_DATA)
{
ByteData *data = nullptr;
luax_catchexcept(L, [&]() { data = DataModule::instance.newByteData(rawbytes, rawsize, true); });
luax_catchexcept(L, [&]() { data = instance()->newByteData(rawbytes, rawsize, true); });
luax_pushtype(L, Data::type, data);
data->release();
}
@@ -228,9 +230,9 @@ int w_encode(lua_State *L)
{
ByteData *data = nullptr;
if (dst != nullptr)
luax_catchexcept(L, [&]() { data = DataModule::instance.newByteData(dst, dstlen, true); });
luax_catchexcept(L, [&]() { data = instance()->newByteData(dst, dstlen, true); });
else
luax_catchexcept(L, [&]() { data = DataModule::instance.newByteData(0); });
luax_catchexcept(L, [&]() { data = instance()->newByteData(0); });
luax_pushtype(L, Data::type, data);
data->release();
@@ -277,9 +279,9 @@ int w_decode(lua_State *L)
{
ByteData *data = nullptr;
if (dst != nullptr)
luax_catchexcept(L, [&]() { data = DataModule::instance.newByteData(dst, dstlen, true); });
luax_catchexcept(L, [&]() { data = instance()->newByteData(dst, dstlen, true); });
else
luax_catchexcept(L, [&]() { data = DataModule::instance.newByteData(0); });
luax_catchexcept(L, [&]() { data = instance()->newByteData(0); });
luax_pushtype(L, Data::type, data);
data->release();
@@ -331,7 +333,7 @@ int w_pack(lua_State *L)
if (ctype == CONTAINER_DATA)
{
Data *d = nullptr;
luax_catchexcept(L, [&]() { d = DataModule::instance.newByteData(b.nelems); });
luax_catchexcept(L, [&]() { d = instance()->newByteData(b.nelems); });
memcpy(d->getData(), b.ptr, d->getSize());
lua53_cleanupbuffer(&b);
@@ -392,10 +394,16 @@ static const lua_CFunction types[] =
extern "C" int luaopen_love_data(lua_State *L)
{
DataModule::instance.retain();
DataModule *instance = instance();
if (instance == nullptr)
{
luax_catchexcept(L, [&](){ instance = new DataModule(); });
}
else
instance->retain();
WrappedModule w;
w.module = &DataModule::instance;
w.module = instance;
w.name = "data";
w.type = &Module::type;
w.functions = functions;