Enabled higher versisons of lua by making compile independent of user's lua version. Now version to link to is not hard-coded, so it sc-im will link to whatever lua version user has installed as their default lua. If lua is not found, Makefile then checks for luajit & links to luajit instead. Given lua is checked before luajit, newer compiles will always link to latest version of lua user installs, this is what most users would care about. For advanced users who care about high-performance of luaJIT & do not mind keeping their code compliant to Lua 5.1 & have both lua+luaJIT installed on their machines, they can comment part of Makefile (or remove lua from pkg-config path) to force sc-im to link to luaJIT.

1 files changed, 14 insertions, 1 deletions

diff --git a/src/lua.c b/src/lua.c
index fd54bb5..d7f6259 100644
--- a/src/lua.c
+++ b/src/lua.c
@@ -295,7 +295,7 @@ LC_NUMBER2(curcol,curcol)
 LC_NUMBER2(maxcols,maxcols)
 LC_NUMBER2(maxrows,maxrows)
 
-static const luaL_reg sclib[] = {
+static const luaL_Reg sclib[] = {
     { "lgetnum", l_getnum },
     { "lsetnum", l_setnum },
     { "lsetform", l_setform },
@@ -312,6 +312,13 @@ static const luaL_reg sclib[] = {
     {NULL,NULL}
 };
 
+static int registerLuaFuncs(lua_State *L) {
+#if LUA_VERSION_NUM >= 502
+    luaL_newlib(L, sclib);                          /* Load SC specific LUA commands after init.lua exec*/
+#endif
+    return 1;
+}
+
 /**
  * \brief TODO Document doLuainit()
  *
@@ -334,7 +341,13 @@ void doLuainit() {
         if (lua_pcall(L, 0, 0, 0))                  /* PRIMING RUN. FORGET THIS AND YOU'RE TOAST */
             fprintf(stderr, "\nFATAL ERROR:\n  Couldn't initialized Lua: %s\n\n", lua_tostring(L,-1));
     }
+
+
+#if LUA_VERSION_NUM >= 502
+    luaL_requiref(L, "sc", registerLuaFuncs, 1);    /* sc = require("sc") */
+#else
     luaL_register(L, "sc", sclib);                  /* Load SC specific LUA commands after init.lua exec*/
+#endif
 
     return;
 }