p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

We Lua 5.2 now 

Lua 5.1 seems to have been obsoleted.  Luckily this was pretty simple.
This commit is contained in:
Přemysl Eric Janouch 2015-01-18 22:48:03 +01:00
parent 36ffb0f8cf
commit 6e6cf05093
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -98,9 +98,11 @@ endif (CONVERT_EXECUTABLE AND NOT WIN32)
# Dependencies # Dependencies
find_package (GTK2 2.12 REQUIRED gtk) find_package (GTK2 2.12 REQUIRED gtk)
find_package (Lua51 REQUIRED)
find_package (JsonGlib REQUIRED) find_package (JsonGlib REQUIRED)
find_package (PkgConfig REQUIRED)
pkg_search_module (Lua52 REQUIRED lua5.2 lua-5.2 lua>=5.2)
# Localization # Localization
find_package (Gettext REQUIRED) find_package (Gettext REQUIRED)
file (GLOB project_PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/po/*.po) file (GLOB project_PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/po/*.po)
@ -228,9 +230,9 @@ glib_genmarshal (${CMAKE_CURRENT_SOURCE_DIR}/liblogdiag/ld-marshal
include_directories (${CMAKE_CURRENT_SOURCE_DIR}) include_directories (${CMAKE_CURRENT_SOURCE_DIR})
include_directories (${GTK2_INCLUDE_DIRS} include_directories (${GTK2_INCLUDE_DIRS}
${JSON_GLIB_INCLUDE_DIRS} ${LUA_INCLUDE_DIR}) ${JSON_GLIB_INCLUDE_DIRS} ${Lua52_INCLUDE_DIRS})
set (logdiag_LIBS ${GTK2_LIBRARIES} set (logdiag_LIBS ${GTK2_LIBRARIES}
${JSON_GLIB_LIBRARIES} ${LUA_LIBRARIES}) ${JSON_GLIB_LIBRARIES} ${Lua52_LIBRARIES})
if (WIN32) if (WIN32)
find_package (LibIntl REQUIRED) find_package (LibIntl REQUIRED)

29
liblogdiag/ld-lua.c
View File

@ -196,17 +196,14 @@ ld_lua_init (LdLua *self)
/* XXX: Might not be a bad idea to use lua_atpanic(). */ /* XXX: Might not be a bad idea to use lua_atpanic(). */
/* Load some safe libraries. */ /* Load some safe libraries. */
lua_pushcfunction (L, luaopen_string); luaL_requiref (L, "string", luaopen_string, TRUE);
lua_call (L, 0, 0); luaL_requiref (L, "table", luaopen_table, TRUE);
luaL_requiref (L, "math", luaopen_math, TRUE);
lua_pushcfunction (L, luaopen_table); lua_pop (L, 3);
lua_call (L, 0, 0);
lua_pushcfunction (L, luaopen_math);
lua_call (L, 0, 0);
/* Load the application library. */ /* Load the application library. */
luaL_register (L, LD_LUA_LIBRARY_NAME, ld_lua_logdiag_lib); luaL_newlib (L, ld_lua_logdiag_lib);
lua_setglobal (L, LD_LUA_LIBRARY_NAME);
/* Store user data to the registry. */ /* Store user data to the registry. */
ud = lua_newuserdata (L, sizeof *ud); ud = lua_newuserdata (L, sizeof *ud);
@ -351,7 +348,9 @@ ld_lua_private_draw (LdLua *self, LdLuaSymbol *symbol, cairo_t *cr)
data.cr = cr; data.cr = cr;
data.save_count = 0; data.save_count = 0;
if (lua_cpcall (self->priv->L, ld_lua_private_draw_cb, &data)) lua_pushcfunction (self->priv->L, ld_lua_private_draw_cb);
lua_pushlightuserdata (self->priv->L, &data);
if (lua_pcall (self->priv->L, 1, 0, 0))
{ {
g_warning ("Lua error: %s", lua_tostring (self->priv->L, -1)); g_warning ("Lua error: %s", lua_tostring (self->priv->L, -1));
lua_pop (self->priv->L, 1); lua_pop (self->priv->L, 1);
@ -415,7 +414,9 @@ ld_lua_private_unregister (LdLua *self, LdLuaSymbol *symbol)
g_return_if_fail (LD_IS_LUA (self)); g_return_if_fail (LD_IS_LUA (self));
g_return_if_fail (LD_IS_LUA_SYMBOL (symbol)); g_return_if_fail (LD_IS_LUA_SYMBOL (symbol));
if (lua_cpcall (self->priv->L, ld_lua_private_unregister_cb, symbol)) lua_pushcfunction (self->priv->L, ld_lua_private_unregister_cb);
lua_pushlightuserdata (self->priv->L, symbol);
if (lua_pcall (self->priv->L, 1, 0, 0))
{ {
g_warning ("Lua error: %s", lua_tostring (self->priv->L, -1)); g_warning ("Lua error: %s", lua_tostring (self->priv->L, -1));
lua_pop (self->priv->L, 1); lua_pop (self->priv->L, 1);
@ -580,7 +581,7 @@ read_symbol_area (lua_State *L, int index, LdRectangle *area)
{ {
lua_Number x1, x2, y1, y2; lua_Number x1, x2, y1, y2;
if (lua_objlen (L, index) != 4) if (lua_rawlen (L, index) != 4)
return FALSE; return FALSE;
lua_rawgeti (L, index, 1); lua_rawgeti (L, index, 1);
@ -628,7 +629,7 @@ read_terminals (lua_State *L, int index, LdPointArray **terminals)
LdPointArray *points; LdPointArray *points;
size_t num_points; size_t num_points;
num_points = lua_objlen (L, index); num_points = lua_rawlen (L, index);
points = ld_point_array_sized_new (num_points); points = ld_point_array_sized_new (num_points);
lua_pushnil (L); lua_pushnil (L);
@ -636,7 +637,7 @@ read_terminals (lua_State *L, int index, LdPointArray **terminals)
{ {
g_assert (points->length < points->size); g_assert (points->length < points->size);
if (!lua_istable (L, -1) || lua_objlen (L, -1) != 2) if (!lua_istable (L, -1) || lua_rawlen (L, -1) != 2)
goto read_terminals_fail; goto read_terminals_fail;
lua_rawgeti (L, -1, 1); lua_rawgeti (L, -1, 1);