Merge 0.9->trunk

[prosody.git] / util / array.lua

diff --git a/util/array.lua b/util/array.lua
index fdf3c9a3dc902521826128b231c1c46036a2b78b..9bf215af72c9d73b0b09e1fb31ccaf95fa8a6f4a 100644 (file)
--- a/util/array.lua
+++ b/util/array.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -9,12 +9,20 @@
 local t_insert, t_sort, t_remove, t_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_base = {};
 local array_methods = {};
-local array_mt = { __index = array_methods, __tostring = function (array) return array:concat(", "); end };
+local array_mt = { __index = array_methods, __tostring = function (array) return "{"..array:concat(", ").."}"; end };
 
-local function new_array(_, t)
+local function new_array(self, t, _s, _var)
+       if type(t) == "function" then -- Assume iterator
+               t = self.collect(t, _s, _var);
+       end
        return setmetatable(t or {}, array_mt);
 end
 
@@ -27,7 +35,7 @@ setmetatable(array, { __call = new_array });
 
 -- Read-only methods
 function array_methods:random()
-       return self[math.random(1,#self)];
+       return self[math_random(1,#self)];
 end
 
 -- These methods can be called two ways:
@@ -51,13 +59,13 @@ function array_base.filter(outa, ina, func)
                        write = write + 1;
                end
        end
-       
+
        if inplace and write <= start_length then
                for i=write,start_length do
                        outa[i] = nil;
                end
        end
-       
+
        return outa;
 end
 
@@ -80,7 +88,7 @@ end
 function array_methods:shuffle(outa, ina)
        local len = #self;
        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];
        end
        return self;
@@ -104,18 +112,18 @@ function array_methods:append(array)
 end
 
 function array_methods:push(x)
-       table.insert(self, x);
+       t_insert(self, x);
        return self;
 end
 
 function array_methods:pop(x)
        local v = self[x];
-       table.remove(self, x);
+       t_remove(self, x);
        return v;
 end
 
 function array_methods:concat(sep)
-       return table.concat(array.map(self, tostring), sep);
+       return t_concat(array.map(self, tostring), sep);
 end
 
 function array_methods:length()
@@ -128,7 +136,7 @@ function array.collect(f, s, var)
        while true do
                var = f(s, var);
                if var == nil then break; end
-               table.insert(t, var);
+               t_insert(t, var);
        end
        return setmetatable(t, array_mt);
 end