From b44423ae49d79ff73655c83337184c84341d7f9a Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Tue, 25 Apr 2023 16:43:56 +0200
Subject: evaluator: Improve evaluation error reporting

---
 src/buildtool/build_engine/expression/evaluator.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/buildtool/build_engine/expression/evaluator.cpp')

diff --git a/src/buildtool/build_engine/expression/evaluator.cpp b/src/buildtool/build_engine/expression/evaluator.cpp
index 24a12fce..6aeea591 100644
--- a/src/buildtool/build_engine/expression/evaluator.cpp
+++ b/src/buildtool/build_engine/expression/evaluator.cpp
@@ -271,7 +271,12 @@ auto Union(Expression::list_t const& dicts, size_t from, size_t to)
         return Expression::kEmptyMap;
     }
     if (to == from + 1) {
-        return dicts[from];
+        auto const& entry = dicts[from];
+        if (not entry->IsMap()) {
+            throw Evaluator::EvaluationError{fmt::format(
+                "Map union list element is not a map: {}", entry->ToString())};
+        }
+        return entry;
     }
     size_t mid = from + (to - from) / 2;
     auto left = Union(dicts, from, mid);
-- 
cgit v1.2.3