core: lua compat 5.1/5.4/luajit

4 files changed, 24 insertions, 5 deletions

diff --git a/lang/lua/astal/gtk3/app.lua b/lang/lua/astal/gtk3/app.lua
index 7895f69..13347c3 100644
--- a/lang/lua/astal/gtk3/app.lua
+++ b/lang/lua/astal/gtk3/app.lua
@@ -5,6 +5,15 @@ local AstalIO = lgi.require("AstalIO", "0.1")
 local AstalLua = Astal.Application:derive("AstalLua")
 local request_handler
 
+local function unpack(t, i)
+    i = i or 1
+    if t[i] == nil then
+        return nil
+	else
+        return t[i], unpack(t, i + 1)
+    end
+end
+
 function AstalLua:do_request(msg, conn)
     if type(request_handler) == "function" then
         request_handler(msg, function(response)
@@ -76,7 +85,7 @@ function Astal.Application:start(config)
 
     app.on_activate = function()
         if type(config.main) == "function" then
-            config.main(table.unpack(arg))
+            config.main(unpack(arg))
         end
         if config.hold then
             self:hold()
@@ -86,8 +95,13 @@ function Astal.Application:start(config)
     local _, err = app:acquire_socket()
     if err ~= nil then
         return config.client(function(msg)
+<<<<<<< HEAD:lang/lua/astal/gtk3/app.lua
             return AstalIO.send_message(self.instance_name, msg)
         end, table.unpack(arg))
+=======
+            return Astal.Application.send_message(self.instance_name, msg)
+        end, unpack(arg))
+>>>>>>> 18df91b (core: lua compat 5.1/5.4/luajit):core/lua/astal/application.lua
     end
 
     self:run(nil)
diff --git a/lang/lua/astal/gtk3/astalify.lua b/lang/lua/astal/gtk3/astalify.lua
index 065de40..c344c07 100644
--- a/lang/lua/astal/gtk3/astalify.lua
+++ b/lang/lua/astal/gtk3/astalify.lua
@@ -28,8 +28,7 @@ local function map(tbl, fn)
     return copy
 end
 
-local flatten
-flatten = function(tbl)
+local function flatten(tbl)
     local copy = {}
     for _, value in pairs(tbl) do
         if type(value) == "table" and getmetatable(value) == nil then
diff --git a/lang/lua/astal/init.lua b/lang/lua/astal/init.lua
index f442db0..783c78a 100644
--- a/lang/lua/astal/init.lua
+++ b/lang/lua/astal/init.lua
@@ -1,7 +1,12 @@
+if not table.unpack then
+    table.unpack = unpack
+end
+
+
 local lgi = require("lgi")
 local Binding = require("astal.binding")
 local File = require("astal.file")
-local Process = require("astal.proc")
+local Process = require("astal.process")
 local Time = require("astal.time")
 local Variable = require("astal.variable")
 
diff --git a/lang/lua/astal/variable.lua b/lang/lua/astal/variable.lua
index 5a5e169..c2ed337 100644
--- a/lang/lua/astal/variable.lua
+++ b/lang/lua/astal/variable.lua
@@ -5,6 +5,7 @@ local Binding = require("astal.binding")
 local Time = require("astal.time")
 local Process = require("astal.process")
 
+
 ---@class Variable
 ---@field private variable table
 ---@field private err_handler? function
@@ -273,4 +274,4 @@ return setmetatable(Variable, {
     __call = function(_, v)
         return Variable.new(v)
     end,
-})
+})
\ No newline at end of file