projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-tagging 0.5.2
[prosody.git]
/
util
/
array.lua
diff --git
a/util/array.lua
b/util/array.lua
index 9e99a3ec2a1238550b0aa48d5b2bad792ef2e313..ce5ce07747f1685573291e6973254f39d0848b50 100644
(file)
--- a/
util/array.lua
+++ b/
util/array.lua
@@
-1,3
+1,11
@@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
local array = {};
local array_mt = { __index = array, __tostring = function (array) return array:concat(", "); end };
local array = {};
local array_mt = { __index = array, __tostring = function (array) return array:concat(", "); end };
@@
-5,6
+13,11
@@
local function new_array(_, t)
return setmetatable(t or {}, array_mt);
end
return setmetatable(t or {}, array_mt);
end
+function array_mt.__add(a1, a2)
+ local res = new_array();
+ return res:append(a1):append(a2);
+end
+
setmetatable(array, { __call = new_array });
function array:map(func, t2)
setmetatable(array, { __call = new_array });
function array:map(func, t2)
@@
-42,6
+55,7
@@
function array:shuffle()
local r = math.random(i,len);
self[i], self[r] = self[r], self[i];
end
local r = math.random(i,len);
self[i], self[r] = self[r], self[i];
end
+ return self;
end
function array:reverse()
end
function array:reverse()
@@
-50,6
+64,28
@@
function array:reverse()
self:push(self[i]);
self:pop(i);
end
self:push(self[i]);
self:pop(i);
end
+ return self;
+end
+
+function array:append(array)
+ local len,len2 = #self, #array;
+ for i=1,len2 do
+ self[len+i] = array[i];
+ end
+ return self;
end
end
-_G.array = array
+function array.collect(f, s, var)
+ local t, var = {};
+ while true do
+ var = f(s, var);
+ if var == nil then break; end
+ table.insert(t, var);
+ end
+ return setmetatable(t, array_mt);
+end
+
+_G.array = array;
+module("array");
+
+return array;