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

Build type information on first use (load-time), instead of using a hardcoded list

Browse Source 
--HG--
branch : dynamiccore2
This commit is contained in:
Bart van Strien
2016-11-13 16:38:57 +01:00
parent 452a8a877e
commit c761202486
192 changed files with 734 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Variant.cpp
+8 -8
View File
@@ -24,19 +24,19 @@
namespace love
{
static love::Type extractudatatype(lua_State *L, int idx)
static love::Type *extractudatatype(lua_State *L, int idx)
{
Proxy *u = (Proxy *)lua_touserdata(L, idx);
if (u == nullptr || u->type <= INVALID_ID || u->type >= TYPE_MAX_ENUM)
return INVALID_ID;
if (u == nullptr || u->type == nullptr)
return nullptr;
// We could get rid of the dynamic_cast for more performance, but it would
// be less safe...
if (dynamic_cast<Object *>(u->object) != nullptr)
return u->type;
return INVALID_ID;
return nullptr;
}
Variant::Variant()
@@ -77,11 +77,11 @@ Variant::Variant(void *userdata)
data.userdata = userdata;
}
Variant::Variant(love::Type udatatype, void *userdata)
Variant::Variant(love::Type *udatatype, void *userdata)
: type(FUSERDATA)
, udatatype(udatatype)
{
if (udatatype != INVALID_ID)
if (udatatype != nullptr)
{
Proxy *p = (Proxy *) userdata;
data.userdata = p->object;
@@ -243,8 +243,8 @@ void Variant::toLua(lua_State *L) const
lua_pushlightuserdata(L, data.userdata);
break;
case FUSERDATA:
if (udatatype != INVALID_ID)
luax_pushtype(L, udatatype, (love::Object *) data.userdata);
if (udatatype != nullptr)
luax_pushtype(L, *udatatype, (love::Object *) data.userdata);
else
lua_pushlightuserdata(L, data.userdata);
// I know this is not the same