tangent/lume
1
0
Fork 0
mirror of https://github.com/TangentFoxy/lume.git synced 2024-12-13 17:24:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed getiter() to disallow nil values

Browse Source
This commit is contained in:
rxi 2015-02-24 20:42:44 +00:00
parent 976f813de9
commit 886bd43bce
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lume.lua
View File

@ -51,13 +51,12 @@ local iternil = function()
end end
local getiter = function(x) local getiter = function(x)
if x == nil then if isarray(x) then
return iternil
elseif isarray(x) then
return ipairs return ipairs
else elseif type(x) == "table" then
return pairs return pairs
end end
error("expected table", 3)
end end
local iteratee = function(x) local iteratee = function(x)
@ -327,11 +326,13 @@ function lume.concat(...)
local rtn = {} local rtn = {}
for i = 1, select("#", ...) do for i = 1, select("#", ...) do
local t = select(i, ...) local t = select(i, ...)
if t ~= nil then
local iter = getiter(t) local iter = getiter(t)
for k, v in iter(t) do for k, v in iter(t) do
rtn[#rtn + 1] = v rtn[#rtn + 1] = v
end end
end end
end
return rtn return rtn
end end