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

Fix a bug: LookupTypeInfo cannot assume the result is userdata.

develop
Alexander Gavrilov 2012-04-01 17:59:47 +04:00
parent a3e526abdb
commit 604c84953b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/LuaWrapper.cpp
Unescape Escape View File

@ -120,7 +120,7 @@ bool LuaWrapper::LookupTypeInfo(lua_State *state, bool in_method)
// stack: [info] // stack: [info]
if (!lua_islightuserdata(state, -1)) if (lua_isnil(state, -1))
{ {
lua_pop(state, 1); lua_pop(state, 1);
return false; return false;
@ -132,8 +132,7 @@ bool LuaWrapper::LookupTypeInfo(lua_State *state, bool in_method)
void LuaWrapper::LookupInTable(lua_State *state, void *id, const char *tname) void LuaWrapper::LookupInTable(lua_State *state, void *id, const char *tname)
{ {
lua_getfield(state, LUA_REGISTRYINDEX, tname); lua_getfield(state, LUA_REGISTRYINDEX, tname);
lua_pushlightuserdata(state, id); lua_rawgetp(state, -1, id);
lua_rawget(state, -2);
lua_remove(state, -2); lua_remove(state, -2);
} }
@ -142,9 +141,8 @@ void LuaWrapper::SaveInTable(lua_State *state, void *node, const char *tname)
// stack: [info] // stack: [info]
lua_getfield(state, LUA_REGISTRYINDEX, tname); lua_getfield(state, LUA_REGISTRYINDEX, tname);
lua_pushlightuserdata(state, node); lua_pushvalue(state, -2);
lua_pushvalue(state, -3); lua_rawsetp(state, -2, node);
lua_rawset(state, -3);
lua_pushvalue(state, -2); lua_pushvalue(state, -2);
lua_pushlightuserdata(state, node); lua_pushlightuserdata(state, node);