MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose long/[u]intptr_t to lua and fix some integer return values

develop
lethosor 2016-07-29 00:02:51 -04:00
parent b7856fd9f2
commit dc79e2477b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/LuaApi.cpp
Unescape Escape View File

@ -2384,7 +2384,7 @@ static int internal_getVTable(lua_State *L)
const char *name = luaL_checkstring(L, 1); const char *name = luaL_checkstring(L, 1);
uintptr_t addr = (uintptr_t)Core::getInstance().vinfo->getVTable(name); uintptr_t addr = (uintptr_t)Core::getInstance().vinfo->getVTable(name);
if (addr) if (addr)
lua_pushnumber(L, addr); lua_pushinteger(L, addr);
else else
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;

7
library/LuaWrapper.cpp
Unescape Escape View File

@ -451,6 +451,7 @@ static const char *const primitive_types[] = {
"ptr-string", "ptr-string",
"int8_t", "uint8_t", "int16_t", "uint16_t", "int8_t", "uint8_t", "int16_t", "uint16_t",
"int32_t", "uint32_t", "int64_t", "uint64_t", "int32_t", "uint32_t", "int64_t", "uint64_t",
"intptr_t", "uintptr_t", "long",
"bool", "float", "double", "bool", "float", "double",
"pointer", "pointer",
"ptr-vector", "ptr-vector",
@ -465,6 +466,8 @@ static type_identity *const primitive_identities[] = {
df::identity_traits<int16_t>::get(), df::identity_traits<uint16_t>::get(), df::identity_traits<int16_t>::get(), df::identity_traits<uint16_t>::get(),
df::identity_traits<int32_t>::get(), df::identity_traits<uint32_t>::get(), df::identity_traits<int32_t>::get(), df::identity_traits<uint32_t>::get(),
df::identity_traits<int64_t>::get(), df::identity_traits<uint64_t>::get(), df::identity_traits<int64_t>::get(), df::identity_traits<uint64_t>::get(),
df::identity_traits<intptr_t>::get(), df::identity_traits<uintptr_t>::get(),
df::identity_traits<long>::get(),
df::identity_traits<bool>::get(), df::identity_traits<bool>::get(),
df::identity_traits<float>::get(), df::identity_traits<double>::get(), df::identity_traits<float>::get(), df::identity_traits<double>::get(),
df::identity_traits<void*>::get(), df::identity_traits<void*>::get(),
@ -572,7 +575,7 @@ static int meta_sizeof(lua_State *state)
if (lua_isnil(state, 1) || lua_islightuserdata(state, 1)) if (lua_isnil(state, 1) || lua_islightuserdata(state, 1))
{ {
lua_pushnil(state); lua_pushnil(state);
lua_pushnumber(state, (size_t)lua_touserdata(state, 1)); lua_pushinteger(state, (size_t)lua_touserdata(state, 1));
return 2; return 2;
} }
@ -595,7 +598,7 @@ static int meta_sizeof(lua_State *state)
// Add the address // Add the address
if (lua_isuserdata(state, 1)) if (lua_isuserdata(state, 1))
{ {
lua_pushnumber(state, (size_t)get_object_ref(state, 1)); lua_pushinteger(state, (size_t)get_object_ref(state, 1));
return 2; return 2;
} }
else else