summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/buildtool/build_engine/expression/evaluator.cpp7
1 files changed, 6 insertions, 1 deletions
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);