Comparison

core/moduleapi.lua @ 7164:af26e8eb591f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 18 Feb 2016 15:00:17 +0100
parent 7142:67226eaef97c
parent 7163:eadbf19d0de0
child 7343:1da5a710848d
comparison
equal deleted inserted replaced
7161:8380b595a33b 7164:af26e8eb591f
21 local error, setmetatable, type = error, setmetatable, type; 21 local error, setmetatable, type = error, setmetatable, type;
22 local ipairs, pairs, select = ipairs, pairs, select; 22 local ipairs, pairs, select = ipairs, pairs, select;
23 local tonumber, tostring = tonumber, tostring; 23 local tonumber, tostring = tonumber, tostring;
24 local require = require; 24 local require = require;
25 local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2 25 local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2
26 local unpack = table.unpack or unpack; -- renamed in 5.2 26 local unpack = table.unpack or unpack; --luacheck: ignore 113 -- renamed in 5.2
27 27
28 local prosody = prosody; 28 local prosody = prosody;
29 local hosts = prosody.hosts; 29 local hosts = prosody.hosts;
30 30
31 -- FIXME: This assert() is to try and catch an obscure bug (2013-04-05) 31 -- FIXME: This assert() is to try and catch an obscure bug (2013-04-05)