From 4dd0b1840d343dc65f1c781c3d6b8731b6e79eda Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 13 Oct 2024 12:57:37 -0300 Subject: core: lua compat 5.1/5.4/luajit --- lang/lua/astal/gtk3/app.lua | 16 +++++++++++++++- lang/lua/astal/gtk3/astalify.lua | 3 +-- lang/lua/astal/init.lua | 7 ++++++- lang/lua/astal/variable.lua | 3 ++- 4 files changed, 24 insertions(+), 5 deletions(-) (limited to 'lang/lua') 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 -- cgit v1.2.3 From 9e255738f835c0e47cc6ae4d0cfbb96a261b4a2f Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 14 Oct 2024 10:27:57 -0300 Subject: core: table.unpack compat in lua, fix typo in astal/init.lua --- lang/lua/astal/gtk3/app.lua | 16 +--------------- lang/lua/astal/init.lua | 1 - lang/lua/astal/variable.lua | 1 - 3 files changed, 1 insertion(+), 17 deletions(-) (limited to 'lang/lua') diff --git a/lang/lua/astal/gtk3/app.lua b/lang/lua/astal/gtk3/app.lua index 13347c3..7895f69 100644 --- a/lang/lua/astal/gtk3/app.lua +++ b/lang/lua/astal/gtk3/app.lua @@ -5,15 +5,6 @@ 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) @@ -85,7 +76,7 @@ function Astal.Application:start(config) app.on_activate = function() if type(config.main) == "function" then - config.main(unpack(arg)) + config.main(table.unpack(arg)) end if config.hold then self:hold() @@ -95,13 +86,8 @@ 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/init.lua b/lang/lua/astal/init.lua index 783c78a..5630ba4 100644 --- a/lang/lua/astal/init.lua +++ b/lang/lua/astal/init.lua @@ -2,7 +2,6 @@ if not table.unpack then table.unpack = unpack end - local lgi = require("lgi") local Binding = require("astal.binding") local File = require("astal.file") diff --git a/lang/lua/astal/variable.lua b/lang/lua/astal/variable.lua index c2ed337..f9be161 100644 --- a/lang/lua/astal/variable.lua +++ b/lang/lua/astal/variable.lua @@ -5,7 +5,6 @@ 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 -- cgit v1.2.3 From dcb7cb325d5525a864098dfcba3100a6151d4d13 Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 16 Oct 2024 02:32:56 -0300 Subject: core: lua fix require --- lang/lua/astal/gtk3/astalify.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lang/lua') diff --git a/lang/lua/astal/gtk3/astalify.lua b/lang/lua/astal/gtk3/astalify.lua index c344c07..211a1d4 100644 --- a/lang/lua/astal/gtk3/astalify.lua +++ b/lang/lua/astal/gtk3/astalify.lua @@ -2,9 +2,9 @@ local lgi = require("lgi") local Astal = lgi.require("Astal", "3.0") local Gtk = lgi.require("Gtk", "3.0") local GObject = lgi.require("GObject", "2.0") -local Binding = require("astal.lib.binding") -local Variable = require("astal.lib.variable") -local exec_async = require("astal.lib.process").exec_async +local Binding = require("astal.binding") +local Variable = require("astal.variable") +local exec_async = require("astal.process").exec_async local function filter(tbl, fn) local copy = {} -- cgit v1.2.3