X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fiterators.lua;h=4b429163bfbdbcf963cf0d267c1d3da7b1015ac7;hb=4253ee98b95deab76f21352bb05eb6af07004604;hp=bcda48b4e870d9d4f3f8b73e9baea8e1ba73a334;hpb=7ff5e6bc2b5a07f6ef36406d3588189eb111b397;p=prosody.git

diff --git a/util/iterators.lua b/util/iterators.lua
index bcda48b4..d453a694 100644
--- a/util/iterators.lua
+++ b/util/iterators.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.
 --
@@ -11,8 +11,9 @@
 local it = {};
 
 local t_insert = table.insert;
-local select, unpack, next = select, unpack, next;
-local function pack(...) return { n = select("#", ...), ... }; end
+local select, next = select, next;
+local unpack = table.unpack or unpack; --luacheck: ignore 113
+local pack = table.pack or function (...) return { n = select("#", ...), ... }; end
 
 -- Reverse an iterator
 function it.reverse(f, s, var)
@@ -25,13 +26,13 @@ function it.reverse(f, s, var)
 	        if var == nil then break; end
 		t_insert(results, 1, ret);
 	end
-	
+
 	-- Then return our reverse one
 	local i,max = 0, #results;
-	return function (results)
+	return function (_results)
 			if i<max then
 				i = i + 1;
-				return unpack(results[i]);
+				return unpack(_results[i]);
 			end
 		end, results;
 end
@@ -47,8 +48,8 @@ end
 -- Iterate only over values in a table
 function it.values(t)
 	local key, val;
-	return function (t)
-		key, val = next(t, key);
+	return function (_t)
+		key, val = next(_t, key);
 		return val;
 	end, t;
 end
@@ -56,7 +57,7 @@ end
 -- Given an iterator, iterate only over unique items
 function it.unique(f, s, var)
 	local set = {};
-	
+
 	return function ()
 		while true do
 			local ret = pack(f(s, var));
@@ -73,31 +74,31 @@ end
 --[[ Return the number of items an iterator returns ]]--
 function it.count(f, s, var)
 	local x = 0;
-	
+
 	while true do
-		local var = f(s, var);
+		var = f(s, var);
 	        if var == nil then break; end
 		x = x + 1;
 	end
-	
+
 	return x;
 end
 
 -- Return the first n items an iterator returns
 function it.head(n, f, s, var)
 	local c = 0;
-	return function (s, var)
+	return function (_s, _var)
 		if c >= n then
 			return nil;
 		end
 		c = c + 1;
-		return f(s, var);
-	end, s;
+		return f(_s, _var);
+	end, s, var;
 end
 
 -- Skip the first n items an iterator returns
 function it.skip(n, f, s, var)
-	for i=1,n do
+	for _ = 1, n do
 		var = f(s, var);
 	end
 	return f, s, var;
@@ -131,9 +132,9 @@ function it.filter(filter, f, s, var)
 		local filter_value = filter;
 		function filter(x) return x ~= filter_value; end
 	end
-	return function (s, var)
+	return function (_s, _var)
 		local ret;
-		repeat ret = pack(f(s, var));
+		repeat ret = pack(f(_s, _var));
 			var = ret[1];
 		until var == nil or filter(unpack(ret, 1, ret.n));
 		return unpack(ret, 1, ret.n);
@@ -153,7 +154,7 @@ end
 
 -- Convert the values returned by an iterator to an array
 function it.to_array(f, s, var)
-	local t, var = {};
+	local t = {};
 	while true do
 		var = f(s, var);
 	        if var == nil then break; end