From de7b01d7d2d4360f44e24a6d573c001e083de059 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 18 Feb 2016 14:57:04 +0100 Subject: loggingmanager,modulemanager,moduleapi: Localize unpack compatible with Lua 5.2+ --- core/moduleapi.lua | 3 ++- core/modulemanager.lua | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 573f3153..9a0c5223 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -19,7 +19,8 @@ local st = require "util.stanza"; local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat; local error, setmetatable, type = error, setmetatable, type; -local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack; +local ipairs, pairs, select = ipairs, pairs, select; +local unpack = table.unpack or unpack; local tonumber, tostring = tonumber, tostring; local require = require; diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 41c9b2fe..5d030513 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -23,7 +23,8 @@ local setmetatable, rawget = setmetatable, rawget; local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, table.insert; local debug_traceback = debug.traceback; -local unpack, select = unpack, select; +local select = select; +local unpack = table.unpack or unpack; local pcall = function(f, ...) local n = select("#", ...); local params = {...}; -- cgit v1.2.3 From cecd6ca31df847722dc98eb88d374bc58f3020c8 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 18 Feb 2016 14:57:51 +0100 Subject: loggingmanager,modulemanager,moduleapi: Ignore warning about accessing _G.unpack [luacheck] --- core/loggingmanager.lua | 3 ++- core/moduleapi.lua | 2 +- core/modulemanager.lua | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index 14dd4360..e3a83817 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -16,7 +16,8 @@ local math_max, rep = math.max, string.rep; local os_date = os.date; local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring; local tostring = tostring; -local select, unpack = select, table.unpack or unpack; +local select = select; +local unpack = table.unpack or unpack; --luacheck: ignore 113 local config = require "core.configmanager"; local logger = require "util.logger"; diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 9a0c5223..402c7927 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -20,7 +20,7 @@ local st = require "util.stanza"; local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat; local error, setmetatable, type = error, setmetatable, type; local ipairs, pairs, select = ipairs, pairs, select; -local unpack = table.unpack or unpack; +local unpack = table.unpack or unpack; --luacheck: ignore 113 local tonumber, tostring = tonumber, tostring; local require = require; diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 5d030513..65542f9a 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -24,7 +24,7 @@ local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, t local debug_traceback = debug.traceback; local select = select; -local unpack = table.unpack or unpack; +local unpack = table.unpack or unpack; --luacheck: ignore 113 local pcall = function(f, ...) local n = select("#", ...); local params = {...}; -- cgit v1.2.3