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

diff --git a/util/array.lua b/util/array.lua
index f1f8fa97..ce5ce077 100644
--- 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 };
@@ -5,6 +13,11 @@ local function new_array(_, t)
 	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)
@@ -42,6 +55,37 @@ function array:shuffle()
 		local r = math.random(i,len);
 		self[i], self[r] = self[r], self[i];
 	end
+	return self;
 end
 
-_G.array = array 
+function array:reverse()
+	local len = #self-1;
+	for i=len,1,-1 do
+		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
+
+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;