aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 19:45:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Small Bugs Fixed

Browse Source
This commit is contained in:
Cooldude2606
2019-02-01 23:23:09 +00:00
parent 18cf8c79f4
commit a15875d8a0
5 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
modules/FactorioStdLib/Table/control.lua
View File

@@ -272,6 +272,27 @@ function table.deepcopy(object)
return _copy(object)
end
--- Default table comparator sort function.
-- @local
-- @param x one comparator operand
-- @param y the other comparator operand
-- @return true if x logically comes before y in a list, false otherwise
local function sortFunc(x, y) --sorts tables with mixed index types.
local tx = type(x)
local ty = type(y)
if tx == ty then
if type(x) == 'string' then
return string.lower(x) < string.lower(y)
else
return x < y
end
elseif tx == 'number' then
return true --only x is a number and goes first
else
return false --only y is a number and goes first
end
end
--- Returns a copy of all of the values in the table.
-- @tparam table tbl the table to copy the keys from, or an empty table if tbl is nil
-- @tparam[opt] boolean sorted whether to sort the keys (slower) or keep the random order from pairs()
@@ -293,19 +314,7 @@ function table.values(tbl, sorted, as_string)
end
end
if sorted then
table.sort(valueset,
function(x, y) --sorts tables with mixed index types.
local tx = type(x) == 'number'
local ty = type(y) == 'number'
if tx == ty then
return x < y and true or false --similar type can be compared
elseif tx == true then
return true --only x is a number and goes first
else
return false --only y is a number and goes first
end
end
)
table.sort(valueset,sortFunc)
end
return valueset
end
@@ -331,19 +340,7 @@ function table.keys(tbl, sorted, as_string)
end
end
if sorted then
table.sort(keyset,
function(x, y) --sorts tables with mixed index types.
local tx = type(x) == 'number'
local ty = type(y) == 'number'
if tx == ty then
return x < y and true or false --similar type can be compared
elseif tx == true then
return true --only x is a number and goes first
else
return false --only y is a number and goes first
end
end
)
table.sort(keyset,sortFunc)
end
return keyset
end