Software /
code /
prosody
Changeset
7260:a9ef93bc81d9
util.iterators: Variable renaming to avoid shadowing [luacheck]
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 10 Mar 2016 17:52:57 +0000 |
parents | 7259:d8300985f2bb |
children | 7261:925f848c706d |
files | util/iterators.lua |
diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/util/iterators.lua Thu Mar 10 17:52:03 2016 +0000 +++ b/util/iterators.lua Thu Mar 10 17:52:57 2016 +0000 @@ -29,10 +29,10 @@ -- 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 @@ -48,8 +48,8 @@ -- 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 @@ -87,18 +87,18 @@ -- 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); + 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; @@ -132,9 +132,9 @@ 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);