Merge with 0.4

[prosody.git] / util / array.lua

diff --git a/util/array.lua b/util/array.lua
index 5b535fc19d84f74b45c98630d1db4c88f6566ccf..072b24a75ccea9d93a1b1517ecda414a77f9ee56 100644 (file)
--- a/util/array.lua
+++ b/util/array.lua
@@ -1,11 +1,13 @@
-local array_methods = {};
-local array_mt = { __index = array_methods, __tostring = function (array) return array:concat(", "); end };
+local array = {};
 
-local function array(t)
+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)
+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 +15,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,17 +26,17 @@ 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);
@@ -42,4 +44,25 @@ function array_methods:shuffle()
        end
 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
+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;