projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e303bd1
)
util.iterators: Variable renaming to avoid shadowing [luacheck]
author
Matthew Wild
<mwild1@gmail.com>
Thu, 10 Mar 2016 17:52:57 +0000
(17:52 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Thu, 10 Mar 2016 17:52:57 +0000
(17:52 +0000)
util/iterators.lua
patch
|
blob
|
history
diff --git
a/util/iterators.lua
b/util/iterators.lua
index 99b5f0904ff147521b68d5817f96ed5e82ae2c8e..d453a6946007ec618c07399c283bcc4368c1c0e8 100644
(file)
--- a/
util/iterators.lua
+++ b/
util/iterators.lua
@@
-29,10
+29,10
@@
function it.reverse(f, s, var)
-- Then return our reverse one
local i,max = 0, #results;
-- Then return our reverse one
local i,max = 0, #results;
- return function (results)
+ return function (
_
results)
if i<max then
i = i + 1;
if i<max then
i = i + 1;
- return unpack(results[i]);
+ return unpack(
_
results[i]);
end
end, results;
end
end
end, results;
end
@@
-48,8
+48,8
@@
end
-- Iterate only over values in a table
function it.values(t)
local key, val;
-- 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
return val;
end, t;
end
@@
-87,18
+87,18
@@
end
-- Return the first n items an iterator returns
function it.head(n, f, s, var)
local c = 0;
-- 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;
if c >= n then
return nil;
end
c = c + 1;
- return f(
s,
var);
+ return f(
_s, _
var);
end, s, var;
end
-- Skip the first n items an iterator returns
function it.skip(n, 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;
var = f(s, var);
end
return f, s, var;
@@
-132,9
+132,9
@@
function it.filter(filter, f, s, var)
local filter_value = filter;
function filter(x) return x ~= filter_value; end
end
local filter_value = filter;
function filter(x) return x ~= filter_value; end
end
- return function (
s,
var)
+ return function (
_s, _
var)
local ret;
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);
var = ret[1];
until var == nil or filter(unpack(ret, 1, ret.n));
return unpack(ret, 1, ret.n);