From 0aa7a94e1032a96a2a72cb6a82824f9fe970d412 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 14 Dec 2022 14:18:44 +0200
Subject: Improve empty simple value to empty list of names reduction
 heuristics

Specifically, do not reduce typed RHS empty simple values for prepend/append
and additionally for assignment provided LHS is typed and is a container.
---
 libbuild2/script/parser.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'libbuild2/script/parser.cxx')

diff --git a/libbuild2/script/parser.cxx b/libbuild2/script/parser.cxx
index 88e2f06..0be22a6 100644
--- a/libbuild2/script/parser.cxx
+++ b/libbuild2/script/parser.cxx
@@ -1028,7 +1028,7 @@ namespace build2
 
                 storage.clear ();
                 to_stream (os,
-                           reverse (a.value, storage),
+                           reverse (a.value, storage, true /* reduce */),
                            quote_mode::normal,
                            '@');
               }
@@ -2676,7 +2676,11 @@ namespace build2
                 if (val.type != nullptr)
                 {
                   etype = val.type->element_type;
-                  untypify (val);
+
+                  // Note that here we don't want to be reducing empty simple
+                  // values to empty lists.
+                  //
+                  untypify (val, false /* reduce */);
                 }
 
                 size_t fli (li);
-- 
cgit v1.1