mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.array: Avoid globals.

Browse source
This commit is contained in:
Waqas Hussain 2011-12-09 12:02:21 +05:00
parent 5cc76d9794
commit 5a64ace81c
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
util/array.lua
View file

@ -9,6 +9,11 @@
local t_insert, t_sort, t_remove, t_concat local t_insert, t_sort, t_remove, t_concat
= table.insert, table.sort, table.remove, table.concat; = table.insert, table.sort, table.remove, table.concat;
local setmetatable = setmetatable;
local math_random = math.random;
local pairs, ipairs = pairs, ipairs;
local tostring = tostring;
local array = {}; local array = {};
local array_base = {}; local array_base = {};
local array_methods = {}; local array_methods = {};
@ -27,7 +32,7 @@ setmetatable(array, { __call = new_array });
-- Read-only methods -- Read-only methods
function array_methods:random() function array_methods:random()
return self[math.random(1,#self)]; return self[math_random(1,#self)];
end end
-- These methods can be called two ways: -- These methods can be called two ways:
@ -80,7 +85,7 @@ end
function array_methods:shuffle(outa, ina) function array_methods:shuffle(outa, ina)
local len = #self; local len = #self;
for i=1,#self do for i=1,#self do
local r = math.random(i,len); local r = math_random(i,len);
self[i], self[r] = self[r], self[i]; self[i], self[r] = self[r], self[i];
end end
return self; return self;
@ -104,18 +109,18 @@ function array_methods:append(array)
end end
function array_methods:push(x) function array_methods:push(x)
table.insert(self, x); t_insert(self, x);
return self; return self;
end end
function array_methods:pop(x) function array_methods:pop(x)
local v = self[x]; local v = self[x];
table.remove(self, x); t_remove(self, x);
return v; return v;
end end
function array_methods:concat(sep) function array_methods:concat(sep)
return table.concat(array.map(self, tostring), sep); return t_concat(array.map(self, tostring), sep);
end end
function array_methods:length() function array_methods:length()
@ -128,7 +133,7 @@ function array.collect(f, s, var)
while true do while true do
var = f(s, var); var = f(s, var);
if var == nil then break; end if var == nil then break; end
table.insert(t, var); t_insert(t, var);
end end
return setmetatable(t, array_mt); return setmetatable(t, array_mt);
end end