projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.9->trunk
[prosody.git]
/
util
/
array.lua
diff --git
a/util/array.lua
b/util/array.lua
index b78fb98f0685fe939ade0e68ce396f5476906069..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
-- 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.
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
@@
-17,7
+17,7
@@
local tostring = tostring;
local array = {};
local array_base = {};
local array_methods = {};
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(self, t, _s, _var)
if type(t) == "function" then -- Assume iterator
local function new_array(self, t, _s, _var)
if type(t) == "function" then -- Assume iterator
@@
-59,13
+59,13
@@
function array_base.filter(outa, ina, func)
write = write + 1;
end
end
write = write + 1;
end
end
-
+
if inplace and write <= start_length then
for i=write,start_length do
outa[i] = nil;
end
end
if inplace and write <= start_length then
for i=write,start_length do
outa[i] = nil;
end
end
-
+
return outa;
end
return outa;
end