Content deleted Content added
fix mispaste |
implement fromIndex in inArray |
||
(7 intermediate revisions by 4 users not shown) | |||
Line 64:
-- removed, but otherwise the array order is unchanged.
------------------------------------------------------------------------------------
function p.removeDuplicates(
checkType('removeDuplicates', 1,
local isNan = p.isNan
local ret, exists = {}, {}
for _, v in ipairs(
if isNan(v) then
-- NaNs can't be table keys, and they are also unique, so we don't need to check existence.
ret[#ret + 1] = v
else▼
▲ exists[v] = true
end▼
end
end
Line 361 ⟶ 359:
-- never equal to any value (including other NaNs or even themselves).
------------------------------------------------------------------------------------
function p.listToSet(
checkType("listToSet", 1,
local isNan = p.isNan
local set = {}
for _,
if not isNan(
set[
end
end
Line 380 ⟶ 378:
------------------------------------------------------------------------------------
local function _deepCopy(orig, includeMetatable, already_seen)
-- Stores copies of tables indexed by the original table.▼
end
local copy = already_seen[orig]
if copy ~= nil then
return copy
end
▲ if type(orig) == 'table' then
already_seen[orig] = copy -- memoize before any recursion, to avoid infinite loops
▲ copy = {}
for orig_key, orig_value in pairs(orig) do▼
copy[_deepCopy(orig_key, includeMetatable, already_seen)] = _deepCopy(orig_value, includeMetatable, already_seen) local mt = getmetatable(orig)
▲ if includeMetatable then
if mt ~= nil then▼
▲ local mt_copy = _deepCopy(mt, includeMetatable, already_seen)
end▼
end
end
return copy
end
Line 411 ⟶ 407:
function p.deepCopy(orig, noMetatable, already_seen)
checkType("deepCopy", 3, already_seen, "table", true)
return _deepCopy(orig, not noMetatable, already_seen or {})
end
Line 464 ⟶ 460:
-- inArray
--
-- Returns true if
-- Equivalent to JavaScript array.includes(searchElement) or
-- array.includes(searchElement, fromIndex), except fromIndex is 1 indexed
------------------------------------------------------------------------------------
function p.inArray(
checkType("inArray", 1,
-- if
fromIndex = tonumber(fromIndex)
for _, v in ipairs(arr) do▼
if (fromIndex < 0) then
▲ return true
fromIndex = #array + fromIndex + 1
end
if fromIndex < 1 then fromIndex = 1 end
for _, v in ipairs({unpack(array, fromIndex)}) do
return true
▲ end
end
if v == searchElement then
return true
▲ end
end
end
return false
end
------------------------------------------------------------------------------------
-- merge
--
-- Given the arrays, returns an array containing the elements of each input array
-- in sequence.
------------------------------------------------------------------------------------
function p.merge(...)
local arrays = {...}
local ret = {}
for i, arr in ipairs(arrays) do
checkType('merge', i, arr, 'table')
ret[#ret + 1] = v
end
end
return ret
end
------------------------------------------------------------------------------------
-- extend
--
-- Extends the first array in place by appending all elements from the second
-- array.
------------------------------------------------------------------------------------
function p.extend(arr1, arr2)
checkType('extend', 1, arr1, 'table')
checkType('extend', 2, arr2, 'table')
for _, v in ipairs(arr2) do
arr1[#arr1 + 1] = v
end
end
|