Merge branch 'NP-1167' of https://github.com/Ultimaker/CuraFormulaeEngine into NP-1167

Author: casperlamboo

include/cura-formulae-engine/ast/fn_application_expr.h

@@ -23,7 +23,7 @@ struct FnApplicationExpr final : Expr
     std::vector<ExprPtr> args;
     std::vector<KeywordArg> kwargs;
 
-    FnApplicationExpr(ExprPtr fn, std::vector<ExprPtr> args, std::vector<KeywordArg> kwargs = {})
+    FnApplicationExpr(ExprPtr fn, std::vector<ExprPtr>&& args, std::vector<KeywordArg>&& kwargs = {})
         : fn(std::move(fn))
         , args(std::move(args))
         , kwargs(std::move(kwargs))

src/eval.cpp

@@ -331,21 +331,7 @@ bool operator==(const CuraFormulaeEngine::eval::Value& lhs, const CuraFormulaeEn
         const auto& map_lhs = std::get<std::unordered_map<std::string, CuraFormulaeEngine::eval::Value>>(lhs.value);
         const auto& map_rhs = std::get<std::unordered_map<std::string, CuraFormulaeEngine::eval::Value>>(rhs.value);
 
-        if (map_lhs.size() != map_rhs.size())
-        {
-            return false;
-        }
-
-        for (const auto& [key, val_lhs] : map_lhs)
-        {
-            const auto it = map_rhs.find(key);
-            if (it == map_rhs.end() || val_lhs != it->second)
-            {
-                return false;
-            }
-        }
-
-        return true;
+    return map_lhs == map_rhs;
     }
 
     return false;