From 73386de65fd49e7690da5203074a5ea603551db6 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 21 Feb 2024 14:21:23 +0200 Subject: Fix issue with json null representation in containers --- libbuild2/variable.cxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libbuild2/variable.cxx') diff --git a/libbuild2/variable.cxx b/libbuild2/variable.cxx index ab65237..078c13a 100644 --- a/libbuild2/variable.cxx +++ b/libbuild2/variable.cxx @@ -1799,9 +1799,16 @@ namespace build2 { case json_type::null: { - // Return empty to be consistent with other places. + // Note that here we cannot return empty (e.g., to be consistent with + // other places) because we treat empty name (as opposed to empty + // names) as string, not null (see to_json_value() above). // -#if 0 + // Thankfully this version of reverse() is only used when json_value + // representation is needed as part of a container. Which means in + // "consumption" contexts (e.g., result of subscript) null will still + // decay to empty. + // +#if 1 return name ("null"); #else return name (); -- cgit v1.1