summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Planas <roger.planas@isode.com>2017-07-04 11:03:55 (GMT)
committerRoger Planas <roger.planas@isode.com>2017-10-30 12:25:43 (GMT)
commitc29df10f0ab47db63509634fb1661ff55b8b47b3 (patch)
treeebf7486b653b554e3122c3509da17e17ef25f312 /Sluift/Lua/LuaUtils.h
parented25c7d2fe46dca4edecd359755b15e16620056e (diff)
downloadswift-c29df10f0ab47db63509634fb1661ff55b8b47b3.zip
swift-c29df10f0ab47db63509634fb1661ff55b8b47b3.tar.bz2
Sluift: Add support for Lua 5.3
This patch adds support for Lua 5.3, while keeping support for Lua 5.1 (a build with the bundled Lua succeeds) Test-information: Builds cleanly on Lua 5.1, 5.2 and Lua 5.3. Tests that make use of Sluift work with both Lua 5.2 and Lua 5.3 Change-Id: I4cbe2eb09ec8c753d8624047f5456be1de72c679
Diffstat (limited to 'Sluift/Lua/LuaUtils.h')
-rw-r--r--Sluift/Lua/LuaUtils.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/Sluift/Lua/LuaUtils.h b/Sluift/Lua/LuaUtils.h
index b87eb38..b9f5bff 100644
--- a/Sluift/Lua/LuaUtils.h
+++ b/Sluift/Lua/LuaUtils.h
@@ -12,7 +12,22 @@
#include <vector>
#if LUA_VERSION_NUM < 502
-#define lua_pushglobaltable(L) lua_pushvalue(L, LUA_GLOBALSINDEX)
+#define lua_pushglobaltable(L) lua_pushvalue(L, LUA_GLOBALSINDEX)
+#define lua_compare(L,idx1,idx2,LUA_OPEQ) lua_equal(L,(idx1),(idx2))
+#define lua_rawlen(L, i) lua_objlen(L,(i))
+#endif
+#if LUA_VERSION_NUM >= 503
+#undef luaL_register
+#define luaL_register(L, n, l) \
+ lua_getglobal( L, n ); \
+ if( lua_isnil( L, -1 ) ) \
+ { \
+ lua_pop( L, 1 ); \
+ lua_newtable( L ); \
+ } \
+ luaL_setfuncs( L, (l), 0 ); \
+ lua_pushvalue( L, -1 ); \
+ lua_setglobal( L, n );
#endif
namespace Swift {