From 4d4d42cd0add7804bde50a43d56391708868ffc8 Mon Sep 17 00:00:00 2001 From: numzero Date: Sat, 12 Sep 2020 20:59:27 +0300 Subject: [PATCH] Make mesecon.cmpAny symmetrical --- mesecons/util.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mesecons/util.lua b/mesecons/util.lua index 7485cac..f1f88d6 100644 --- a/mesecons/util.lua +++ b/mesecons/util.lua @@ -193,14 +193,23 @@ function mesecon.tablecopy(obj) -- deep copy return obj end +-- Returns whether two values are equal. +-- In tables, keys are compared for identity but values are compared recursively. +-- There is no protection from infinite recursion. function mesecon.cmpAny(t1, t2) if type(t1) ~= type(t2) then return false end - if type(t1) ~= "table" and type(t2) ~= "table" then return t1 == t2 end + if type(t1) ~= "table" then return t1 == t2 end + -- Check that for each key of `t1` both tables have the same value for i, e in pairs(t1) do if not mesecon.cmpAny(e, t2[i]) then return false end end + -- Check that all keys of `t2` are also keys of `t1` so were checked in the previous loop + for i, _ in pairs(t2) do + if t1[i] == nil then return false end + end + return true end