X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Farray.lua;h=ce5ce07747f1685573291e6973254f39d0848b50;hb=7cde004ab530110577c5107636bc010576f29df1;hp=5b535fc19d84f74b45c98630d1db4c88f6566ccf;hpb=ad7285228de842d08f7a9abbecef7dbe8d6e3a8a;p=prosody.git

diff --git a/util/array.lua b/util/array.lua
index 5b535fc1..ce5ce077 100644
--- a/util/array.lua
+++ b/util/array.lua
@@ -1,11 +1,26 @@
-local array_methods = {};
-local array_mt = { __index = array_methods, __tostring = function (array) return array:concat(", "); end };
+-- 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 function array(t)
+local array = {};
+
+local array_mt = { __index = array, __tostring = function (array) return array:concat(", "); end };
+local function new_array(_, t)
 	return setmetatable(t or {}, array_mt);
 end
 
-function array_methods:map(func, t2)
+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)
 	local t2 = t2 or array{};
 	for k,v in ipairs(self) do
 		t2[k] = func(v);
@@ -13,7 +28,7 @@ function array_methods:map(func, t2)
 	return t2;
 end
 
-function array_methods:filter(func, t2)
+function array:filter(func, t2)
 	local t2 = t2 or array{};
 	for k,v in ipairs(self) do
 		if func(v) then
@@ -24,22 +39,53 @@ function array_methods:filter(func, t2)
 end
 
 
-array_methods.push = table.insert;
-array_methods.pop = table.remove;
-array_methods.sort = table.sort;
-array_methods.concat = table.concat;
-array_methods.length = function (t) return #t; end
+array.push = table.insert;
+array.pop = table.remove;
+array.sort = table.sort;
+array.concat = table.concat;
+array.length = function (t) return #t; end
 
-function array_methods:random()
+function array:random()
 	return self[math.random(1,#self)];
 end
 
-function array_methods:shuffle()
+function array:shuffle()
 	local len = #self;
 	for i=1,#self do
 		local r = math.random(i,len);
 		self[i], self[r] = self[r], self[i];
 	end
+	return self;
+end
+
+function array:reverse()
+	local len = #self-1;
+	for i=len,1,-1 do
+		self:push(self[i]);
+		self:pop(i);
+	end
+	return self;
 end
 
-_G.array = array 
+function array:append(array)
+	local len,len2  = #self, #array;
+	for i=1,len2 do
+		self[len+i] = array[i];
+	end
+	return self;
+end
+
+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;