chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Lua: Object tables were left on stack, fixed.

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-03-10 07:03:19 +00:00
parent e2a736ed83
commit 13e5af0f17
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Library/lua/LuaManager.cpp
View File

@ -28,32 +28,31 @@ void LuaManager::Initialize()
if (c_State == NULL) if (c_State == NULL)
{ {
// Initialize Lua // Initialize Lua
c_State = lua_open(); c_State = luaL_newstate();
// Initialize standard libraries except debug, modified from linit.c // Initialize standard libraries except debug, modified from linit.c
const luaL_Reg lualibs[] = const luaL_Reg lualibs[] =
{ {
{ "", luaopen_base }, { "", luaopen_base },
{ LUA_LOADLIBNAME, luaopen_package }, { LUA_LOADLIBNAME, luaopen_package },
{ LUA_TABLIBNAME, luaopen_table }, { LUA_TABLIBNAME, luaopen_table },
{ LUA_IOLIBNAME, luaopen_io }, { LUA_IOLIBNAME, luaopen_io },
{ LUA_OSLIBNAME, luaopen_os }, { LUA_OSLIBNAME, luaopen_os },
{ LUA_STRLIBNAME, luaopen_string }, { LUA_STRLIBNAME, luaopen_string },
{ LUA_MATHLIBNAME, luaopen_math }, { LUA_MATHLIBNAME, luaopen_math },
{ NULL, NULL } { NULL, NULL }
}; };
for (const luaL_Reg* lib = lualibs; lib->func; ++lib) for (const luaL_Reg* lib = lualibs; lib->func; ++lib)
{ {
lua_pushcfunction(c_State, lib->func); lua_pushcfunction(c_State, lib->func);
lua_pushstring(c_State, lib->name); lua_pushstring(c_State, lib->name);
lua_call(c_State, 1, 0); lua_call(c_State, 1, 0);
} }
// Register custom types and functions // Register custom types and functions
RegisterGlobal(c_State); RegisterGlobal(c_State);
RegisterMeasure(c_State); RegisterMeasure(c_State);
RegisterMeasure(c_State);
RegisterMeter(c_State); RegisterMeter(c_State);
RegisterMeterWindow(c_State); RegisterMeterWindow(c_State);
} }

1
Library/lua/glue/LuaMeasure.cpp
View File

@ -167,4 +167,5 @@ void LuaManager::RegisterMeasure(lua_State* L)
luaL_register(L, "CMeasure", functions); luaL_register(L, "CMeasure", functions);
lua_pushvalue(L, -1); lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index"); lua_setfield(L, -2, "__index");
lua_pop(L, 1);
} }

1
Library/lua/glue/LuaMeter.cpp
View File

@ -169,4 +169,5 @@ void LuaManager::RegisterMeter(lua_State* L)
luaL_register(L, "CMeter", functions); luaL_register(L, "CMeter", functions);
lua_pushvalue(L, -1); lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index"); lua_setfield(L, -2, "__index");
lua_pop(L, 1);
} }

1
Library/lua/glue/LuaMeterWindow.cpp
View File

@ -200,4 +200,5 @@ void LuaManager::RegisterMeterWindow(lua_State* L)
luaL_register(L, "CMeterWindow", functions); luaL_register(L, "CMeterWindow", functions);
lua_pushvalue(L, -1); lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index"); lua_setfield(L, -2, "__index");
lua_pop(L, 1);
} }